upgrade parser for bug fixes #28af6d5

Author: bobzhang

jscomp/common/bs_version.ml

@@ -22,7 +22,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *)
-let version = "9.1.2"
+let version = "9.1.3"
 let header =
   "// Generated by ReScript, PLEASE EDIT WITH CARE"
 let package_name = ref "rescript"

lib/4.06.1/bsb.ml

@@ -55,7 +55,7 @@ end = struct
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *)
-let version = "9.1.2"
+let version = "9.1.3"
 let header =
   "// Generated by ReScript, PLEASE EDIT WITH CARE"
 let package_name = ref "rescript"

lib/4.06.1/rescript.ml

@@ -5940,7 +5940,7 @@ end = struct
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *)
-let version = "9.1.2"
+let version = "9.1.3"
 let header =
   "// Generated by ReScript, PLEASE EDIT WITH CARE"
 let package_name = ref "rescript"

lib/4.06.1/unstable/js_compiler.ml

@@ -18039,7 +18039,7 @@ end = struct
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *)
-let version = "9.1.2"
+let version = "9.1.3"
 let header =
   "// Generated by ReScript, PLEASE EDIT WITH CARE"
 let package_name = ref "rescript"

lib/4.06.1/whole_compiler.ml

@@ -304481,7 +304481,7 @@ end = struct
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *)
-let version = "9.1.2"
+let version = "9.1.3"
 let header =
   "// Generated by ReScript, PLEASE EDIT WITH CARE"
 let package_name = ref "rescript"
@@ -414723,6 +414723,8 @@ val isUnderscoreApplySugar: Parsetree.expression -> bool
 
 val hasIfLetAttribute: Parsetree.attributes -> bool
 
+val isRewrittenUnderscoreApplySugar: Parsetree.expression -> bool
+
 end = struct
 #1 "res_parsetree_viewer.ml"
 open Parsetree
@@ -415297,6 +415299,11 @@ let isUnderscoreApplySugar expr =
     ) -> true
   | _ -> false
 
+let isRewrittenUnderscoreApplySugar expr =
+  match expr.pexp_desc with
+  | Pexp_ident {txt = Longident.Lident "_"} -> true
+  | _ -> false
+
 end
 module Res_comments_table
 = struct
@@ -423680,7 +423687,8 @@ and printPexpApply expr cmtTbl =
   | Pexp_apply (
       {pexp_desc = Pexp_ident {txt = Longident.Ldot (Lident "Array", "get")}},
       [Nolabel, parentExpr; Nolabel, memberExpr]
-    ) ->
+    ) when not (ParsetreeViewer.isRewrittenUnderscoreApplySugar parentExpr) ->
+      (* Don't print the Array.get(_, 0) sugar a.k.a. (__x) => Array.get(__x, 0) as _[0] *)
       let member =
         let memberDoc =
           let doc = printExpressionWithComments memberExpr cmtTbl in
@@ -425346,7 +425354,7 @@ Explanation: since records have a known, fixed shape, a spread like `{a, ...b}`
 Explanation: lists are singly-linked list, where a node contains a value and points to the next node. `list[a, ...bc]` efficiently creates a new item and links `bc` as its next nodes. `[...bc, a]` would be expensive, as it'd need to traverse `bc` and prepend each item to `a` one by one. We therefore disallow such syntax sugar.\n\
 Solution: directly use `concat`."
 
-  let variantIdent = "A polymorphic variant (e.g. #id) must start with an alphabetical letter."
+  let variantIdent = "A polymorphic variant (e.g. #id) must start with an alphabetical letter or be a number (e.g. #742)"
 
   let experimentalIfLet expr =
     let switchExpr = {expr with Parsetree.pexp_attributes = []} in
@@ -425393,6 +425401,9 @@ Solution: directly use `concat`."
 
   let sameTypeSpread =
     "You're using a ... spread without extra fields. This is the same type."
+
+  let polyVarIntWithSuffix number =
+    "A numeric polymorphic variant cannot be followed by a letter. Did you mean `#" ^ number ^ "`?"
 end
 
 
@@ -425427,14 +425438,15 @@ let getClosingToken = function
   | Lbrace -> Rbrace
   | Lbracket -> Rbracket
   | List -> Rbrace
+  | LessThan -> GreaterThan
   | _ -> assert false
 
 let rec goToClosing closingToken state =
   match (state.Parser.token, closingToken) with
-  | (Rparen, Token.Rparen) | (Rbrace, Rbrace) | (Rbracket, Rbracket) ->
+  | (Rparen, Token.Rparen) | (Rbrace, Rbrace) | (Rbracket, Rbracket) | (GreaterThan, GreaterThan) ->
     Parser.next state;
     ()
-  | (Token.Lbracket | Lparen | Lbrace | List) as t, _ ->
+  | (Token.Lbracket | Lparen | Lbrace | List | LessThan) as t, _ ->
     Parser.next state;
     goToClosing (getClosingToken t) state;
     goToClosing closingToken state
@@ -425463,10 +425475,32 @@ let isEs6ArrowExpression ~inTernary p =
       let prevEndPos = state.prevEndPos in
       Parser.next state;
       begin match state.token with
+      (* arrived at `()` here *)
       | Rparen ->
         Parser.next state;
         begin match state.Parser.token with
-        | Colon when not inTernary -> true
+        (* arrived at `() :` here *)
+        | Colon when not inTernary ->
+          Parser.next state;
+          begin match state.Parser.token with
+          (* arrived at `() :typ` here *)
+          | Lident _ ->
+            Parser.next state;
+            begin match state.Parser.token with
+            (* arrived at `() :typ<` here *)
+            | LessThan ->
+              Parser.next state;
+              goToClosing GreaterThan state;
+            | _ -> ()
+            end;
+            begin match state.Parser.token with
+            (* arrived at `() :typ =>` or `() :typ<'a,'b> =>` here *)
+            | EqualGreater ->
+              true
+            | _ -> false
+            end
+          | _ -> true
+          end
         | EqualGreater -> true
         | _ -> false
         end
@@ -425942,7 +425976,12 @@ let parseHashIdent ~startPos p =
     Parser.next p;
     let text = if p.mode = ParseForTypeChecker then parseStringLiteral text else text in
     (text, mkLoc startPos p.prevEndPos)
-  | Int {i} ->
+  | Int {i; suffix} ->
+    let () = match suffix with
+    | Some _ ->
+      Parser.err p (Diagnostics.message (ErrorMessages.polyVarIntWithSuffix i))
+    | None -> ()
+    in
     Parser.next p;
     (i, mkLoc startPos p.prevEndPos)
   | _ ->
@@ -426448,7 +426487,12 @@ let rec parsePattern ?(alias=true) ?(or_=true) p =
         Parser.next p;
         let text = if p.mode = ParseForTypeChecker then parseStringLiteral text else text in
         (text, mkLoc startPos p.prevEndPos)
-      | Int {i} ->
+      | Int {i; suffix} ->
+        let () = match suffix with
+        | Some _ ->
+          Parser.err p (Diagnostics.message (ErrorMessages.polyVarIntWithSuffix i))
+        | None -> ()
+        in
         Parser.next p;
         (i, mkLoc startPos p.prevEndPos)
       | _ ->
@@ -429642,7 +429686,11 @@ and parseConstrDeclArgs p =
             ) in
             Parser.expect Rbrace p;
             let loc = mkLoc startPos p.prevEndPos in
