wip

Author: cometkim

jscomp/stdlib-406/release.ninja

@@ -68,7 +68,7 @@ o stdlib-406/pervasivesU.cmj : cc_cmi stdlib-406/pervasivesU.res | stdlib-406/pe
 o stdlib-406/pervasivesU.cmi : cc stdlib-406/pervasivesU.resi | stdlib-406/pervasives.cmj $bsc others
 o stdlib-406/queue.cmj : cc_cmi stdlib-406/queue.res | stdlib-406/queue.cmi $bsc others
 o stdlib-406/queue.cmi : cc stdlib-406/queue.resi | stdlib-406/pervasives.cmj $bsc others
-o stdlib-406/random.cmj : cc_cmi stdlib-406/random.res | stdlib-406/array.cmj stdlib-406/char.cmj stdlib-406/digest.cmj stdlib-406/int32.cmj stdlib-406/int64.cmj stdlib-406/random.cmi stdlib-406/string.cmj $bsc others
+o stdlib-406/random.cmj : cc_cmi stdlib-406/random.res | stdlib-406/array.cmj stdlib-406/char.cmj stdlib-406/digest.cmj stdlib-406/int32.cmj stdlib-406/int64.cmj stdlib-406/random.cmi $bsc others
 o stdlib-406/random.cmi : cc stdlib-406/random.resi | stdlib-406/int32.cmi stdlib-406/int64.cmi stdlib-406/pervasives.cmj $bsc others
 o stdlib-406/set.cmj : cc_cmi stdlib-406/set.res | stdlib-406/list.cmj stdlib-406/set.cmi $bsc others
 o stdlib-406/set.cmi : cc stdlib-406/set.resi | stdlib-406/pervasives.cmj $bsc others

jscomp/syntax/src/res_core.ml

@@ -384,20 +384,39 @@ let buildLongident words =
   | hd :: tl -> List.fold_left (fun p s -> Longident.Ldot (p, s)) (Lident hd) tl
 
 let makeInfixOperator (p : Parser.t) token startPos endPos =
+  (* FIXME: why this always gonna be true???? *)
+  let isBinaryOp =
+    Lexing.(Scanner.isBinaryOp p.scanner.src startPos.pos_cnum endPos.pos_cnum)
+  in
   let stringifiedToken =
-    if token = Token.MinusGreater then
-      if p.uncurried_config = Legacy then "|." else "|.u"
-    else if token = Token.PlusPlus then "^"
-    else if token = Token.BangEqual then "<>"
-    else if token = Token.BangEqualEqual then "!="
-    else if token = Token.Equal then (
-      (* TODO: could have a totally different meaning like x->fooSet(y)*)
-      Parser.err ~startPos ~endPos p
-        (Diagnostics.message "Did you mean `==` here?");
-      "=")
-    else if token = Token.EqualEqual then "="
-    else if token = Token.EqualEqualEqual then "=="
-    else Token.toString token
+    if isBinaryOp then
+      match token with
+      | Token.Minus ->
+        print_endline "@@@ binary";
+        Ext_ident.wrap_exotic "-"
+      | Token.PlusPlus -> Ext_ident.wrap_exotic "^"
+      | Token.BangEqual -> Ext_ident.wrap_exotic "<>"
+      | Token.BangEqualEqual -> Ext_ident.wrap_exotic "!="
+      | Token.Equal ->
+        (* TODO: could have a totally different meaning like x->fooSet(y)*)
+        Parser.err ~startPos ~endPos p
+          (Diagnostics.message "Did you mean `==` here?");
+        "="
+      | Token.EqualEqual -> Ext_ident.wrap_exotic "="
+      | Token.EqualEqualEqual -> Ext_ident.wrap_exotic "=="
+      | Token.GreaterThan -> Ext_ident.wrap_exotic ">"
+      | Token.LessThan -> Ext_ident.wrap_exotic "<"
+      | token -> Ext_ident.wrap_exotic (Token.toString token)
+    else
+      (* unary *)
+      match token with
+      | Token.Minus ->
+        print_endline "@@@ unary";
+        Ext_ident.wrap_exotic "~-"
+      | Token.MinusDot -> Ext_ident.wrap_exotic "~-."
+      | Token.MinusGreater when p.uncurried_config = Legacy -> "|."
+      | Token.MinusGreater -> "|.u"
+      | token -> Ext_ident.wrap_exotic (Token.toString token)
   in
   let loc = mkLoc startPos endPos in
   let operator = Location.mkloc (Longident.Lident stringifiedToken) loc in

jscomp/syntax/src/res_scanner.ml

@@ -323,13 +323,13 @@ let scanExoticIdentifier scanner =
       (String.sub [@doesNotRaise]) scanner.src (startOff + 2)
         (scanner.offset - startOff - 3)
     in
-    if name = String.empty then (
-      let endPos = position scanner in
-      scanner.err ~startPos ~endPos
-        (Diagnostics.message "A quoted identifier can't be empty string.");
-      Token.Lident ident)
-    else if Token.isInfixOperatorTxt name then Token.Lident name
-    else Token.Lident ident
+    let _ =
+      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
+    Token.Lident ident
 
 let scanStringEscapeSequence ~startPos scanner =
   let scan ~n ~base ~max =

jscomp/syntax/src/res_token.ml

@@ -257,38 +257,4 @@ 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"