diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7707c66665d0f28f0bb65121d2a74e13cef24dbe..cde6e2d46a5bbd716e2b5e894fc9a221d995b17e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -27,7 +27,7 @@ tests_with_recompilation: script: - rm -f Src/COLIBRI/lib/v7/x86_64_linux/* Src/COLIBRI/simplex_ocaml.pl #OCaml dependencies - - opam depext --install dune zarith ocplib-simplex parsexp menhir fmt spelll gen uutf + - opam depext --install dune zarith ocplib-simplex parsexp menhir fmt spelll.0.3 gen uutf #OCaml compilation - make ECLIPSEBIN=$(pwd)/Bin/ECLIPSE_V7.0_45/ #Bundle in bundle directory diff --git a/Src/COLIBRI/lib/v5/x86_64_linux/simplex_ocaml.so b/Src/COLIBRI/lib/v5/x86_64_linux/simplex_ocaml.so index 199febcef83b14d12f4bf6384b6df8aea20883fc..cc7d62b72f2e6a2d7cfa4858792d7315cca1dca9 100755 Binary files a/Src/COLIBRI/lib/v5/x86_64_linux/simplex_ocaml.so and b/Src/COLIBRI/lib/v5/x86_64_linux/simplex_ocaml.so differ diff --git a/Src/COLIBRI/lib/v7/x86_64_linux/simplex_ocaml.so b/Src/COLIBRI/lib/v7/x86_64_linux/simplex_ocaml.so index 85e191499fa6afb6290fc9b1bfd6d5619290ffa3..f36788ae47a137e0bfd0bb4bad70159dbead8726 100755 Binary files a/Src/COLIBRI/lib/v7/x86_64_linux/simplex_ocaml.so and b/Src/COLIBRI/lib/v7/x86_64_linux/simplex_ocaml.so differ diff --git a/Src/COLIBRI/simplex_ocaml/Dockerfile b/Src/COLIBRI/simplex_ocaml/Dockerfile index f46c312714400d9a4cb792d9cdfcb018be598425..d0177cdff161603839b585360ed22ece905b89be 100644 --- a/Src/COLIBRI/simplex_ocaml/Dockerfile +++ b/Src/COLIBRI/simplex_ocaml/Dockerfile @@ -1,6 +1,6 @@ # ocaml/opam:debian-10-ocaml-4.11 FROM ocaml/opam@sha256:e570e5dd74bb4986e022d5c25fe42579288d11fb0b60df13794632a8f0a110b6 -RUN [ "opam", "depext", "--install", "dune", "ocplib-simplex", "zarith", "parsexp", "menhir", "fmt", "spelll", "uutf", "gen" ] +RUN [ "opam", "depext", "--install", "dune", "ocplib-simplex", "zarith", "parsexp", "menhir", "fmt", "spelll.0.3", "uutf", "gen" ] RUN [ "mkdir", "/home/opam/build" ] diff --git a/Src/COLIBRI/simplex_ocaml/dolmen/src/typecheck/misc.ml b/Src/COLIBRI/simplex_ocaml/dolmen/src/typecheck/misc.ml index bdf8dd73e829291914847db5feb1f97cb3f9e6e2..9967ea23d2e281df85659ef372b721fb44fa73b7 100644 --- a/Src/COLIBRI/simplex_ocaml/dolmen/src/typecheck/misc.ml +++ b/Src/COLIBRI/simplex_ocaml/dolmen/src/typecheck/misc.ml @@ -232,9 +232,9 @@ module Fuzzy_Map = struct let empty = I.empty - let rec seq_to_list_ s = match s with - | `Nil -> [] - | `Cons (x,y) -> x :: seq_to_list_ (y ()) + let rec seq_to_list_ s = match s() with + | Seq.Nil -> [] + | Seq.Cons (x,y) -> x :: seq_to_list_ y let get t id = let s = Dolmen.Std.Id.(id.name) in