Merge pull request #36 from AeneasVerif/update_lean

Update the version of Lean and fix a bug in the progress tactic

3 files changed, 33 insertions, 22 deletions

diff --git a/tests/lean/Hashmap/Properties.lean b/tests/lean/Hashmap/Properties.lean
index ab95b854..fe00ab14 100644
--- a/tests/lean/Hashmap/Properties.lean
+++ b/tests/lean/Hashmap/Properties.lean
@@ -332,12 +332,7 @@ theorem insert_no_resize_spec {α : Type} (hm : HashMap α) (key : Usize) (value
         simp_all
         simp [inv] at hinv
         int_tac
-      -- TODO: progress fails in command line mode with "index out of bounds"
-      -- and I have no idea how to fix this. The error happens after progress
-      -- introduced the new goals. It must be when we exit the "withApp", etc.
-      -- helpers.
-      -- progress as ⟨ z, hp ⟩
-      have ⟨ z, hp ⟩ := Usize.add_spec hbounds
+      progress as ⟨ z, hp ⟩
       simp [hp]
     else
       simp [*, Pure.pure]
@@ -408,7 +403,7 @@ theorem insert_no_resize_spec {α : Type} (hm : HashMap α) (key : Usize) (value
     -- TODO: canonize addition by default? We need a tactic to simplify arithmetic equalities
     -- with addition and substractions ((ℤ, +) is a group or something - there should exist a tactic
     -- somewhere in mathlib?)
-    simp [Int.add_assoc, Int.add_comm, Int.add_left_comm] <;>
+    (try simp [Int.add_assoc, Int.add_comm, Int.add_left_comm]) <;>
     int_tac
   have hinv : inv nhm := by
     simp [inv] at *
diff --git a/tests/lean/lake-manifest.json b/tests/lean/lake-manifest.json
index 94030cb6..5c20ec3b 100644
--- a/tests/lean/lake-manifest.json
+++ b/tests/lean/lake-manifest.json
@@ -1,40 +1,56 @@
-{"version": 4,
+{"version": 5,
  "packagesDir": "lake-packages",
  "packages":
  [{"git":
    {"url": "https://github.com/EdAyers/ProofWidgets4",
     "subDir?": null,
-    "rev": "c43db94a8f495dad37829e9d7ad65483d68c86b8",
+    "rev": "a0c2cd0ac3245a0dade4f925bcfa97e06dd84229",
+    "opts": {},
     "name": "proofwidgets",
-    "inputRev?": "v0.0.11"}},
-  {"path": {"name": "Base", "dir": "./../../backends/lean"}},
+    "inputRev?": "v0.0.13",
+    "inherited": true}},
+  {"path":
+   {"opts": {},
+    "name": "Base",
+    "inherited": false,
+    "dir": "./../../backends/lean"}},
   {"git":
    {"url": "https://github.com/mhuisi/lean4-cli.git",
     "subDir?": null,
-    "rev": "5a858c32963b6b19be0d477a30a1f4b6c120be7e",
+    "rev": "21dac2e9cc7e3cf7da5800814787b833e680b2fd",
+    "opts": {},
     "name": "Cli",
-    "inputRev?": "nightly"}},
+    "inputRev?": "nightly",
+    "inherited": true}},
   {"git":
    {"url": "https://github.com/leanprover-community/mathlib4.git",
     "subDir?": null,
-    "rev": "fa05951a270fef2873666c46f138e90338cd48d6",
+    "rev": "b639e46a19a0328adfb9b1fdf8cbe39dfc1de76b",
+    "opts": {},
     "name": "mathlib",
-    "inputRev?": null}},
+    "inputRev?": null,
+    "inherited": false}},
   {"git":
    {"url": "https://github.com/gebner/quote4",
     "subDir?": null,
-    "rev": "c0d9516f44d07feee01c1103c8f2f7c24a822b55",
+    "rev": "e75daed95ad1c92af4e577fea95e234d7a8401c1",
+    "opts": {},
     "name": "Qq",
-    "inputRev?": "master"}},
+    "inputRev?": "master",
+    "inherited": true}},
   {"git":
    {"url": "https://github.com/JLimperg/aesop",
     "subDir?": null,
-    "rev": "f04538ab6ad07642368cf11d2702acc0a9b4bcee",
+    "rev": "1a0cded2be292b5496e659b730d2accc742de098",
+    "opts": {},
     "name": "aesop",
-    "inputRev?": "master"}},
+    "inputRev?": "master",
+    "inherited": true}},
   {"git":
    {"url": "https://github.com/leanprover/std4",
     "subDir?": null,
-    "rev": "dff883c55395438ae2a5c65ad5ddba084b600feb",
+    "rev": "ba5e5e3af519b4fc5221ad0fa4b2c87276f1d323",
+    "opts": {},
     "name": "std",
-    "inputRev?": "main"}}]}
+    "inputRev?": "main",
+    "inherited": true}}]}
diff --git a/tests/lean/lean-toolchain b/tests/lean/lean-toolchain
index 334c5053..fbca4d37 100644
--- a/tests/lean/lean-toolchain
+++ b/tests/lean/lean-toolchain
@@ -1 +1 @@
-leanprover/lean4:nightly-2023-07-12
\ No newline at end of file
+leanprover/lean4:v4.0.0
\ No newline at end of file