diff --git a/DeBruijnSSA/BinSyntax/Rewrite/Region/Compose/Completeness.lean b/DeBruijnSSA/BinSyntax/Rewrite/Region/Compose/Completeness.lean index 21e4f16..2c621f2 100644 --- a/DeBruijnSSA/BinSyntax/Rewrite/Region/Compose/Completeness.lean +++ b/DeBruijnSSA/BinSyntax/Rewrite/Region/Compose/Completeness.lean @@ -196,6 +196,8 @@ theorem Eqv.unpacked_app_out_eq_left_exit {Γ : Ctx α ε} {R L : LCtx α} = r.lwk1 ;; ret Term.Eqv.pack_app ;; left_exit := by rw [unpacked_app_out_eq_left_exit', lwk1_seq, lwk1_ret] + +set_option maxHeartbeats 500000 in theorem Eqv.packed_cfg_den {Γ : Ctx α ε} {L R : LCtx α} {β : Eqv φ Γ (R ++ L)} {G} : (cfg R β G).packed (L := []) (Δ := Δ) = (ret Term.Eqv.split ;; _ ⋊ (β.packed ;; ret Term.Eqv.pack_app) ;; distl_inv ;; sum pi_r nil) diff --git a/DeBruijnSSA/BinSyntax/Syntax/Effect/Definitions.lean b/DeBruijnSSA/BinSyntax/Syntax/Effect/Definitions.lean index 93e46e3..4bbe3c0 100644 --- a/DeBruijnSSA/BinSyntax/Syntax/Effect/Definitions.lean +++ b/DeBruijnSSA/BinSyntax/Syntax/Effect/Definitions.lean @@ -9,7 +9,7 @@ namespace BinSyntax section Definitions -variable [Φ : EffectSet φ ε] [Bot ε] [Sup ε] +variable [Φ : EffectSet φ ε] [Bot ε] [Max ε] /-- Infer the effect of a term -/ @[simp] diff --git a/DeBruijnSSA/BinSyntax/Syntax/Effect/Subst.lean b/DeBruijnSSA/BinSyntax/Syntax/Effect/Subst.lean index 20cc1bf..da44dfd 100644 --- a/DeBruijnSSA/BinSyntax/Syntax/Effect/Subst.lean +++ b/DeBruijnSSA/BinSyntax/Syntax/Effect/Subst.lean @@ -5,7 +5,7 @@ namespace BinSyntax section Definitions -variable [Φ : EffectSet φ ε] [Bot ε] [Sup ε] +variable [Φ : EffectSet φ ε] [Bot ε] [Max ε] namespace Term diff --git a/DeBruijnSSA/InstSet.lean b/DeBruijnSSA/InstSet.lean index 5beee61..67013ad 100644 --- a/DeBruijnSSA/InstSet.lean +++ b/DeBruijnSSA/InstSet.lean @@ -186,10 +186,10 @@ instance : HasEffect Linearity where isAffine_of_le _ _ h := h.2 sup_isCentral _ _ _ _ := rfl sup_isRelevant _ _ := by - simp only [Sup.sup, Bool.decide_and, Bool.decide_eq_true, Bool.and_eq_true] + simp only [max, SemilatticeSup.sup, Bool.decide_and, Bool.decide_eq_true, Bool.and_eq_true] intros; simp [*] sup_isAffine _ _ := by - simp only [Sup.sup, Bool.decide_and, Bool.decide_eq_true, Bool.and_eq_true] + simp only [max, SemilatticeSup.sup, Bool.decide_and, Bool.decide_eq_true, Bool.and_eq_true] intros; simp [*] bot_isCentral := rfl bot_isRelevant := rfl diff --git a/lake-manifest.json b/lake-manifest.json index bd53fe2..d766e46 100644 --- a/lake-manifest.json +++ b/lake-manifest.json @@ -5,7 +5,7 @@ "type": "git", "subDir": null, "scope": "leanprover-community", - "rev": "dc72dcdb8e97b3c56bd70f06f043ed2dee3258e6", + "rev": "b100ff2565805e9f30a482788b3fc66937a7f38a", "name": "batteries", "manifestFile": "lake-manifest.json", "inputRev": "main", @@ -15,7 +15,7 @@ "type": "git", "subDir": null, "scope": "leanprover-community", - "rev": "1357f4f49450abb9dfd4783e38219f4ce84f9785", + "rev": "303b23fbcea94ac4f96e590c1cad6618fd4f5f41", "name": "Qq", "manifestFile": "lake-manifest.json", "inputRev": "master", @@ -25,7 +25,7 @@ "type": "git", "subDir": null, "scope": "leanprover-community", - "rev": "9ac12945862fa39eab7795c2f79bb9aa0c8e332c", + "rev": "de91b59101763419997026c35a41432ac8691f15", "name": "aesop", "manifestFile": "lake-manifest.json", "inputRev": "master", @@ -35,17 +35,17 @@ "type": "git", "subDir": null, "scope": "leanprover-community", - "rev": "baa65c6339a56bd22b7292aa4511c54b3cc7a6af", + "rev": "1383e72b40dd62a566896a6e348ffe868801b172", "name": "proofwidgets", "manifestFile": "lake-manifest.json", - "inputRev": "v0.0.43", + "inputRev": "v0.0.46", "inherited": true, "configFile": "lakefile.lean"}, {"url": "https://github.com/leanprover/lean4-cli", "type": "git", "subDir": null, "scope": "leanprover", - "rev": "2cf1030dc2ae6b3632c84a09350b675ef3e347d0", + "rev": "726b3c9ad13acca724d4651f14afc4804a7b0e4d", "name": "Cli", "manifestFile": "lake-manifest.json", "inputRev": "main", @@ -55,7 +55,7 @@ "type": "git", "subDir": null, "scope": "leanprover-community", - "rev": "9b4088ccf0f44ddd7b1132bb1348aef8cf481e12", + "rev": "b0b73e5bc33f1bc4d3c0f254630dd0e262cecc08", "name": "importGraph", "manifestFile": "lake-manifest.json", "inputRev": "main", @@ -65,17 +65,27 @@ "type": "git", "subDir": null, "scope": "leanprover-community", - "rev": "7bedaed1ef024add1e171cc17706b012a9a37802", + "rev": "86d0d0584f5cd165353e2f8a30c455cd0e168ac2", "name": "LeanSearchClient", "manifestFile": "lake-manifest.json", "inputRev": "main", "inherited": true, "configFile": "lakefile.toml"}, + {"url": "https://github.com/leanprover-community/plausible", + "type": "git", + "subDir": null, + "scope": "leanprover-community", + "rev": "42dc02bdbc5d0c2f395718462a76c3d87318f7fa", + "name": "plausible", + "manifestFile": "lake-manifest.json", + "inputRev": "main", + "inherited": true, + "configFile": "lakefile.toml"}, {"url": "https://github.com/leanprover-community/mathlib4.git", "type": "git", "subDir": null, "scope": "", - "rev": "9248301da2c228348b194c74be94b0e0b0bbbb2c", + "rev": "12a4321786fd0be1ddbe12701a45920a519b2108", "name": "mathlib", "manifestFile": "lake-manifest.json", "inputRev": null, @@ -85,7 +95,7 @@ "type": "git", "subDir": null, "scope": "", - "rev": "bdab441c6e43d326b72b8d1ddc8c61b96054bdf3", + "rev": "789f3b88b7030aad77e26c3bd8a938bfe5f87b0c", "name": "discretion", "manifestFile": "lake-manifest.json", "inputRev": "main", diff --git a/lean-toolchain b/lean-toolchain index eff86fd..57a4710 100644 --- a/lean-toolchain +++ b/lean-toolchain @@ -1 +1 @@ -leanprover/lean4:v4.13.0-rc3 +leanprover/lean4:v4.14.0-rc2