handle exotic ident properly

Author: cometkim

jscomp/ext/ext_ident.ml

@@ -132,6 +132,15 @@ let [@inline] no_escape (c : char) =
   | '0' .. '9' | '_' | '$' -> true 
   | _ -> false
 
+let is_exotic name =
+  match String.unsafe_get name 0 with
+  | '\\' -> true
+  | _ -> false
+
+let unwrap_exotic name =
+  let len = String.length name in
+  String.sub name 2 (len - 3)
+
 exception Not_normal_letter of int
 let name_mangle name =
   let len = String.length name  in
@@ -157,14 +166,18 @@ let name_mangle name =
      Ext_ident.convert "^";;
      - : string = "$caret"
    ]}
-   [convert name] if [name] is a js keyword,add "$$"
+   [convert name] if [name] is a js keyword, and also is not explicitly used as exotic identifier, add "$$"
    otherwise do the name mangling to make sure ocaml identifier it is
    a valid js identifier
 *)
 let convert (name : string) =
-  if  Js_reserved_map.is_reserved name  then
-    "$$" ^ name
-  else name_mangle name
+  if is_exotic name then
+     let name = unwrap_exotic name in
+     name_mangle name
+  else
+   if Js_reserved_map.is_reserved name  then
+      "$$" ^ name
+   else name_mangle name
 
 (** keyword could be used in property *)
 

jscomp/ext/ext_ident.mli

@@ -48,7 +48,9 @@ val create_tmp :  ?name:string -> unit -> Ident.t
 
 val make_unused : unit -> Ident.t 
 
+val is_exotic : string -> bool
 
+val unwrap_exotic : string -> string
 
 (**
    Invariant: if name is not converted, the reference should be equal

jscomp/frontend/ast_external_process.ml

@@ -316,7 +316,10 @@ let parse_external_attributes (no_arguments : bool) (prim_name_check : string)
                          | Pexp_constant (Pconst_string (s, _)) -> (
                            match l.txt with
                            | Longident.Lident "type_" -> Some ("type", s)
-                           | Longident.Lident txt -> Some (txt, s)
+                           | Longident.Lident name when Ext_ident.is_exotic name
+                             ->
+                             Some (Ext_ident.unwrap_exotic name, s)
+                           | Longident.Lident name -> Some (name, s)
                            | _ ->
                              Location.raise_errorf ~loc:exp.pexp_loc
                                "Field must be a regular key.")

jscomp/stdlib-406/release.ninja

@@ -12,7 +12,7 @@ o stdlib-406/pervasives.cmj : cc_cmi stdlib-406/pervasives.res | stdlib-406/perv
     bsc_flags = $bsc_flags -nopervasives
 o stdlib-406/pervasives.cmi : cc stdlib-406/pervasives.resi | $bsc others
     bsc_flags = $bsc_flags -nopervasives
-o stdlib-406/arg.cmj : cc_cmi stdlib-406/arg.res | stdlib-406/arg.cmi stdlib-406/array.cmj stdlib-406/buffer.cmj stdlib-406/list.cmj stdlib-406/string.cmj stdlib-406/sys.cmj $bsc others
+o stdlib-406/arg.cmj : cc_cmi stdlib-406/arg.res | stdlib-406/arg.cmi stdlib-406/array.cmj stdlib-406/buffer.cmj stdlib-406/list.cmj stdlib-406/set.cmj stdlib-406/string.cmj stdlib-406/sys.cmj $bsc others
 o stdlib-406/arg.cmi : cc stdlib-406/arg.resi | stdlib-406/pervasives.cmj $bsc others
 o stdlib-406/array.cmj : cc_cmi stdlib-406/array.res | stdlib-406/array.cmi $bsc others
 o stdlib-406/array.cmi : cc stdlib-406/array.resi | stdlib-406/pervasives.cmj $bsc others

jscomp/syntax/src/res_scanner.ml

@@ -291,11 +291,10 @@ let scanNumber scanner =
   else Token.Int {i = literal; suffix}
 
 let scanExoticIdentifier scanner =
-  let buffer = Buffer.create 20 in
   let startPos = position scanner in
+  let startOff = scanner.offset in
 
-  (* TODO: are we disregarding the current char...? Should be a quote *)
-  next scanner;
+  next2 scanner;
 
   let rec scan () =
     match scanner.ch with
@@ -310,23 +309,29 @@ let scanExoticIdentifier scanner =
       let endPos = position scanner in
       scanner.err ~startPos ~endPos
         (Diagnostics.message "Did you forget a \" here?")
-    | ch ->
-      Buffer.add_char buffer ch;
+    | _ ->
       next scanner;
       scan ()
   in
   scan ();
 
-  let ident = Buffer.contents buffer in
+  let ident =
+    (String.sub [@doesNotRaise]) scanner.src startOff (scanner.offset - startOff)
+  in
+  let name =
+    (String.sub [@doesNotRaise]) scanner.src (startOff + 2)
+      (scanner.offset - startOff - 3)
+  in
+
   let _ =
-    if ident = "" then
+    if name = String.empty then
       let endPos = position scanner in
       scanner.err ~startPos ~endPos
         (Diagnostics.message "A quoted identifier can't be empty string.")
   in
 
-  (* TODO: do we really need to create a new buffer instead of substring once? *)
-  Token.Lident ident
+  if Token.isInfixOperatorTxt name then Token.Lident name
+  else Token.Lident ident
 
 let scanStringEscapeSequence ~startPos scanner =
   let scan ~n ~base ~max =
@@ -764,9 +769,7 @@ let rec scan scanner =
       | _ ->
         next scanner;
         Token.Colon)
-    | '\\' ->
-      next scanner;
-      scanExoticIdentifier scanner
+    | '\\' -> scanExoticIdentifier scanner
     | '/' -> (
       match peek scanner with
       | '/' ->

jscomp/syntax/src/res_token.ml

@@ -257,4 +257,38 @@ let isKeywordTxt str =
     true
   with Not_found -> false
 
+let infixOperatorTable = function
+  | "==" -> EqualEqual
+  | "===" -> EqualEqualEqual
+  | "-" -> Minus
+  | "-." -> MinusDot
+  | "+" -> Plus
+  | "+." -> PlusDot
+  | "++" -> PlusPlus
+  | "/" -> Forwardslash
+  | "/." -> ForwardslashDot
+  | ">" -> GreaterThan
+  | "<" -> LessThan
+  | "*" -> Asterisk
+  | "*." -> AsteriskDot
+  | "**" -> Exponentiation
+  | "||" -> Lor
+  | "&&" -> Land
+  | "!=" -> BangEqual
+  | "!==" -> BangEqualEqual
+  | ">=" -> GreaterEqual
+  | "<=" -> LessEqual
+  | _ -> raise Not_found
+[@@raises Not_found]
+
+let isInfixOperatorTxt str =
+  match str with
+  | "=" | "<>" | "^" | "~-" | "~-." | ":=" | "|." | "|.u" | "|>" ->
+    true (* Allow internally aliases to OCaml ones *)
+  | _ -> (
+    try
+      let _ = infixOperatorTable str in
+      true
+    with Not_found -> false)
+
 let catch = Lident "catch"

jscomp/test/build.ninja

@@ -0,0 +1,10 @@
+type \"Type1"
+
+type \"Type2" = string
+
+type \"Type3" = \"Type1"
+
+type \"Type4" = {
+  field: string,
+}
+let fn1 = v => v.field