Generalize Some case.

Author: cristianoc

src/res_core.ml

@@ -3082,25 +3082,20 @@ and parseExprBlockItem p =
       match letBindings with
       | [
        {
-         pvb_pat =
-           {
-             ppat_desc =
-               Ppat_construct
-                 ({txt = Lident "Some"}, Some ({ppat_desc = Ppat_var _} as pat));
-           };
+         pvb_pat = {ppat_desc = Ppat_construct ({txt = Lident "Some"}, Some pat)};
          pvb_expr;
        };
       ]
         when recFlag = Nonrecursive ->
         let lid_none = Location.mknoloc (Longident.Lident "None") in
-        let pat_none = Ast_helper.Pat.construct lid_none None in
+        let pat_any = Ast_helper.Pat.any () in
         let exp_none = Ast_helper.Exp.construct lid_none None in
-        let case_none = Ast_helper.Exp.case pat_none exp_none in
+        let case_any = Ast_helper.Exp.case pat_any exp_none in
         let lid_some = Location.mknoloc (Longident.Lident "Some") in
         let pat_some = Ast_helper.Pat.construct lid_some (Some pat) in
         let case_some = Ast_helper.Exp.case pat_some next in
         let match_exp =
-          Ast_helper.Exp.match_ ~loc pvb_expr [case_none; case_some]
+          Ast_helper.Exp.match_ ~loc pvb_expr [case_some; case_any]
         in
         match_exp
       | _ -> Ast_helper.Exp.let_ ~loc recFlag letBindings next

tests/parsing/grammar/expressions/LetSome.res

@@ -1,7 +1,7 @@
 let foo = (x, y) => {
   let Some(vx) = x
-  let x1 = vx+1
-  let Some(vy) = y
-  let y1 = vy+1
+  let x1 = vx + 1
+  let Some({vy, vz: 3}) = y
+  let y1 = vy + 1
   Some(x1 + y1)
 }

tests/parsing/grammar/expressions/expected/LetSome.res.txt

@@ -1,9 +1,9 @@
 let foo x y =
   ((match x with
-    | None -> None
     | Some vx ->
         let x1 = vx + 1 in
         (match y with
-         | None -> None
-         | Some vy -> let y1 = vy + 1 in Some (x1 + y1)))
+         | Some { vy; vz = 3 } -> let y1 = vy + 1 in Some (x1 + y1)
+         | _ -> None)
+    | _ -> None)
   [@ns.braces ])