Skip to content

Commit 2403da4

Browse files
committed
Merge remote-tracking branch 'origin/master' into update-20260217
2 parents 0049ee2 + 4a7dd13 commit 2403da4

289 files changed

Lines changed: 5466 additions & 6437 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/ci.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ jobs:
2121
build:
2222
name: Build project
2323
runs-on: ubuntu-latest
24+
needs: mk-all-check
2425
steps:
2526
- uses: actions/checkout@v6
2627
- name: Setup elan
@@ -73,7 +74,7 @@ jobs:
7374
lake exe graph ./import_graph.html
7475
7576
- name: Upload lean artifacts
76-
uses: actions/upload-artifact@v6
77+
uses: actions/upload-artifact@v7
7778
with:
7879
name: lean-artifacts
7980
path: |
@@ -132,7 +133,7 @@ jobs:
132133
- uses: pandoc/actions/setup@v1
133134

134135
- name: Download lean artifacts
135-
uses: actions/download-artifact@v7
136+
uses: actions/download-artifact@v8
136137
with:
137138
name: lean-artifacts
138139
- name: Copy from artifacts to pages
@@ -157,5 +158,5 @@ jobs:
157158
- uses: actions/upload-pages-artifact@v4
158159
with:
159160
path: pages
160-
- uses: actions/deploy-pages@v4
161+
- uses: actions/deploy-pages@v5
161162
id: deployment

CONTRIBUTING.md

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
# Contribution
22

