fix a regression in the namings

Author: bobzhang

jscomp/ext/ext_ident.ml

@@ -97,7 +97,7 @@ let js_module_table : Ident.t Hash_string.t = Hash_string.create 31
 
 *)
 
-let [@inline] convert (c : char) : string =
+let [@inline] convert ?(op=false) (c : char) : string =
   (match c with
    | '*' ->   "$star"
    | '\'' ->   "$p"
@@ -106,7 +106,7 @@ let [@inline] convert (c : char) : string =
    | '<' ->   "$less"
    | '=' ->   "$eq"
    | '+' ->   "$plus"
-   | '-' ->   "$neg"
+   | '-' ->   if op then "$neg" else "$"
    | '@' ->   "$at"
    | '^' ->   "$caret"
    | '/' ->   "$slash"
@@ -131,23 +131,24 @@ let [@inline] no_escape (c : char) =
   | 'a' .. 'z' | 'A' .. 'Z'
   | '0' .. '9' | '_' | '$' -> true 
   | _ -> false
-exception Not_normal_letter 
+
+exception Not_normal_letter of int
 let name_mangle name =
   let len = String.length name  in
   try
     for i  = 0 to len - 1 do
       if not (no_escape (String.unsafe_get name i)) then
-        raise_notrace (Not_normal_letter )
+        raise_notrace (Not_normal_letter i)
     done;
     name (* Normal letter *)
   with
-  | Not_normal_letter ->
+  | Not_normal_letter i ->
     let buffer = Ext_buffer.create len in
     for j = 0 to  len - 1 do
       let c = String.unsafe_get name j in
       if no_escape c then Ext_buffer.add_char buffer c 
       else 
-        Ext_buffer.add_string buffer (convert c)        
+        Ext_buffer.add_string buffer (convert ~op:(i=0) c)        
     done; Ext_buffer.contents buffer
 
 (* TODO:

lib/4.06.1/unstable/all_ounit_tests.ml

@@ -10932,7 +10932,7 @@ let js_module_table : Ident.t Hash_string.t = Hash_string.create 31
 
 *)
 
-let [@inline] convert (c : char) : string =
+let [@inline] convert ?(op=false) (c : char) : string =
   (match c with
    | '*' ->   "$star"
    | '\'' ->   "$p"
@@ -10941,7 +10941,7 @@ let [@inline] convert (c : char) : string =
    | '<' ->   "$less"
    | '=' ->   "$eq"
    | '+' ->   "$plus"
-   | '-' ->   "$neg"
+   | '-' ->   if op then "$neg" else "$"
    | '@' ->   "$at"
    | '^' ->   "$caret"
    | '/' ->   "$slash"
@@ -10966,23 +10966,24 @@ let [@inline] no_escape (c : char) =
   | 'a' .. 'z' | 'A' .. 'Z'
   | '0' .. '9' | '_' | '$' -> true 
   | _ -> false
-exception Not_normal_letter 
+
+exception Not_normal_letter of int
 let name_mangle name =
   let len = String.length name  in
   try
     for i  = 0 to len - 1 do
       if not (no_escape (String.unsafe_get name i)) then
-        raise_notrace (Not_normal_letter )
+        raise_notrace (Not_normal_letter i)
     done;
     name (* Normal letter *)
   with
-  | Not_normal_letter ->
+  | Not_normal_letter i ->
     let buffer = Ext_buffer.create len in
     for j = 0 to  len - 1 do
       let c = String.unsafe_get name j in
       if no_escape c then Ext_buffer.add_char buffer c 
       else 
-        Ext_buffer.add_string buffer (convert c)        
+        Ext_buffer.add_string buffer (convert ~op:(i=0) c)        
     done; Ext_buffer.contents buffer
 
 (* TODO:

lib/4.06.1/unstable/js_compiler.ml

@@ -82022,7 +82022,7 @@ let js_module_table : Ident.t Hash_string.t = Hash_string.create 31
 
 *)
 
-let [@inline] convert (c : char) : string =
+let [@inline] convert ?(op=false) (c : char) : string =
   (match c with
    | '*' ->   "$star"
    | '\'' ->   "$p"
@@ -82031,7 +82031,7 @@ let [@inline] convert (c : char) : string =
    | '<' ->   "$less"
    | '=' ->   "$eq"
    | '+' ->   "$plus"
-   | '-' ->   "$neg"
+   | '-' ->   if op then "$neg" else "$"
    | '@' ->   "$at"
    | '^' ->   "$caret"
    | '/' ->   "$slash"
@@ -82056,23 +82056,24 @@ let [@inline] no_escape (c : char) =
   | 'a' .. 'z' | 'A' .. 'Z'
   | '0' .. '9' | '_' | '$' -> true 
   | _ -> false
-exception Not_normal_letter 
+
+exception Not_normal_letter of int
 let name_mangle name =
   let len = String.length name  in
   try
     for i  = 0 to len - 1 do
       if not (no_escape (String.unsafe_get name i)) then
-        raise_notrace (Not_normal_letter )
+        raise_notrace (Not_normal_letter i)
     done;
     name (* Normal letter *)
   with
-  | Not_normal_letter ->
+  | Not_normal_letter i ->
     let buffer = Ext_buffer.create len in
     for j = 0 to  len - 1 do
       let c = String.unsafe_get name j in
       if no_escape c then Ext_buffer.add_char buffer c 
       else 
-        Ext_buffer.add_string buffer (convert c)        
+        Ext_buffer.add_string buffer (convert ~op:(i=0) c)        
     done; Ext_buffer.contents buffer
 
 (* TODO:

lib/4.06.1/whole_compiler.ml

@@ -373278,7 +373278,7 @@ let js_module_table : Ident.t Hash_string.t = Hash_string.create 31
 
 *)
 
-let [@inline] convert (c : char) : string =
+let [@inline] convert ?(op=false) (c : char) : string =
   (match c with
    | '*' ->   "$star"
    | '\'' ->   "$p"
@@ -373287,7 +373287,7 @@ let [@inline] convert (c : char) : string =
    | '<' ->   "$less"
    | '=' ->   "$eq"
    | '+' ->   "$plus"
-   | '-' ->   "$neg"
+   | '-' ->   if op then "$neg" else "$"
    | '@' ->   "$at"
    | '^' ->   "$caret"
    | '/' ->   "$slash"
@@ -373312,23 +373312,24 @@ let [@inline] no_escape (c : char) =
   | 'a' .. 'z' | 'A' .. 'Z'
   | '0' .. '9' | '_' | '$' -> true 
   | _ -> false
-exception Not_normal_letter 
+
+exception Not_normal_letter of int
 let name_mangle name =
   let len = String.length name  in
   try
     for i  = 0 to len - 1 do
       if not (no_escape (String.unsafe_get name i)) then
-        raise_notrace (Not_normal_letter )
+        raise_notrace (Not_normal_letter i)
     done;
     name (* Normal letter *)
   with
-  | Not_normal_letter ->
+  | Not_normal_letter i ->
     let buffer = Ext_buffer.create len in
     for j = 0 to  len - 1 do
       let c = String.unsafe_get name j in
       if no_escape c then Ext_buffer.add_char buffer c 
       else 
-        Ext_buffer.add_string buffer (convert c)        
+        Ext_buffer.add_string buffer (convert ~op:(i=0) c)        
     done; Ext_buffer.contents buffer
 
 (* TODO: