diff --git a/dune-project b/dune-project index 5fdc3b54..4c4a7b21 100644 --- a/dune-project +++ b/dune-project @@ -41,7 +41,7 @@ (depends dune (dolmen - (< "0.10")) + (= "0.10")) (ocaml (>= "4.14.0")) (prelude diff --git a/smtml.opam b/smtml.opam index 1d67f6db..32eb84e7 100644 --- a/smtml.opam +++ b/smtml.opam @@ -10,7 +10,7 @@ doc: "https://formalsec.github.io/smtml/smtml/index.html" bug-reports: "https://github.com/formalsec/smtml/issues" depends: [ "dune" {>= "3.10"} - "dolmen" {< "0.10"} + "dolmen" {= "0.10"} "ocaml" {>= "4.14.0"} "prelude" {>= "0.3"} "ocaml_intrinsics" @@ -53,7 +53,7 @@ build: [ dev-repo: "git+https://github.com/formalsec/smtml.git" available: arch != "arm32" & arch != "x86_32" pin-depends: [ - ["colibri2.0.4.0" "git+https://git.frama-c.com/pub/colibrics.git#6e302cc50d82b8fb04f1b37debf3bc4dafbd3e1b"] - ["colibrilib.0.4.0" "git+https://git.frama-c.com/pub/colibrics.git#6e302cc50d82b8fb04f1b37debf3bc4dafbd3e1b"] + ["colibri2.0.4.0" "git+https://git.frama-c.com/pub/colibrics.git#1feba887bbb7980f27bbcec8137eb908caa8f0ce"] + ["colibrilib.0.4.0" "git+https://git.frama-c.com/pub/colibrics.git#1feba887bbb7980f27bbcec8137eb908caa8f0ce"] ["benchpress.dev" "git+https://github.com/filipeom/benchpress.git#50355de32835b12f1b065a4700f493bc3d8c5342"] ] diff --git a/smtml.opam.template b/smtml.opam.template index a53c6337..933bd2f1 100644 --- a/smtml.opam.template +++ b/smtml.opam.template @@ -1,6 +1,6 @@ available: arch != "arm32" & arch != "x86_32" pin-depends: [ - ["colibri2.0.4.0" "git+https://git.frama-c.com/pub/colibrics.git#6e302cc50d82b8fb04f1b37debf3bc4dafbd3e1b"] - ["colibrilib.0.4.0" "git+https://git.frama-c.com/pub/colibrics.git#6e302cc50d82b8fb04f1b37debf3bc4dafbd3e1b"] + ["colibri2.0.4.0" "git+https://git.frama-c.com/pub/colibrics.git#1feba887bbb7980f27bbcec8137eb908caa8f0ce"] + ["colibrilib.0.4.0" "git+https://git.frama-c.com/pub/colibrics.git#1feba887bbb7980f27bbcec8137eb908caa8f0ce"] ["benchpress.dev" "git+https://github.com/filipeom/benchpress.git#50355de32835b12f1b065a4700f493bc3d8c5342"] ] diff --git a/src/parser/parse.ml b/src/parser/parse.ml index 7886b8f9..8a232258 100644 --- a/src/parser/parse.ml +++ b/src/parser/parse.ml @@ -55,8 +55,8 @@ end module Smtlib = struct let from_file filename = try - let _, stmts = Smtlib.parse_file (Fpath.to_string filename) in - stmts + let _, st = Smtlib.parse_all (`File (Fpath.to_string filename)) in + Lazy.force st with | Dolmen.Std.Loc.Syntax_error (loc, `Regular msg) -> Fmt.failwith "%a: syntax error: %t" Dolmen.Std.Loc.print_compact loc msg diff --git a/src/parser/smtlib.ml b/src/parser/smtlib.ml index d1d5710e..5c76cbe0 100644 --- a/src/parser/smtlib.ml +++ b/src/parser/smtlib.ml @@ -230,4 +230,10 @@ module Statement = struct Set_logic ALL end -include Dolmen.Smtlib2.Script.Latest.Make (Loc) (Symbol) (Term) (Statement) +module Extension = struct + let statement _ = None +end + +include + Dolmen.Smtlib2.Script.Latest.Make (Loc) (Symbol) (Term) (Statement) + (Extension)