Skip to content
Snippets Groups Projects
Commit d872b5f8 authored by Ike Mulder's avatar Ike Mulder
Browse files

Merge branch 'ci/update-iris-to-dev.2024-09-11.3.0203d5ca' into 'master'

Fix proof breakage by not importing String module, update Iris

See merge request !22
parents ec012789 b07c136f
Branches
Tags
1 merge request!22Fix proof breakage by not importing String module, update Iris
Pipeline #107152 passed
...@@ -7,7 +7,7 @@ authors: "Ike Mulder <me@ikemulder.nl>" ...@@ -7,7 +7,7 @@ authors: "Ike Mulder <me@ikemulder.nl>"
homepage: "https://gitlab.mpi-sws.org/iris/diaframe/" homepage: "https://gitlab.mpi-sws.org/iris/diaframe/"
bug-reports: "https://gitlab.mpi-sws.org/iris/diaframe/-/issues" bug-reports: "https://gitlab.mpi-sws.org/iris/diaframe/-/issues"
depends: [ depends: [
"coq-iris" { (>= "dev.2024-08-16.3.8890e30a" & <= "dev.2024-09-10.0.f14ebfde" ) | = "dev" | = "4.1.0" } "coq-iris" { (>= "dev.2024-08-16.3.8890e30a" & <= "dev.2024-09-11.3.0203d5ca" ) | = "dev" | = "4.1.0" }
"coq" { >= "8.18" & < "8.20~" } "coq" { >= "8.18" & < "8.20~" }
] ]
build: [make "-j%{jobs}%" "diaframe"] build: [make "-j%{jobs}%" "diaframe"]
......
...@@ -64,7 +64,7 @@ Proof. ...@@ -64,7 +64,7 @@ Proof.
Qed. Qed.
Ltac iCombineOwn_tac' Hs_raw destructstr := Ltac iCombineOwn_tac' Hs_raw destructstr :=
let Hs := words Hs_raw in let Hs := String.words Hs_raw in
let get_hyp_type Hname := let get_hyp_type Hname :=
let Δ := match goal with | |- environments.envs_entails _ => Δ end in let Δ := match goal with | |- environments.envs_entails _ => Δ end in
let lookup := eval pm_eval in (environments.envs_lookup (INamed Hname) Δ) in let lookup := eval pm_eval in (environments.envs_lookup (INamed Hname) Δ) in
......
...@@ -48,7 +48,7 @@ Ltac2 string_to_coq_string (s : string) : constr := ...@@ -48,7 +48,7 @@ Ltac2 string_to_coq_string (s : string) : constr :=
let coq_byte_list : constr list let coq_byte_list : constr list
:= List.init (String.length s) (fun i => char_to_coq_byte (String.get s i)) in := List.init (String.length s) (fun i => char_to_coq_byte (String.get s i)) in
let coq_bytes : constr := list_to_coq_list coq_byte_list in let coq_bytes : constr := list_to_coq_list coq_byte_list in
let raw_result : constr := '(string_of_list_byte $coq_bytes) in let raw_result : constr := '(String.string_of_list_byte $coq_bytes) in
let result := Std.eval_cbv cbv_flags raw_result in let result := Std.eval_cbv cbv_flags raw_result in
result. result.
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment