update to lean nightly 22-12-05

2 years ago · 04c0466fa4
parent c6d8b35806
commit 04c0466fa4
35 changed files with 163 additions and 69 deletions
--- a/UPDATE_LEAN.sh
+++ b/UPDATE_LEAN.sh
@ -0,0 +1,15 @@
+#!/usr/bin/env sh
+
+# Operate in the directory where this file is located
+cd $(dirname $0)
+
+cd server
+
+cd testgame
+lake update
+
+cp lake-packages/mathlib/lean-toolchain lean-toolchain
+cp lake-packages/mathlib/lean-toolchain ../leanserver/lean-toolchain
+
+cd ../leanserver
+lake update
--- a/package.json
+++ b/package.json
@ -55,7 +55,7 @@
    "build_server": "server/build.sh",
    "build_client": "NODE_ENV=production webpack",
    "production": "NODE_ENV=production node server/index.mjs",
-    "update_lean": "cd server && (cd testgame && lake update) && cp testgame/lean-toolchain leanserver/lean-toolchain"
+    "update_lean": "./UPDATE_LEAN.sh"
  },
  "eslintConfig": {
    "extends": [
--- a/server/leanserver/lake-manifest.json
+++ b/server/leanserver/lake-manifest.json
@ -0,0 +1 @@
+{"version": 4, "packagesDir": "./lake-packages", "packages": []}
--- a/server/leanserver/lean-toolchain
+++ b/server/leanserver/lean-toolchain
@ -1 +1 @@
-leanprover/lean4:nightly-2022-12-03
+leanprover/lean4:nightly-2022-12-05
--- a/server/testgame/TestGame.lean
+++ b/server/testgame/TestGame.lean
@ -19,6 +19,10 @@ import TestGame.Levels.Naturals.L01_Ring
 import TestGame.Levels.Naturals.L02_Ring
 import TestGame.Levels.Naturals.L03_Exists
 import TestGame.Levels.Naturals.L04_Forall
+import TestGame.Levels.Naturals.L31_Sum
+import TestGame.Levels.Naturals.L32_Induction
+import TestGame.Levels.Naturals.L33_Prime
+import TestGame.Levels.Naturals.L34_ExistsUnique
 import TestGame.Levels.Negation.L01_False
 import TestGame.Levels.Negation.L02_Contra
 import TestGame.Levels.Negation.L03_Contra
--- a/server/testgame/TestGame/Levels/Level1.lean
+++ b/server/testgame/TestGame/Levels/Level1.lean
@ -1,7 +1,7 @@
 import TestGame.Metadata

 Game "TestGame"
-World "TestWorld"
+World "Old"
 Level 1

 Title "The reflexivity spell"
--- a/server/testgame/TestGame/Levels/Level2.lean
+++ b/server/testgame/TestGame/Levels/Level2.lean
@ -1,7 +1,7 @@
 import TestGame.Metadata

 Game "TestGame"
-World "TestWorld"
+World "Old"
 Level 2

 Title "The rewriting spell"
--- a/server/testgame/TestGame/Levels/Level3.lean
+++ b/server/testgame/TestGame/Levels/Level3.lean
@ -1,7 +1,7 @@
 import TestGame.Metadata

 Game "TestGame"
-World "TestWorld"
+World "Old"
 Level 3

 Title "Peano's axioms"
--- a/server/testgame/TestGame/Levels/Level4.lean
+++ b/server/testgame/TestGame/Levels/Level4.lean
@ -1,7 +1,7 @@
 import TestGame.Metadata

 Game "TestGame"
-World "TestWorld"
+World "Old"
 Level 4

 Title "Addition"
--- a/server/testgame/TestGame/Levels/Level5.lean
+++ b/server/testgame/TestGame/Levels/Level5.lean
@ -2,7 +2,7 @@ import TestGame.Metadata
 import TestGame.Tactics

 Game "TestGame"
-World "TestWorld"
+World "Old"
 Level 5

 Title "The induction_on spell"
--- a/server/testgame/TestGame/Levels/Logic/L01_Rfl.lean
+++ b/server/testgame/TestGame/Levels/Logic/L01_Rfl.lean
@ -1,7 +1,7 @@
 import TestGame.Metadata

 Game "TestGame"
-World "TestWorld"
+World "Logic"
 Level 1

 Title "Aller Anfang ist... ein Einzeiler?"
--- a/server/testgame/TestGame/Levels/Logic/L02_Rfl.lean
+++ b/server/testgame/TestGame/Levels/Logic/L02_Rfl.lean
@ -1,7 +1,7 @@
 import TestGame.Metadata

 Game "TestGame"
-World "TestWorld"
+World "Logic"
 Level 2

 Title "Definitionally equal"
--- a/server/testgame/TestGame/Levels/Logic/L03_Assumption.lean
+++ b/server/testgame/TestGame/Levels/Logic/L03_Assumption.lean
@ -1,7 +1,7 @@
 import TestGame.Metadata

 Game "TestGame"
-World "TestWorld"
+World "Logic"
 Level 3

 Title "Annahmen"
--- a/server/testgame/TestGame/Levels/Logic/L03b_Assumption.lean
+++ b/server/testgame/TestGame/Levels/Logic/L03b_Assumption.lean
@ -2,7 +2,7 @@ import TestGame.Metadata
 import Mathlib.Data.Nat.Basic -- TODO

 Game "TestGame"
-World "TestWorld"
+World "Logic"
 Level 4

 Title "Logische Aussagen: `Prop`"
--- a/server/testgame/TestGame/Levels/Logic/L04_Rewrite.lean
+++ b/server/testgame/TestGame/Levels/Logic/L04_Rewrite.lean
@ -2,7 +2,7 @@ import TestGame.Metadata
 import Mathlib

 Game "TestGame"
-World "TestWorld"
+World "Logic"
 Level 5

 Title "Rewrite"
--- a/server/testgame/TestGame/Levels/Logic/L05_Apply.lean
+++ b/server/testgame/TestGame/Levels/Logic/L05_Apply.lean
@ -2,7 +2,7 @@ import TestGame.Metadata
 import Mathlib

 Game "TestGame"
-World "TestWorld"
+World "Logic"
 Level 6

 Title "Implikation"
--- a/server/testgame/TestGame/Levels/Logic/L05b_Apply.lean
+++ b/server/testgame/TestGame/Levels/Logic/L05b_Apply.lean
@ -1,7 +1,7 @@
 import TestGame.Metadata

 Game "TestGame"
-World "TestWorld"
+World "Logic"
 Level 7

 Title "Implikation"
--- a/server/testgame/TestGame/Levels/Logic/L05c_Apply.lean
+++ b/server/testgame/TestGame/Levels/Logic/L05c_Apply.lean
@ -3,7 +3,7 @@ import TestGame.Metadata
 set_option tactic.hygienic false

 Game "TestGame"
-World "TestWorld"
+World "Logic"
 Level 8

 Title "Implikation"
--- a/server/testgame/TestGame/Levels/Logic/L06_Iff.lean
+++ b/server/testgame/TestGame/Levels/Logic/L06_Iff.lean
@ -4,7 +4,7 @@ import Init.Data.ToString
 #check List UInt8

 Game "TestGame"
-World "TestWorld"
+World "Logic"
 Level 9

 Title "Genau dann wenn"
--- a/server/testgame/TestGame/Levels/Logic/L06b_Iff.lean
+++ b/server/testgame/TestGame/Levels/Logic/L06b_Iff.lean
@ -1,7 +1,7 @@
 import TestGame.Metadata

 Game "TestGame"
-World "TestWorld"
+World "Logic"
 Level 10

 Title "Genau dann wenn"
--- a/server/testgame/TestGame/Levels/Logic/L06c_Iff.lean
+++ b/server/testgame/TestGame/Levels/Logic/L06c_Iff.lean
@ -5,7 +5,7 @@ import Mathlib.Tactic.Cases
 set_option tactic.hygienic false

 Game "TestGame"
-World "TestWorld"
+World "Logic"
 Level 11

 Title "Genau dann wenn"
--- a/server/testgame/TestGame/Levels/Logic/L06d_Iff.lean
+++ b/server/testgame/TestGame/Levels/Logic/L06d_Iff.lean
@ -1,7 +1,7 @@
 import TestGame.Metadata

 Game "TestGame"
-World "TestWorld"
+World "Logic"
 Level 12

 Title "Genau dann wenn"
--- a/server/testgame/TestGame/Levels/Logic/L07_And.lean
+++ b/server/testgame/TestGame/Levels/Logic/L07_And.lean
@ -4,7 +4,7 @@ import Std.Tactic.RCases
 set_option tactic.hygienic false

 Game "TestGame"
-World "TestWorld"
+World "Logic"
 Level 13

 Title "Und"
--- a/server/testgame/TestGame/Levels/Logic/L08_Or.lean
+++ b/server/testgame/TestGame/Levels/Logic/L08_Or.lean
@ -5,7 +5,7 @@ import Mathlib.Tactic.LeftRight
 --set_option tactic.hygienic false

 Game "TestGame"
-World "TestWorld"
+World "Logic"
 Level 14

 Title "Oder"
--- a/server/testgame/TestGame/Levels/Logic/L08b_Or.lean
+++ b/server/testgame/TestGame/Levels/Logic/L08b_Or.lean
@ -8,7 +8,7 @@ import Mathlib.Tactic.LeftRight


 Game "TestGame"
-World "TestWorld"
+World "Logic"
 Level 15

 Title "Oder - Bonus"
--- a/server/testgame/TestGame/Levels/Logic/L08c_Or.lean
+++ b/server/testgame/TestGame/Levels/Logic/L08c_Or.lean
@ -5,7 +5,7 @@ import Mathlib.Tactic.LeftRight
 set_option tactic.hygienic false

 Game "TestGame"
-World "TestWorld"
+World "Logic"
 Level 16

 Title "Oder"
--- a/server/testgame/TestGame/Levels/Naturals/L01_Ring.lean
+++ b/server/testgame/TestGame/Levels/Naturals/L01_Ring.lean
@ -1,14 +1,6 @@
 import TestGame.Metadata
 import Mathlib.Tactic.Ring

-- TODOs:
-- Natural numbers
-- even / odd
-- prime
-- `ring`
-- sum
-- induction
-
 --set_option tactic.hygienic false

 Game "TestGame"
--- a/server/testgame/TestGame/Levels/Naturals/L31_Sum.lean
+++ b/server/testgame/TestGame/Levels/Naturals/L31_Sum.lean
@ -0,0 +1,23 @@
+import TestGame.Metadata
+import Mathlib.Tactic.Ring
+
+Game "TestGame"
+World "Nat2"
+Level 1
+
+Title "Summe"
+
+Introduction
+"
+TODO: Summe
+
+"
+
+Statement : True := by
+  trivial
+
+Conclusion
+"
+"
+
+Tactics ring
--- a/server/testgame/TestGame/Levels/Naturals/L32_Induction.lean
+++ b/server/testgame/TestGame/Levels/Naturals/L32_Induction.lean
@ -0,0 +1,23 @@
+import TestGame.Metadata
+import Mathlib.Tactic.Ring
+
+Game "TestGame"
+World "Nat2"
+Level 2
+
+Title "Induktion"
+
+Introduction
+"
+TODO: Induktion (& induktion vs rcases)
+
+"
+
+Statement : True := by
+  trivial
+
+Conclusion
+"
+"
+
+Tactics ring
--- a/server/testgame/TestGame/Levels/Naturals/L33_Prime.lean
+++ b/server/testgame/TestGame/Levels/Naturals/L33_Prime.lean
@ -0,0 +1,23 @@
+import TestGame.Metadata
+import Mathlib.Tactic.Ring
+
+Game "TestGame"
+World "Nat2"
+Level 3
+
+Title "Primzahlen"
+
+Introduction
+"
+TODO: Primzahl
+
+"
+
+Statement : True := by
+  trivial
+
+Conclusion
+"
+"
+
+Tactics ring
--- a/server/testgame/TestGame/Levels/Naturals/L34_ExistsUnique.lean
+++ b/server/testgame/TestGame/Levels/Naturals/L34_ExistsUnique.lean
@ -0,0 +1,23 @@
+import TestGame.Metadata
+import Mathlib.Tactic.Ring
+
+Game "TestGame"
+World "Nat2"
+Level 5
+
+Title "Exists unique"
+
+Introduction
+"
+TODO: Es existiert genau eine gerade Primzahl.
+
+"
+
+Statement : True := by
+  trivial
+
+Conclusion
+"
+"
+
+Tactics ring
--- a/server/testgame/TestGame/Levels/LeftOvers/Lxx_Prime.lean
+++ b/server/testgame/TestGame/Levels/LeftOvers/Lxx_Prime.lean
--- a/server/testgame/TestGame/Metadata.lean
+++ b/server/testgame/TestGame/Metadata.lean
@ -1,5 +1,4 @@
 import GameServer.Commands
--import TestGame.MyNat
 import TestGame.TacticDocs
 import TestGame.LemmaDocs
 import Mathlib.Init.Data.Nat.Basic -- Imports the notation ℕ.
@ -21,15 +20,6 @@ with a level 1 spell book. Good luck."
 Conclusion
 "There is nothing else so far. Thanks for rescuing natural numbers!"

-World "w1"
-World "w2"
-World "w3"
-World "v1"
-World "v2"
-World "v3"
-World "v4"

-
-Path TestWorld → w1 → w2 → w3
-Path w1 → v1 → v2 → v3 → w3
-Path v3 → v4
+Path Logic → Nat → Contradiction
+Path Nat → Nat2
--- a/server/testgame/lake-manifest.json
+++ b/server/testgame/lake-manifest.json
@ -28,7 +28,7 @@
  {"git":
   {"url": "https://github.com/leanprover-community/mathlib4.git",
    "subDir?": null,
-    "rev": "a461e549ebaac0c9b6a83969bcaa982bff6adafc",
+    "rev": "573c745b2edb348902bf14e5b4166e50c68db8f6",
    "name": "mathlib",
    "inputRev?": "master"}},
  {"git":
--- a/server/testgame/lean-toolchain
+++ b/server/testgame/lean-toolchain
@ -1 +1 @@
-leanprover/lean4:nightly-2022-12-03
+leanprover/lean4:nightly-2022-12-05
				`@ -0,0 +1 @@`
				`{"version": 4, "packagesDir": "./lake-packages", "packages": []}`