-            let typ = Ast_helper.Typ.object_ ~loc ~attrs:[] fields closedFlag in
+            let typ =
+              Ast_helper.Typ.object_ ~loc ~attrs:[] fields closedFlag
+              |> parseTypeAlias p
+            in
+            let typ = parseArrowTypeRest ~es6Arrow:true ~startPos typ p in
             Parser.optional p Comma |> ignore;
             let moreArgs =
               parseCommaDelimitedRegion
@@ -433164,8 +433212,34 @@ let printPolyVarIdent txt =
        )
      | Otyp_arrow _ as typ ->
        printOutArrowType ~uncurried:false typ
-     | Otyp_module (_modName, _stringList, _outTypes) ->
-         Doc.nil
+     | Otyp_module (modName, stringList, outTypes) ->
+      let packageTypeDoc = match (stringList, outTypes) with
+      | [], [] -> Doc.nil
+      | labels, types ->
+        let i = ref 0 in
+        let package = Doc.join ~sep:Doc.line (List.map2 (fun lbl typ ->
+          Doc.concat [
+            Doc.text (if i.contents > 0 then "and " else "with ");
+            Doc.text lbl;
+            Doc.text " = ";
+            printOutTypeDoc typ;
+          ]
+        ) labels types)
+        in
+        Doc.indent (
+          Doc.concat [
+            Doc.line;
+            package
+          ]
+        )
+      in
+       Doc.concat [
+         Doc.text "module";
+         Doc.lparen;
+         Doc.text modName;
+         packageTypeDoc;
+         Doc.rparen;
+       ]
 
    and printOutArrowType ~uncurried typ =
      let (typArgs, typ) = collectArrowArgs typ [] in
@@ -433419,8 +433493,8 @@ let printPolyVarIdent txt =
                  Doc.text " =";
                  Doc.line;
                  Doc.group (
-                   Doc.join ~sep:Doc.line (List.map (fun prim -> 
-                       let prim = if prim <> "" && prim.[0] = '\132' then "#rescript-external" else prim in 
+                   Doc.join ~sep:Doc.line (List.map (fun prim ->
+                       let prim = if prim <> "" && (prim.[0] [@doesNotRaise]) = '\132' then "#rescript-external" else prim in
                        (* not display those garbage '\132' is a magic number for marshal *)
                        Doc.text ("\"" ^ prim ^ "\"")) primitives)
                  )
@@ -433461,10 +433535,10 @@ let printPolyVarIdent txt =
            match outRecStatus with
            | Orec_not -> "module "
            | Orec_first -> "module rec "
-           | Orec_next -> "and"
+           | Orec_next -> "and "
          );
          Doc.text modName;
-         Doc.text " = ";
+         Doc.text ": ";
          printOutModuleTypeDoc outModType;
        ]
      )

package.json

@@ -18,7 +18,7 @@
     "coverage": "nyc --timeout=3000 --reporter=html mocha jscomp/test/*test.js && open ./coverage/index.html"
   },
   "name": "rescript",
-  "version": "9.1.2",
+  "version": "9.1.3",
   "description": "ReScript toolchain",
   "repository": {
     "type": "git",