Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update colibri2 and dolmen #216

Merged
merged 3 commits into from
Sep 17, 2024
Merged

Update colibri2 and dolmen #216

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
84a0bfd
Update colibri2 and dolmen
hra687261 Sep 17, 2024
21d7152
remove unnessary pinned depedence on colibrilib
hra687261 Sep 17, 2024
22daa20
Add back colibrilib pin dependency to fix CI
hra687261 Sep 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion dune-project
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
(depends
dune
(dolmen
(< "0.10"))
(= "0.10"))
(ocaml
(>= "4.14.0"))
(prelude
Expand Down
6 changes: 3 additions & 3 deletions smtml.opam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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"]
]
4 changes: 2 additions & 2 deletions smtml.opam.template
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"]
]
4 changes: 2 additions & 2 deletions src/parser/parse.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 7 additions & 1 deletion src/parser/smtlib.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)