Variants and records.

Author: cristianoc

analysis/src/Actions.ml

@@ -2,18 +2,41 @@ let posInLoc ~pos ~loc =
   Utils.tupleOfLexing loc.Location.loc_start <= pos
   && pos < Utils.tupleOfLexing loc.loc_end
 
+let rec listToPat ~itemToPat = function
+  | [] -> Some []
+  | x :: xList -> (
+    match (itemToPat x, listToPat ~itemToPat xList) with
+    | Some p, Some pList -> Some (p :: pList)
+    | _ -> None)
+
 let rec expToPat (exp : Parsetree.expression) =
   let mkPat ppat_desc =
     Ast_helper.Pat.mk ~loc:exp.pexp_loc ~attrs:exp.pexp_attributes ppat_desc
   in
   match exp.pexp_desc with
-  | Pexp_construct (lid, None) ->
-    Some (mkPat (Parsetree.Ppat_construct (lid, None)))
+  | Pexp_construct (lid, None) -> Some (mkPat (Ppat_construct (lid, None)))
   | Pexp_construct (lid, Some e1) -> (
     match expToPat e1 with
     | None -> None
-    | Some p1 -> Some (mkPat (Parsetree.Ppat_construct (lid, Some p1))))
-  | Pexp_constant c -> Some (mkPat (Parsetree.Ppat_constant c))
+    | Some p1 -> Some (mkPat (Ppat_construct (lid, Some p1))))
+  | Pexp_variant (label, None) -> Some (mkPat (Ppat_variant (label, None)))
+  | Pexp_variant (label, Some e1) -> (
+    match expToPat e1 with
+    | None -> None
+    | Some p1 -> Some (mkPat (Ppat_variant (label, Some p1))))
+  | Pexp_constant c -> Some (mkPat (Ppat_constant c))
+  | Pexp_tuple eList -> (
+    match listToPat ~itemToPat:expToPat eList with
+    | None -> None
+    | Some patList -> Some (mkPat (Ppat_tuple patList)))
+  | Pexp_record (items, None) -> (
+    let itemToPat (x, e) =
+      match expToPat e with None -> None | Some p -> Some (x, p)
+    in
+    match listToPat ~itemToPat items with
+    | None -> None
+    | Some patItems -> Some (mkPat (Ppat_record (patItems, Closed))))
+  | Pexp_record (_, Some _) -> None
   | _ -> None
 
 let mkMapper ~pos ~changed =

analysis/tests/src/Actions.res

@@ -1,4 +1,5 @@
 type kind = First | Second | Third
+type r = {name: string, age: int}
 
 let _ = (kind, kindStr) => {
   let _ifThenElse = if kind == First {
@@ -8,6 +9,6 @@ let _ = (kind, kindStr) => {
     "Not First"
   }
 
-  let _ternary = "First" != kindStr ? "Not First" : "First"
+  let _ternary = #kind("First", {name: "abc", age: 3}) != kindStr ? "Not First" : "First"
   //     ^act
 }

analysis/tests/src/expected/Actions.res.txt

@@ -1,7 +1,8 @@
-Actions tests/src/Actions.res 3:10
+Actions tests/src/Actions.res 4:10
 Hit _ifThenElse
 Formatted:
 type kind = First | Second | Third
+type r = {name: string, age: int}
 
 let _ = (kind, kindStr) => {
   let _ifThenElse = switch kind {
@@ -10,14 +11,15 @@ let _ = (kind, kindStr) => {
   | _ => "Not First"
   }
 
-  let _ternary = "First" != kindStr ? "Not First" : "First"
+  let _ternary = #kind("First", {name: "abc", age: 3}) != kindStr ? "Not First" : "First"
   //     ^act
 }
 
-Actions tests/src/Actions.res 10:9
+Actions tests/src/Actions.res 11:9
 Hit _ternary
 Formatted:
 type kind = First | Second | Third
+type r = {name: string, age: int}
 
 let _ = (kind, kindStr) => {
   let _ifThenElse = if kind == First {
@@ -28,7 +30,7 @@ let _ = (kind, kindStr) => {
   }
 
   let _ternary = switch kindStr {
-  | "First" => "First"
+  | #kind("First", {name: "abc", age: 3}) => "First"
   | _ => "Not First"
   }
   //     ^act