Added type variables to the menhir parser

hazelgrove · Nov 7, 2024 · ad1ffec · ad1ffec
1 parent d444d6e
commit ad1ffec
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 7,037 deletions.
diff --git a/src/haz3lmenhir/AST.re b/src/haz3lmenhir/AST.re
@@ -79,6 +79,7 @@ type typ =
   | TupleType(list(typ))
   | ArrayType(typ)
   | ArrowType(typ, typ)
+  | Var(string)
   | InvalidTyp(string);
 
 [@deriving (show({with_path: false}), sexp)]

diff --git a/src/haz3lmenhir/Conversion.re b/src/haz3lmenhir/Conversion.re
@@ -225,6 +225,7 @@ and Typ: {
       switch (p) {
       | Internal => Unknown(Internal)
       }
+    | Var(s) => Var(s)
     | TupleType(ts) => Prod(List.map(of_menhir_ast, ts))
     | ArrayType(t) => List(of_menhir_ast(t))
     | ArrowType(t1, t2) => Arrow(of_menhir_ast(t1), of_menhir_ast(t2))

diff --git a/src/haz3lmenhir/Parser.automaton b/src/haz3lmenhir/Parser.automaton
diff --git a/src/haz3lmenhir/Parser.conflicts b/src/haz3lmenhir/Parser.conflicts
diff --git a/src/haz3lmenhir/Parser.mly b/src/haz3lmenhir/Parser.mly
@@ -174,6 +174,7 @@ binExp:
     | e1 = exp; b = binOp; e2 = exp { BinExp (e1, b, e2) }
 
 typ:
+    | c = CONSTRUCTOR_IDENT { Var(c) }
     | QUESTION; T_TYP; s = STRING { InvalidTyp(s) }
     | INT_TYPE { IntType }
     | FLOAT_TYPE { FloatType }

diff --git a/test/Test_Menhir.re b/test/Test_Menhir.re
@@ -280,12 +280,12 @@ let tests = [
     "A ~ Int",
   ),
   // TODO Fix for the tests below
-  skip_menhir_only_test(
+  menhir_only_test(
     "Constructor with Type Variable",
     Constructor("A", Var("T") |> Typ.fresh) |> Exp.fresh,
     "A ~ T",
   ),
-  skip_parser_test(
+  parser_test(
     "Type Variable",
     Let(
       Cast(