Integrate menhir parser and elaborator tests

dune-project

@@ -1,4 +1,5 @@
 (lang dune 3.16)
+
 (using menhir 2.0)
 
 (name hazel)
@@ -9,15 +10,17 @@
  (github hazelgrove/hazel))
 
 (authors "Hazel Development Team")
+
 (maintainers "Hazel Development Team")
 
 (license MIT)
 
 (package
  (name hazel)
  (allow_empty)
- (synopsis "Hazel, a live functional programming environment with typed holes")
-;  (description "A longer description")
+ (synopsis
+  "Hazel, a live functional programming environment with typed holes")
+ ;  (description "A longer description")
  ; (tags
  ; (topics "to describe" your project))
  (depends
@@ -26,20 +29,31 @@
   (menhir
    (>= 2.0))
   yojson
-  (reason (>= 3.12.0))
+  (reason
+   (>= 3.12.0))
   ppx_yojson_conv_lib
   ppx_yojson_conv
   incr_dom
   bisect_ppx
-  (omd (>= 2.0.0~alpha4))
+  (omd
+   (>= 2.0.0~alpha4))
   ezjs_idb
   bonsai
   ppx_deriving
   ptmap
-  (uuidm (= 0.9.8)) ; 0.9.9 has breaking deprecated changes
+  (uuidm
+   (= 0.9.8)) ; 0.9.9 has breaking deprecated changes
   unionFind
   ocamlformat
-  (junit_alcotest :with-test)
-  ocaml-lsp-server)) ; After upgrading to opam 2.2 use with-dev https://opam.ocaml.org/blog/opam-2-2-0/
+  (junit_alcotest
+   (and
+    (>= 2.1.0)
+    :with-test))
+  ocaml-lsp-server
+  qcheck
+  qcheck-alcotest
+  ppx_deriving_qcheck))
+
+; After upgrading to opam 2.2 use with-dev https://opam.ocaml.org/blog/opam-2-2-0/
 
 ; See the complete stanza docs at https://dune.readthedocs.io/en/stable/reference/dune-project/index.html

src/haz3lcore/dynamics/Builtins.re

@@ -308,6 +308,8 @@ module Pervasives = {
   };
 
   open Impls;
+
+  // Update src/haz3lmenhir/Lexer.mll when any new builtin is added
   let builtins =
     VarMap.empty
     |> const("infinity", Float, infinity)

src/haz3lcore/lang/Form.re

@@ -256,7 +256,7 @@ let forms: list((string, t)) = [
   ("divide", mk_infix("/", Exp, P.mult)),
   ("equals", mk_infix("==", Exp, P.eqs)),
   ("string_equals", mk_infix("$==", Exp, P.eqs)),
-  ("string_concat", mk_infix("++", Exp, P.plus)),
+  ("string_concat", mk_infix("++", Exp, P.concat)),
   ("lt", mk_infix("<", Exp, P.eqs)),
   ("gt", mk_infix(">", Exp, P.eqs)),
   ("not_equals", mk_infix("!=", Exp, P.eqs)),

src/haz3lcore/pretty/ExpToSegment.re

@@ -166,7 +166,7 @@ let rec exp_to_pretty = (~settings: Settings.t, exp: Exp.t): pretty => {
   | Int(n) => text_to_pretty(exp |> Exp.rep_id, Sort.Exp, Int.to_string(n))
   // TODO: do floats print right?
   | Float(f) =>
-    text_to_pretty(exp |> Exp.rep_id, Sort.Exp, Float.to_string(f))
+    text_to_pretty(exp |> Exp.rep_id, Sort.Exp, Printf.sprintf("%f", f))
   | String(s) =>
     text_to_pretty(exp |> Exp.rep_id, Sort.Exp, "\"" ++ s ++ "\"")
   // TODO: Make sure types are correct
@@ -445,11 +445,12 @@ let rec exp_to_pretty = (~settings: Settings.t, exp: Exp.t): pretty => {
           @ (
             List.map2(
               (id, (p, e)) =>
-                settings.inline
-                  ? []
-                  : [Secondary(Secondary.mk_newline(Id.mk()))]
-                    @ [mk_form("rule", id, [p])]
-                    @ (e |> fold_if(settings.fold_case_clauses)),
+                (
+                  settings.inline
+                    ? [] : [Secondary(Secondary.mk_newline(Id.mk()))]
+                )
+                @ [mk_form("rule", id, [p])]
+                @ (e |> fold_if(settings.fold_case_clauses)),
               ids,
               rs,
             )
@@ -475,7 +476,7 @@ and pat_to_pretty = (~settings: Settings.t, pat: Pat.t): pretty => {
   | Var(v) => text_to_pretty(pat |> Pat.rep_id, Sort.Pat, v)
   | Int(n) => text_to_pretty(pat |> Pat.rep_id, Sort.Pat, Int.to_string(n))
   | Float(f) =>
-    text_to_pretty(pat |> Pat.rep_id, Sort.Pat, Float.to_string(f))
+    text_to_pretty(pat |> Pat.rep_id, Sort.Pat, Printf.sprintf("%f", f))
   | Bool(b) => text_to_pretty(pat |> Pat.rep_id, Sort.Pat, Bool.to_string(b))
   | String(s) =>
     text_to_pretty(pat |> Pat.rep_id, Sort.Pat, "\"" ++ s ++ "\"")
@@ -543,11 +544,28 @@ and typ_to_pretty = (~settings: Settings.t, typ: Typ.t): pretty => {
   let go = typ_to_pretty(~settings: Settings.t);
   let go_constructor: ConstructorMap.variant(Typ.t) => pretty =
     fun
-    | Variant(c, ids, None) => text_to_pretty(List.hd(ids), Sort.Typ, c)
+    | Variant(c, ids, None) => {
+        text_to_pretty(
+          Option.value(~default=Id.invalid, ListUtil.hd_opt(ids)),
+          Sort.Typ,
+          c,
+        );
+      }
     | Variant(c, ids, Some(x)) => {
         let+ constructor =
-          text_to_pretty(List.hd(List.tl(ids)), Sort.Typ, c);
-        constructor @ [mk_form("ap_typ", List.hd(ids), [go(x)])];
+          text_to_pretty(
+            Option.value(~default=Id.invalid, ListUtil.nth_opt(1, ids)),
+            Sort.Typ,
+            c,
+          );
+        constructor
+        @ [
+          mk_form(
+            "ap_typ",
+            Option.value(~default=Id.invalid, ListUtil.hd_opt(ids)),
+            [go(x)],
+          ),
+        ];
       }
     | BadEntry(x) => go(x);
   switch (typ |> Typ.term_of) {