3+
1. Follow the [commit convention](#commit-convention).
4+
2. Run [import all](#import-all).
5+
36
## Commit convention
47

58
Follow usual conventional commit for PR title (we always squash merge).
@@ -16,7 +19,7 @@ Choose `<type>` from below (should be one, but like `fix/doc` might be ok).
1619
- `ci`: Configure GitHub Actions.
1720
- `chore`: Maintaining other things (ex: version-up).
1821

19-
`scope` is optional, specify like `FirstOrder`, `Modal` if needed.
22+
`scope` is optional, specify like `FirstOrder`, `Modal/Kripke` if needed.
2023

2124
## Usual commands
2225

@@ -26,6 +29,12 @@ Choose `<type>` from below (should be one, but like `fix/doc` might be ok).
2629
lake build Foundation
2730
```
2831

32+
### Import all
33+
34+
```shell
35+
lake exe mk_all --module
36+
```
37+
2938
### References
3039

3140
Format [references.bib](./references.bib) when adding references.

Foundation.lean

Lines changed: 40 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -358,10 +358,8 @@ public import Foundation.Modal.Maximal.Basic
358358
public import Foundation.Modal.Maximal.Makinson
359359
public import Foundation.Modal.Maximal.Unprovability
360360
public import Foundation.Modal.MaximalConsistentSet
361-
public import Foundation.Modal.ModalCompanion
362361
public import Foundation.Modal.ModalCompanion.Corsi
363362
public import Foundation.Modal.ModalCompanion.Corsi.VF
364-
public import Foundation.Modal.ModalCompanion.Standard
365363
public import Foundation.Modal.ModalCompanion.Standard.Basic
366364
public import Foundation.Modal.ModalCompanion.Standard.Cl
367365
public import Foundation.Modal.ModalCompanion.Standard.Int
@@ -417,11 +415,11 @@ public import Foundation.Modal.PLoN.Logic
417415
public import Foundation.Modal.PLoN.Logic.N
418416
public import Foundation.Modal.Tableau
419417
public import Foundation.Modal.VanBentham.StandardTranslation
420-
public import Foundation.Propositional.ClassicalSemantics.Basic
421-
public import Foundation.Propositional.ClassicalSemantics.Hilbert
422-
public import Foundation.Propositional.ClassicalSemantics.NNFormula
423-
public import Foundation.Propositional.ClassicalSemantics.Tait
424-
public import Foundation.Propositional.ClassicalSemantics.ZeroSubst
418+
public import Foundation.Propositional.Boolean.Basic
419+
public import Foundation.Propositional.Boolean.Hilbert
420+
public import Foundation.Propositional.Boolean.NNFormula
421+
public import Foundation.Propositional.Boolean.Tait
422+
public import Foundation.Propositional.Boolean.ZeroSubst
425423
public import Foundation.Propositional.ConsistentTableau
426424
public import Foundation.Propositional.Decidable
427425
public import Foundation.Propositional.Dialectica.Basic
@@ -444,29 +442,23 @@ public import Foundation.Propositional.Entailment.KreiselPutnam
444442
public import Foundation.Propositional.Entailment.LC
445443
public import Foundation.Propositional.Entailment.Minimal.Basic
446444
public import Foundation.Propositional.Entailment.Scott
447-
public import Foundation.Propositional.FMT.AxiomSer
445+
public import Foundation.Propositional.FMT.Axiom.Ser
448446
public import Foundation.Propositional.FMT.Basic
449447
public import Foundation.Propositional.FMT.Completeness
450-
public import Foundation.Propositional.FMT.Hilbert
451-
public import Foundation.Propositional.FMT.Logic
452-
public import Foundation.Propositional.FMT.Logic.VF
453-
public import Foundation.Propositional.FMT.Logic.VF_Ser
448+
public import Foundation.Propositional.FMT.Hilbert.Basic
449+
public import Foundation.Propositional.FMT.Hilbert.VF
450+
public import Foundation.Propositional.FMT.Hilbert.VF_Ser
454451
public import Foundation.Propositional.Formula.Basic
455452
public import Foundation.Propositional.Formula.NNFormula
456453
public import Foundation.Propositional.Heyting.Semantics
457-
public import Foundation.Propositional.Hilbert.Axiom
458-
public import Foundation.Propositional.Hilbert.F
459454
public import Foundation.Propositional.Hilbert.F.Basic
460455
public import Foundation.Propositional.Hilbert.F.Deduction
461456
public import Foundation.Propositional.Hilbert.F.Disjunctive
462457
public import Foundation.Propositional.Hilbert.F_WF
463-
public import Foundation.Propositional.Hilbert.Standard
464-
public import Foundation.Propositional.Hilbert.Standard.Basic
465-
public import Foundation.Propositional.Hilbert.Standard.Glivenko
466-
public import Foundation.Propositional.Hilbert.VF
458+
public import Foundation.Propositional.Hilbert.Minimal.Basic
459+
public import Foundation.Propositional.Hilbert.Minimal.Glivenko
467460
public import Foundation.Propositional.Hilbert.VF.Basic
468461
public import Foundation.Propositional.Hilbert.VF.Disjunctive
469-
public import Foundation.Propositional.Hilbert.WF
470462
public import Foundation.Propositional.Hilbert.WF.Basic
471463
public import Foundation.Propositional.Hilbert.WF_VF
472464
public import Foundation.Propositional.Kripke.AxiomDummett
@@ -476,43 +468,40 @@ public import Foundation.Propositional.Kripke.AxiomWLEM
476468
public import Foundation.Propositional.Kripke.Basic
477469
public import Foundation.Propositional.Kripke.Completeness
478470
public import Foundation.Propositional.Kripke.Filtration
479-
public import Foundation.Propositional.Kripke.Hilbert
480-
public import Foundation.Propositional.Kripke.Logic.Cl
481-
public import Foundation.Propositional.Kripke.Logic.Int
482-
public import Foundation.Propositional.Kripke.Logic.KC
483-
public import Foundation.Propositional.Kripke.Logic.KreiselPutnam
484-
public import Foundation.Propositional.Kripke.Logic.LC
471+
public import Foundation.Propositional.Kripke.Hilbert.Basic
472+
public import Foundation.Propositional.Kripke.Hilbert.Cl
473+
public import Foundation.Propositional.Kripke.Hilbert.Int.Basic
474+
public import Foundation.Propositional.Kripke.Hilbert.Int.DP
475+
public import Foundation.Propositional.Kripke.Hilbert.KC
476+
public import Foundation.Propositional.Kripke.Hilbert.KreiselPutnam
477+
public import Foundation.Propositional.Kripke.Hilbert.LC
485478
public import Foundation.Propositional.Kripke.Preservation
486479
public import Foundation.Propositional.Kripke.Rooted
487-
public import Foundation.Propositional.Kripke2.AxiomCorfl
488-
public import Foundation.Propositional.Kripke2.AxiomHrd
489-
public import Foundation.Propositional.Kripke2.AxiomPCon
490-
public import Foundation.Propositional.Kripke2.AxiomPSCon
491-
public import Foundation.Propositional.Kripke2.AxiomRfl
492-
public import Foundation.Propositional.Kripke2.AxiomSer
493-
public import Foundation.Propositional.Kripke2.AxiomSym
494-
public import Foundation.Propositional.Kripke2.AxiomTra
480+
public import Foundation.Propositional.Kripke2.Axiom.Corfl
481+
public import Foundation.Propositional.Kripke2.Axiom.Hrd
482+
public import Foundation.Propositional.Kripke2.Axiom.PCon
483+
public import Foundation.Propositional.Kripke2.Axiom.PSCon
484+
public import Foundation.Propositional.Kripke2.Axiom.Rfl
485+
public import Foundation.Propositional.Kripke2.Axiom.Ser
486+
public import Foundation.Propositional.Kripke2.Axiom.Sym
487+
public import Foundation.Propositional.Kripke2.Axiom.Tra
495488
public import Foundation.Propositional.Kripke2.Basic
496-
public import Foundation.Propositional.Kripke2.FTheory
497-
public import Foundation.Propositional.Kripke2.Hilbert
498-
public import Foundation.Propositional.Kripke2.Logic
499-
public import Foundation.Propositional.Kripke2.Logic.F
500-
public import Foundation.Propositional.Kripke2.Logic.F_Rfl
501-
public import Foundation.Propositional.Kripke2.Logic.F_Rfl_Sym
502-
public import Foundation.Propositional.Kripke2.Logic.F_Rfl_Tra1
503-
public import Foundation.Propositional.Kripke2.Logic.F_Rfl_Tra1_Hrd
504-
public import Foundation.Propositional.Kripke2.Logic.F_Ser
505-
public import Foundation.Propositional.Kripke2.Logic.F_Sym
506-
public import Foundation.Propositional.Kripke2.Logic.F_Tra1
507-
public import Foundation.Propositional.Kripke2.Logic.F_Tra1_Hrd
489+
public import Foundation.Propositional.Kripke2.Hilbert.Basic
490+
public import Foundation.Propositional.Kripke2.Hilbert.F
491+
public import Foundation.Propositional.Kripke2.Hilbert.F_Rfl
492+
public import Foundation.Propositional.Kripke2.Hilbert.F_Rfl_Sym
493+
public import Foundation.Propositional.Kripke2.Hilbert.F_Rfl_Tra1
494+
public import Foundation.Propositional.Kripke2.Hilbert.F_Ser
495+
public import Foundation.Propositional.Kripke2.Hilbert.F_Sym
496+
public import Foundation.Propositional.Kripke2.Hilbert.F_Tra1
508497
public import Foundation.Propositional.Logic.Basic
509498
public import Foundation.Propositional.Logic.Letterless_Int_Cl
510499
public import Foundation.Propositional.Logic.PostComplete
511-
public import Foundation.Propositional.Logic.Slash
500+
public import Foundation.Propositional.Logic.Superintuitionistic
512501
public import Foundation.Propositional.Neighborhood.NB.Basic
513-
public import Foundation.Propositional.Neighborhood.NB.Hilbert
514-
public import Foundation.Propositional.Neighborhood.NB.Logic
515-
public import Foundation.Propositional.Neighborhood.NB.Logic.WF
502+
public import Foundation.Propositional.Neighborhood.NB.Hilbert.Basic
503+
public import Foundation.Propositional.Neighborhood.NB.Hilbert.WF
504+
public import Foundation.Propositional.Slash
516505
public import Foundation.Propositional.Tait.Calculus
517506
public import Foundation.Propositional.Translation
518507
public import Foundation.ProvabilityLogic.Arithmetic
@@ -529,6 +518,8 @@ public import Foundation.ProvabilityLogic.Realization
529518
public import Foundation.ProvabilityLogic.S.Completeness
530519
public import Foundation.ProvabilityLogic.S.Soundness
531520
public import Foundation.ProvabilityLogic.SolovaySentences
521+
public import Foundation.SecondOrder.Derivation
522+
public import Foundation.SecondOrder.Semantics
532523
public import Foundation.SecondOrder.Syntax.Formula
533524
public import Foundation.SecondOrder.Syntax.Rew
534525
public import Foundation.Semantics.Algebra.Modal.Basic

Foundation/FirstOrder/Arithmetic/Basic/Hierarchy.lean

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ lemma neg {φ : Semiformula L ξ n} : Hierarchy Γ s φ → Hierarchy Γ.alt s (
164164
@[simp] lemma neg_iff {φ : Semiformula L ξ n} : Hierarchy Γ s (∼φ) ↔ Hierarchy Γ.alt s φ :=
165165
fun h => by simpa using neg h, fun h => by simpa using neg h⟩
166166

167-
@[simp] lemma imp_iff {φ ψ : Semiformula L ξ n} : Hierarchy Γ s (φ ψ) ↔ (Hierarchy Γ.alt s φ ∧ Hierarchy Γ s ψ) := by simp [Semiformula.imp_eq]
167+
@[simp] lemma imp_iff {φ ψ : Semiformula L ξ n} : Hierarchy Γ s (φ 🡒 ψ) ↔ (Hierarchy Γ.alt s φ ∧ Hierarchy Γ s ψ) := by simp [Semiformula.imp_eq]
168168

169169
set_option linter.flexible false in
170170
@[simp] lemma ball_iff {Γ s n} {φ : Semiformula L ξ (n + 1)} {t : Semiterm L ξ (n + 1)} (ht : t.Positive) :
@@ -336,11 +336,11 @@ lemma of_open {φ : Semiformula L ξ n} : φ.Open → Hierarchy Γ s φ := by
336336
variable {L : Language} [L.ORing]
337337

338338
lemma iff_iff {φ ψ : Semiformula L ξ n} :
339-
Hierarchy b s (φ ψ) ↔ (Hierarchy b s φ ∧ Hierarchy b.alt s φ ∧ Hierarchy b s ψ ∧ Hierarchy b.alt s ψ) := by
339+
Hierarchy b s (φ 🡘 ψ) ↔ (Hierarchy b s φ ∧ Hierarchy b.alt s φ ∧ Hierarchy b s ψ ∧ Hierarchy b.alt s ψ) := by
340340
simp [Semiformula.iff_eq]; tauto
341341

342342
@[simp] lemma iff_iff₀ {φ ψ : Semiformula L ξ n} :
343-
Hierarchy b 0 ψ) ↔ (Hierarchy b 0 φ ∧ Hierarchy b 0 ψ) := by
343+
Hierarchy b 0🡘 ψ) ↔ (Hierarchy b 0 φ ∧ Hierarchy b 0 ψ) := by
344344
simp [Semiformula.iff_eq]; tauto
345345

346346
@[simp] lemma matrix_conj_iff {b s n} {φ : Fin m → Semiformula L ξ n} :

Foundation/FirstOrder/Arithmetic/Basic/Misc.lean

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ def Semiformula.toStringORing : ∀ {n}, Semiformula ℒₒᵣ ξ n → String
6565
| _, nrel Language.LT.lt v => (v 0).toStringORing ++ " \\not < " ++ (v 1).toStringORing
6666
| _, φ ⋏ ψ => "[" ++ φ.toStringORing ++ "]" ++ " \\land " ++ "[" ++ ψ.toStringORing ++ "]"
6767
| _, φ ⋎ ψ => "[" ++ φ.toStringORing ++ "]" ++ " \\lor " ++ "[" ++ ψ.toStringORing ++ "]"
68-
| n, ∀⁰ (rel Language.LT.lt v φ) => "(\\forall x_{" ++ toString n ++ "} < " ++ (v 1).toStringORing ++ ") " ++ "[" ++ φ.toStringORing ++ "]"
68+
| n, ∀⁰ (rel Language.LT.lt v 🡒 φ) => "(\\forall x_{" ++ toString n ++ "} < " ++ (v 1).toStringORing ++ ") " ++ "[" ++ φ.toStringORing ++ "]"
6969
| n, ∃⁰ (rel Language.LT.lt v ⋏ φ) => "(\\exists x_{" ++ toString n ++ "} < " ++ (v 1).toStringORing ++ ") " ++ "[" ++ φ.toStringORing ++ "]"
7070
| n, ∀⁰ φ => "(\\forall x_{" ++ toString n ++ "}) " ++ "[" ++ φ.toStringORing ++ "]"
7171
| n, ∃⁰ φ => "(\\exists x_{" ++ toString n ++ "}) " ++ "[" ++ φ.toStringORing ++ "]"

Foundation/FirstOrder/Arithmetic/Definability/Definable.lean

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -789,13 +789,13 @@ lemma ball_lt {Γ} {P : (Fin k → V) → V → Prop} {f : (Fin k → V) → V}
789789
⟨ .mkSigma (∃⁰ (bf.val ⋏ (∀⁰[“#0 < #1”] φ.val ⇜ (#0 :> (#·.succ.succ))))) (by simp),
790790
by intro v; simp [hbf.df.iff, hp.df.iff] ⟩
791791
| 𝚷 => exact
792-
⟨ .mkPi (∀⁰ (bf.val (∀⁰[“#0 < #1”] φ.val ⇜ (#0 :> (#·.succ.succ))))) (by simp),
792+
⟨ .mkPi (∀⁰ (bf.val 🡒 (∀⁰[“#0 < #1”] φ.val ⇜ (#0 :> (#·.succ.succ))))) (by simp),
793793
by intro v; simp [hbf.df.iff, hp.df.iff] ⟩
794794
| 𝚫 =>
795795
exact .of_sigma_of_pi
796796
⟨ .mkSigma (∃⁰ (bf.val ⋏ (∀⁰[“#0 < #1”] φ.sigma.val ⇜ (#0 :> (#·.succ.succ))))) (by simp),
797797
by intro v; simp [hbf.df.iff, hp.df.iff, HierarchySymbol.Semiformula.val_sigma] ⟩
798-
⟨ .mkPi (∀⁰ (bf.val (∀⁰[“#0 < #1”] φ.pi.val ⇜ (#0 :> (#·.succ.succ))))) (by simp),
798+
⟨ .mkPi (∀⁰ (bf.val 🡒 (∀⁰[“#0 < #1”] φ.pi.val ⇜ (#0 :> (#·.succ.succ))))) (by simp),
799799
by intro v; simp [hbf.df.iff, hp.df.iff, hp.proper.iff'] ⟩
800800

801801
lemma bexs_lt {Γ} {P : (Fin k → V) → V → Prop} {f : (Fin k → V) → V}
@@ -808,13 +808,13 @@ lemma bexs_lt {Γ} {P : (Fin k → V) → V → Prop} {f : (Fin k → V) → V}
808808
⟨ .mkSigma (∃⁰ (bf.val ⋏ (∃⁰[“#0 < #1”] φ.val ⇜ (#0 :> (#·.succ.succ))))) (by simp),
809809
by intro v; simp [hbf.df.iff, hp.df.iff] ⟩
810810
| 𝚷 => exact
811-
⟨ .mkPi (∀⁰ (bf.val (∃⁰[“#0 < #1”] φ.val ⇜ (#0 :> (#·.succ.succ))))) (by simp),
811+
⟨ .mkPi (∀⁰ (bf.val 🡒 (∃⁰[“#0 < #1”] φ.val ⇜ (#0 :> (#·.succ.succ))))) (by simp),
812812
by intro v; simp [hbf.df.iff, hp.df.iff] ⟩
813813
| 𝚫 =>
814814
exact .of_sigma_of_pi
815815
⟨ .mkSigma (∃⁰ (bf.val ⋏ (∃⁰[“#0 < #1”] φ.sigma.val ⇜ (#0 :> (#·.succ.succ))))) (by simp),
816816
by intro v; simp [hbf.df.iff, hp.df.iff, HierarchySymbol.Semiformula.val_sigma] ⟩
817-
⟨ .mkPi (∀⁰ (bf.val (∃⁰[“#0 < #1”] φ.pi.val ⇜ (#0 :> (#·.succ.succ))))) (by simp),
817+
⟨ .mkPi (∀⁰ (bf.val 🡒 (∃⁰[“#0 < #1”] φ.pi.val ⇜ (#0 :> (#·.succ.succ))))) (by simp),
818818
by intro v; simp [hbf.df.iff, hp.df.iff, hp.proper.iff'] ⟩
819819

820820
lemma ball_le [V ⊧ₘ* 𝗣𝗔⁻] {Γ} {P : (Fin k → V) → V → Prop} {f : (Fin k → V) → V}

0 commit comments

Comments
 (0)