diff --git a/dune-project b/dune-project index a8e9d1152..96cc1c1de 100644 --- a/dune-project +++ b/dune-project @@ -1,4 +1,5 @@ (lang dune 3.16) + (using menhir 2.0) (name hazel) @@ -9,6 +10,7 @@ (github hazelgrove/hazel)) (authors "Hazel Development Team") + (maintainers "Hazel Development Team") (license MIT) @@ -16,8 +18,9 @@ (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,23 +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) + (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/ + 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 diff --git a/hazel.opam b/hazel.opam index 16ed5457b..00159279f 100644 --- a/hazel.opam +++ b/hazel.opam @@ -24,7 +24,7 @@ depends: [ "uuidm" {= "0.9.8"} "unionFind" "ocamlformat" - "junit_alcotest" {with-test} + "junit_alcotest" {>= "2.1.0" & with-test} "ocaml-lsp-server" "qcheck" "qcheck-alcotest" diff --git a/hazel.opam.locked b/hazel.opam.locked index 399042a83..dd4d38bbb 100644 --- a/hazel.opam.locked +++ b/hazel.opam.locked @@ -102,8 +102,8 @@ depends: [ "jsonm" {= "1.0.2"} "jsonrpc" {= "1.19.0"} "jst-config" {= "v0.16.0"} - "junit" {= "2.0.2" & with-test} - "junit_alcotest" {= "2.0.2" & with-test} + "junit" {= "2.1.0" & with-test} + "junit_alcotest" {= "2.1.0" & with-test} "lambdasoup" {= "1.1.1"} "logs" {= "0.7.0"} "lsp" {= "1.19.0"} diff --git a/test/Test_Menhir.re b/test/Test_Menhir.re index cd9273919..311432f8e 100644 --- a/test/Test_Menhir.re +++ b/test/Test_Menhir.re @@ -832,28 +832,26 @@ let ex5 = list_of_mylist(x) in |}, ), // This fails because MakeTerm can't handle left to right keyword prefixes. - // Skipped tests are commented out because of junit alcotest bug https://github.com/Khady/ocaml-junit/issues/9 - // skip_menhir_maketerm_equivalent_test( - // "Prefixed keyword parses", - // {|let ? = ina in ?|}, - // ), - // // Menhir is doing the skipped better than MakeTerm - // skip_menhir_maketerm_equivalent_test( - // "Prefixed keyword parses", - // {|type ? = rec ? -> + Aramj -> Bool in ?|}, - // ), - // skip_menhir_maketerm_equivalent_test( - // "List concat and typap", - // {|type ? = (+ Ulog, () -> Float) in let (()) = (()) in 0.001536|}, - // ), - // skip_menhir_maketerm_equivalent_test( - // "Sum in product in typeap", - // {|((fun _ -> b)) @< [(+ Kfgii, Float)] >|}, - // ), - // skip_menhir_maketerm_equivalent_test( - // "Non-unique constructors currently throws in equality", - // {|type ? = ((+ ? + ?)) in []|}, - // ), + skip_menhir_maketerm_equivalent_test( + "Prefixed keyword parses", + {|let ? = ina in ?|}, + ), + skip_menhir_maketerm_equivalent_test( + "Sum type messed up in make term", + {|type ? = rec ? -> + Aramj -> Bool in ?|}, + ), + skip_menhir_maketerm_equivalent_test( + "List concat and typap", + {|type ? = (+ Ulog, () -> Float) in let (()) = (()) in 0.001536|}, + ), + skip_menhir_maketerm_equivalent_test( + "Sum in product in typeap", + {|((fun _ -> b)) @< [(+ Kfgii, Float)] >|}, + ), + skip_menhir_maketerm_equivalent_test( + "Non-unique constructors currently throws in equality", + {|type ? = ((+ ? + ?)) in []|}, + ), QCheck_alcotest.to_alcotest(qcheck_menhir_maketerm_equivalent_test), // Disabled due to bugs in ExpToSegment // e.g. https://github.com/hazelgrove/hazel/issues/1445