model_theory.bundled | Mathlib porting status

Changes since the initial port

The following section lists changes to this file in mathlib3 and mathlib4 that occured after the initial port. Most recent changes are shown first. Hovering over a commit will show all commits associated with the same mathlib3 commit.

Changes in mathlib3

b3951c65

(last sync)

Changes in mathlib3port

mathlib3

mathlib3port

dbdf71ce

bump to nightly-2023-09-24-06

mathlib commit https://github.com/leanprover-community/mathlib/commit/ce64cd319bb6b3e82f31c2d38e79080d377be451

5655435f

Diff

@@ -3,8 +3,8 @@ Copyright (c) 2022 Aaron Anderson. All rights reserved.
 Released under Apache 2.0 license as described in the file LICENSE.
 Authors: Aaron Anderson
 -/
-import Mathbin.ModelTheory.ElementaryMaps
-import Mathbin.CategoryTheory.ConcreteCategory.Bundled
+import ModelTheory.ElementaryMaps
+import CategoryTheory.ConcreteCategory.Bundled
 
 #align_import model_theory.bundled from "leanprover-community/mathlib"@"dbdf71cee7bb20367cb7e37279c08b0c218cf967"

dbdf71ce

bump to nightly-2023-07-20-09

mathlib commit https://github.com/leanprover-community/mathlib/commit/8ea5598db6caeddde6cb734aa179cc2408dbd345

9c56d0dd

Diff

@@ -2,15 +2,12 @@
 Copyright (c) 2022 Aaron Anderson. All rights reserved.
 Released under Apache 2.0 license as described in the file LICENSE.
 Authors: Aaron Anderson
-
-! This file was ported from Lean 3 source module model_theory.bundled
-! leanprover-community/mathlib commit dbdf71cee7bb20367cb7e37279c08b0c218cf967
-! Please do not edit these lines, except to modify the commit id
-! if you have ported upstream changes.
 -/
 import Mathbin.ModelTheory.ElementaryMaps
 import Mathbin.CategoryTheory.ConcreteCategory.Bundled
 
+#align_import model_theory.bundled from "leanprover-community/mathlib"@"dbdf71cee7bb20367cb7e37279c08b0c218cf967"
+
 /-!
 # Bundled First-Order Structures

dbdf71ce

bump to nightly-2023-06-01-04

mathlib commit https://github.com/leanprover-community/mathlib/commit/cca40788df1b8755d5baf17ab2f27dacc2e17acb

4d9eaa85

Diff

@@ -101,12 +101,10 @@ namespace Model
 instance : CoeSort T.ModelType (Type w) :=
   ⟨ModelType.Carrier⟩
 
-/- warning: first_order.language.Theory.Model.carrier_eq_coe clashes with [anonymous] -> [anonymous]
-Case conversion may be inaccurate. Consider using '#align first_order.language.Theory.Model.carrier_eq_coe [anonymous]ₓ'. -/
 @[simp]
-theorem [anonymous] (M : T.ModelType) : M.carrier = M :=
+theorem carrier_eq_coe (M : T.ModelType) : M.carrier = M :=
   rfl
-#align first_order.language.Theory.Model.carrier_eq_coe [anonymous]
+#align first_order.language.Theory.Model.carrier_eq_coe FirstOrder.Language.Theory.ModelType.carrier_eq_coe
 
 /- ./././Mathport/Syntax/Translate/Expr.lean:177:8: unsupported: ambiguous notation -/
 #print FirstOrder.Language.Theory.ModelType.of /-

dbdf71ce

bump to nightly-2023-05-28-18

mathlib commit https://github.com/leanprover-community/mathlib/commit/917c3c072e487b3cccdbfeff17e75b40e45f66cb

8d353152

Diff

@@ -40,7 +40,7 @@ instance CategoryTheory.Bundled.structure {L : FirstOrder.Language.{u, v}}
 #align category_theory.bundled.Structure CategoryTheory.Bundled.structure
 -/
 
-open FirstOrder Cardinal
+open scoped FirstOrder Cardinal
 
 namespace Equiv

dbdf71ce

bump to nightly-2023-05-28-06

mathlib commit https://github.com/leanprover-community/mathlib/commit/917c3c072e487b3cccdbfeff17e75b40e45f66cb

ba5d8b97

Diff

@@ -102,11 +102,6 @@ instance : CoeSort T.ModelType (Type w) :=
   ⟨ModelType.Carrier⟩
 
 /- warning: first_order.language.Theory.Model.carrier_eq_coe clashes with [anonymous] -> [anonymous]
-warning: first_order.language.Theory.Model.carrier_eq_coe -> [anonymous] is a dubious translation:
-lean 3 declaration is
-  forall {L : FirstOrder.Language.{u, v}} (T : FirstOrder.Language.Theory.{u, v} L) (M : FirstOrder.Language.Theory.ModelType.{u, v, u_1} L T), Eq.{succ (succ u_1)} Type.{u_1} (FirstOrder.Language.Theory.ModelType.Carrier.{u, v, u_1} L T M) (coeSort.{max (succ u) (succ v) (succ (succ u_1)), succ (succ u_1)} (FirstOrder.Language.Theory.ModelType.{u, v, u_1} L T) Type.{u_1} (FirstOrder.Language.Theory.ModelType.instCoeSort.{u, v, u_1} L T) M)
-but is expected to have type
-  forall {L : Type.{u}} {T : Type.{v}}, (Nat -> L -> T) -> Nat -> (List.{u} L) -> (List.{v} T)
 Case conversion may be inaccurate. Consider using '#align first_order.language.Theory.Model.carrier_eq_coe [anonymous]ₓ'. -/
 @[simp]
 theorem [anonymous] (M : T.ModelType) : M.carrier = M :=

dbdf71ce

bump to nightly-2023-05-16-03

mathlib commit https://github.com/leanprover-community/mathlib/commit/0b9eaaa7686280fad8cce467f5c3c57ee6ce77f8

4c01fe25

Diff

@@ -4,7 +4,7 @@ Released under Apache 2.0 license as described in the file LICENSE.
 Authors: Aaron Anderson
 
 ! This file was ported from Lean 3 source module model_theory.bundled
-! leanprover-community/mathlib commit b3951c65c6e797ff162ae8b69eab0063bcfb3d73
+! leanprover-community/mathlib commit dbdf71cee7bb20367cb7e37279c08b0c218cf967
 ! Please do not edit these lines, except to modify the commit id
 ! if you have ported upstream changes.
 -/
@@ -13,6 +13,9 @@ import Mathbin.CategoryTheory.ConcreteCategory.Bundled
 
 /-!
 # Bundled First-Order Structures
+
+> THIS FILE IS SYNCHRONIZED WITH MATHLIB4.
+> Any changes to this file require a corresponding PR to mathlib4.
 This file bundles types together with their first-order structure.
 
 ## Main Definitions

b3951c65

bump to nightly-2023-05-13-16

mathlib commit https://github.com/leanprover-community/mathlib/commit/403190b5419b3f03f1a2893ad9352ca7f7d8bff6

a0be3cad

Diff

@@ -29,11 +29,13 @@ universe u v w w'
 
 variable {L : FirstOrder.Language.{u, v}}
 
+#print CategoryTheory.Bundled.structure /-
 @[protected]
 instance CategoryTheory.Bundled.structure {L : FirstOrder.Language.{u, v}}
     (M : CategoryTheory.Bundled.{w} L.Structure) : L.Structure M :=
   M.str
 #align category_theory.bundled.Structure CategoryTheory.Bundled.structure
+-/
 
 open FirstOrder Cardinal
 
@@ -41,18 +43,22 @@ namespace Equiv
 
 variable (L) {M : Type w} [L.Structure M] {N : Type w'} (g : M ≃ N)
 
+#print Equiv.bundledInduced /-
 /-- A type bundled with the structure induced by an equivalence. -/
 @[simps]
 def bundledInduced : CategoryTheory.Bundled.{w'} L.Structure :=
   ⟨N, g.inducedStructure⟩
 #align equiv.bundled_induced Equiv.bundledInduced
+-/
 
+#print Equiv.bundledInducedEquiv /-
 /-- An equivalence of types as a first-order equivalence to the bundled structure on the codomain.
 -/
 @[simp]
 def bundledInducedEquiv : M ≃[L] g.bundledInduced L :=
   g.inducedStructureEquiv
 #align equiv.bundled_induced_equiv Equiv.bundledInducedEquiv
+-/
 
 end Equiv
 
@@ -60,6 +66,7 @@ namespace FirstOrder
 
 namespace Language
 
+#print FirstOrder.Language.equivSetoid /-
 /-- The equivalence relation on bundled `L.Structure`s indicating that they are isomorphic. -/
 instance equivSetoid : Setoid (CategoryTheory.Bundled L.Structure)
     where
@@ -68,100 +75,125 @@ instance equivSetoid : Setoid (CategoryTheory.Bundled L.Structure)
     ⟨fun M => ⟨Equiv.refl L M⟩, fun M N => Nonempty.map Equiv.symm, fun M N P =>
       Nonempty.map2 fun MN NP => NP.comp MN⟩
 #align first_order.language.equiv_setoid FirstOrder.Language.equivSetoid
+-/
 
 variable (T : L.Theory)
 
 namespace Theory
 
+#print FirstOrder.Language.Theory.ModelType /-
 /-- The type of nonempty models of a first-order theory. -/
-structure ModelCat where
+structure ModelType where
   carrier : Type w
   [struc : L.Structure carrier]
   [is_model : T.Model carrier]
   [nonempty' : Nonempty carrier]
-#align first_order.language.Theory.Model FirstOrder.Language.Theory.ModelCat
+#align first_order.language.Theory.Model FirstOrder.Language.Theory.ModelType
+-/
 
 attribute [instance] Model.struc Model.is_model Model.nonempty'
 
 namespace Model
 
-instance : CoeSort T.ModelCat (Type w) :=
-  ⟨ModelCat.Carrier⟩
+instance : CoeSort T.ModelType (Type w) :=
+  ⟨ModelType.Carrier⟩
 
+/- warning: first_order.language.Theory.Model.carrier_eq_coe clashes with [anonymous] -> [anonymous]
+warning: first_order.language.Theory.Model.carrier_eq_coe -> [anonymous] is a dubious translation:
+lean 3 declaration is
+  forall {L : FirstOrder.Language.{u, v}} (T : FirstOrder.Language.Theory.{u, v} L) (M : FirstOrder.Language.Theory.ModelType.{u, v, u_1} L T), Eq.{succ (succ u_1)} Type.{u_1} (FirstOrder.Language.Theory.ModelType.Carrier.{u, v, u_1} L T M) (coeSort.{max (succ u) (succ v) (succ (succ u_1)), succ (succ u_1)} (FirstOrder.Language.Theory.ModelType.{u, v, u_1} L T) Type.{u_1} (FirstOrder.Language.Theory.ModelType.instCoeSort.{u, v, u_1} L T) M)
+but is expected to have type
+  forall {L : Type.{u}} {T : Type.{v}}, (Nat -> L -> T) -> Nat -> (List.{u} L) -> (List.{v} T)
+Case conversion may be inaccurate. Consider using '#align first_order.language.Theory.Model.carrier_eq_coe [anonymous]ₓ'. -/
 @[simp]
-theorem carrier_eq_coe (M : T.ModelCat) : M.carrier = M :=
+theorem [anonymous] (M : T.ModelType) : M.carrier = M :=
   rfl
-#align first_order.language.Theory.Model.carrier_eq_coe FirstOrder.Language.Theory.ModelCat.carrier_eq_coe
+#align first_order.language.Theory.Model.carrier_eq_coe [anonymous]
 
 /- ./././Mathport/Syntax/Translate/Expr.lean:177:8: unsupported: ambiguous notation -/
+#print FirstOrder.Language.Theory.ModelType.of /-
 /-- The object in the category of R-algebras associated to a type equipped with the appropriate
 typeclasses. -/
-def of (M : Type w) [L.Structure M] [M ⊨ T] [Nonempty M] : T.ModelCat :=
+def of (M : Type w) [L.Structure M] [M ⊨ T] [Nonempty M] : T.ModelType :=
   ⟨M⟩
-#align first_order.language.Theory.Model.of FirstOrder.Language.Theory.ModelCat.of
+#align first_order.language.Theory.Model.of FirstOrder.Language.Theory.ModelType.of
+-/
 
 /- ./././Mathport/Syntax/Translate/Expr.lean:177:8: unsupported: ambiguous notation -/
+#print FirstOrder.Language.Theory.ModelType.coe_of /-
 @[simp]
 theorem coe_of (M : Type w) [L.Structure M] [M ⊨ T] [Nonempty M] : (of T M : Type w) = M :=
   rfl
-#align first_order.language.Theory.Model.coe_of FirstOrder.Language.Theory.ModelCat.coe_of
+#align first_order.language.Theory.Model.coe_of FirstOrder.Language.Theory.ModelType.coe_of
+-/
 
-instance (M : T.ModelCat) : Nonempty M :=
+instance (M : T.ModelType) : Nonempty M :=
   inferInstance
 
 section Inhabited
 
 attribute [local instance] inhabited.trivial_structure
 
-instance : Inhabited (ModelCat.{u, v, w} (∅ : L.Theory)) :=
-  ⟨ModelCat.of _ PUnit⟩
+instance : Inhabited (ModelType.{u, v, w} (∅ : L.Theory)) :=
+  ⟨ModelType.of _ PUnit⟩
 
 end Inhabited
 
 variable {T}
 
+#print FirstOrder.Language.Theory.ModelType.equivInduced /-
 /-- Maps a bundled model along a bijection. -/
-def equivInduced {M : ModelCat.{u, v, w} T} {N : Type w'} (e : M ≃ N) : ModelCat.{u, v, w'} T
+def equivInduced {M : ModelType.{u, v, w} T} {N : Type w'} (e : M ≃ N) : ModelType.{u, v, w'} T
     where
   carrier := N
   struc := e.inducedStructure
   is_model := @Equiv.theory_model L M N _ e.inducedStructure T e.inducedStructureEquiv _
   nonempty' := e.symm.Nonempty
-#align first_order.language.Theory.Model.equiv_induced FirstOrder.Language.Theory.ModelCat.equivInduced
+#align first_order.language.Theory.Model.equiv_induced FirstOrder.Language.Theory.ModelType.equivInduced
+-/
 
 /- ./././Mathport/Syntax/Translate/Expr.lean:177:8: unsupported: ambiguous notation -/
+#print FirstOrder.Language.Theory.ModelType.of_small /-
 instance of_small (M : Type w) [Nonempty M] [L.Structure M] [M ⊨ T] [h : Small.{w'} M] :
-    Small.{w'} (ModelCat.of T M) :=
+    Small.{w'} (ModelType.of T M) :=
   h
-#align first_order.language.Theory.Model.of_small FirstOrder.Language.Theory.ModelCat.of_small
+#align first_order.language.Theory.Model.of_small FirstOrder.Language.Theory.ModelType.of_small
+-/
 
+#print FirstOrder.Language.Theory.ModelType.shrink /-
 /-- Shrinks a small model to a particular universe. -/
-noncomputable def shrink (M : ModelCat.{u, v, w} T) [Small.{w'} M] : ModelCat.{u, v, w'} T :=
+noncomputable def shrink (M : ModelType.{u, v, w} T) [Small.{w'} M] : ModelType.{u, v, w'} T :=
   equivInduced (equivShrink M)
-#align first_order.language.Theory.Model.shrink FirstOrder.Language.Theory.ModelCat.shrink
+#align first_order.language.Theory.Model.shrink FirstOrder.Language.Theory.ModelType.shrink
+-/
 
+#print FirstOrder.Language.Theory.ModelType.ulift /-
 /-- Lifts a model to a particular universe. -/
-def ulift (M : ModelCat.{u, v, w} T) : ModelCat.{u, v, max w w'} T :=
+def ulift (M : ModelType.{u, v, w} T) : ModelType.{u, v, max w w'} T :=
   equivInduced (Equiv.ulift.symm : M ≃ _)
-#align first_order.language.Theory.Model.ulift FirstOrder.Language.Theory.ModelCat.ulift
+#align first_order.language.Theory.Model.ulift FirstOrder.Language.Theory.ModelType.ulift
+-/
 
+#print FirstOrder.Language.Theory.ModelType.reduct /-
 /-- The reduct of any model of `φ.on_Theory T` is a model of `T`. -/
 @[simps]
-def reduct {L' : Language} (φ : L →ᴸ L') (M : (φ.onTheory T).ModelCat) : T.ModelCat
+def reduct {L' : Language} (φ : L →ᴸ L') (M : (φ.onTheory T).ModelType) : T.ModelType
     where
   carrier := M
   struc := φ.reduct M
   nonempty' := M.nonempty'
   is_model := (@LHom.onTheory_model L L' M (φ.reduct M) _ φ _ T).1 M.is_model
-#align first_order.language.Theory.Model.reduct FirstOrder.Language.Theory.ModelCat.reduct
+#align first_order.language.Theory.Model.reduct FirstOrder.Language.Theory.ModelType.reduct
+-/
 
+#print FirstOrder.Language.Theory.ModelType.defaultExpansion /-
 /-- When `φ` is injective, `default_expansion` expands a model of `T` to a model of `φ.on_Theory T`
   arbitrarily. -/
 @[simps]
 noncomputable def defaultExpansion {L' : Language} {φ : L →ᴸ L'} (h : φ.Injective)
     [∀ (n) (f : L'.Functions n), Decidable (f ∈ Set.range fun f : L.Functions n => φ.onFunction f)]
     [∀ (n) (r : L'.Relations n), Decidable (r ∈ Set.range fun r : L.Relations n => φ.onRelation r)]
-    (M : T.ModelCat) [Inhabited M] : (φ.onTheory T).ModelCat
+    (M : T.ModelType) [Inhabited M] : (φ.onTheory T).ModelType
     where
   carrier := M
   struc := φ.defaultExpansion M
@@ -169,63 +201,82 @@ noncomputable def defaultExpansion {L' : Language} {φ : L →ᴸ L'} (h : φ.In
   is_model :=
     (@LHom.onTheory_model L L' M _ (φ.defaultExpansion M) φ (h.isExpansionOn_default M) T).2
       M.is_model
-#align first_order.language.Theory.Model.default_expansion FirstOrder.Language.Theory.ModelCat.defaultExpansion
+#align first_order.language.Theory.Model.default_expansion FirstOrder.Language.Theory.ModelType.defaultExpansion
+-/
 
-instance leftStructure {L' : Language} {T : (L.Sum L').Theory} (M : T.ModelCat) : L.Structure M :=
+#print FirstOrder.Language.Theory.ModelType.leftStructure /-
+instance leftStructure {L' : Language} {T : (L.Sum L').Theory} (M : T.ModelType) : L.Structure M :=
   (LHom.sumInl : L →ᴸ L.Sum L').reduct M
-#align first_order.language.Theory.Model.left_Structure FirstOrder.Language.Theory.ModelCat.leftStructure
+#align first_order.language.Theory.Model.left_Structure FirstOrder.Language.Theory.ModelType.leftStructure
+-/
 
-instance rightStructure {L' : Language} {T : (L.Sum L').Theory} (M : T.ModelCat) : L'.Structure M :=
+#print FirstOrder.Language.Theory.ModelType.rightStructure /-
+instance rightStructure {L' : Language} {T : (L.Sum L').Theory} (M : T.ModelType) :
+    L'.Structure M :=
   (LHom.sumInr : L' →ᴸ L.Sum L').reduct M
-#align first_order.language.Theory.Model.right_Structure FirstOrder.Language.Theory.ModelCat.rightStructure
+#align first_order.language.Theory.Model.right_Structure FirstOrder.Language.Theory.ModelType.rightStructure
+-/
 
+#print FirstOrder.Language.Theory.ModelType.subtheoryModel /-
 /-- A model of a theory is also a model of any subtheory. -/
 @[simps]
-def subtheoryModel (M : T.ModelCat) {T' : L.Theory} (h : T' ⊆ T) : T'.ModelCat
+def subtheoryModel (M : T.ModelType) {T' : L.Theory} (h : T' ⊆ T) : T'.ModelType
     where
   carrier := M
   is_model := ⟨fun φ hφ => realize_sentence_of_mem T (h hφ)⟩
-#align first_order.language.Theory.Model.subtheory_Model FirstOrder.Language.Theory.ModelCat.subtheoryModel
+#align first_order.language.Theory.Model.subtheory_Model FirstOrder.Language.Theory.ModelType.subtheoryModel
+-/
 
 /- ./././Mathport/Syntax/Translate/Expr.lean:177:8: unsupported: ambiguous notation -/
-instance subtheoryModel_models (M : T.ModelCat) {T' : L.Theory} (h : T' ⊆ T) :
+#print FirstOrder.Language.Theory.ModelType.subtheoryModel_models /-
+instance subtheoryModel_models (M : T.ModelType) {T' : L.Theory} (h : T' ⊆ T) :
     M.subtheoryModel h ⊨ T :=
   M.is_model
-#align first_order.language.Theory.Model.subtheory_Model_models FirstOrder.Language.Theory.ModelCat.subtheoryModel_models
+#align first_order.language.Theory.Model.subtheory_Model_models FirstOrder.Language.Theory.ModelType.subtheoryModel_models
+-/
 
 end Model
 
 variable {T}
 
 /- ./././Mathport/Syntax/Translate/Expr.lean:177:8: unsupported: ambiguous notation -/
+#print FirstOrder.Language.Theory.Model.bundled /-
 /-- Bundles `M ⊨ T` as a `T.Model`. -/
-def Model.bundled {M : Type w} [LM : L.Structure M] [ne : Nonempty M] (h : M ⊨ T) : T.ModelCat :=
-  @ModelCat.of L T M LM h Ne
+def Model.bundled {M : Type w} [LM : L.Structure M] [ne : Nonempty M] (h : M ⊨ T) : T.ModelType :=
+  @ModelType.of L T M LM h Ne
 #align first_order.language.Theory.model.bundled FirstOrder.Language.Theory.Model.bundled
+-/
 
 /- ./././Mathport/Syntax/Translate/Expr.lean:177:8: unsupported: ambiguous notation -/
+#print FirstOrder.Language.Theory.coe_of /-
 @[simp]
 theorem coe_of {M : Type w} [L.Structure M] [Nonempty M] (h : M ⊨ T) : (h.Bundled : Type w) = M :=
   rfl
 #align first_order.language.Theory.coe_of FirstOrder.Language.Theory.coe_of
+-/
 
 end Theory
 
+#print FirstOrder.Language.ElementarilyEquivalent.toModel /-
 /-- A structure that is elementarily equivalent to a model, bundled as a model. -/
-def ElementarilyEquivalent.toModel {M : T.ModelCat} {N : Type _} [LN : L.Structure N]
-    (h : M ≅[L] N) : T.ModelCat where
+def ElementarilyEquivalent.toModel {M : T.ModelType} {N : Type _} [LN : L.Structure N]
+    (h : M ≅[L] N) : T.ModelType where
   carrier := N
   struc := LN
   nonempty' := h.Nonempty
   is_model := h.theory_model
 #align first_order.language.elementarily_equivalent.to_Model FirstOrder.Language.ElementarilyEquivalent.toModel
+-/
 
+#print FirstOrder.Language.ElementarySubstructure.toModel /-
 /-- An elementary substructure of a bundled model as a bundled model. -/
-def ElementarySubstructure.toModel {M : T.ModelCat} (S : L.ElementarySubstructure M) : T.ModelCat :=
+def ElementarySubstructure.toModel {M : T.ModelType} (S : L.ElementarySubstructure M) :
+    T.ModelType :=
   S.ElementarilyEquivalent.symm.toModel T
 #align first_order.language.elementary_substructure.to_Model FirstOrder.Language.ElementarySubstructure.toModel
+-/
 
-instance {M : T.ModelCat} (S : L.ElementarySubstructure M) [h : Small S] : Small (S.toModel T) :=
+instance {M : T.ModelType} (S : L.ElementarySubstructure M) [h : Small S] : Small (S.toModel T) :=
   h
 
 end Language

b3951c65

bump to nightly-2023-04-13-00

mathlib commit https://github.com/leanprover-community/mathlib/commit/039ef89bef6e58b32b62898dd48e9d1a4312bb65

b0c3fa7f

Diff

@@ -152,7 +152,7 @@ def reduct {L' : Language} (φ : L →ᴸ L') (M : (φ.onTheory T).ModelCat) : T
   carrier := M
   struc := φ.reduct M
   nonempty' := M.nonempty'
-  is_model := (@Lhom.onTheory_model L L' M (φ.reduct M) _ φ _ T).1 M.is_model
+  is_model := (@LHom.onTheory_model L L' M (φ.reduct M) _ φ _ T).1 M.is_model
 #align first_order.language.Theory.Model.reduct FirstOrder.Language.Theory.ModelCat.reduct
 
 /-- When `φ` is injective, `default_expansion` expands a model of `T` to a model of `φ.on_Theory T`
@@ -167,16 +167,16 @@ noncomputable def defaultExpansion {L' : Language} {φ : L →ᴸ L'} (h : φ.In
   struc := φ.defaultExpansion M
   nonempty' := M.nonempty'
   is_model :=
-    (@Lhom.onTheory_model L L' M _ (φ.defaultExpansion M) φ (h.isExpansionOn_default M) T).2
+    (@LHom.onTheory_model L L' M _ (φ.defaultExpansion M) φ (h.isExpansionOn_default M) T).2
       M.is_model
 #align first_order.language.Theory.Model.default_expansion FirstOrder.Language.Theory.ModelCat.defaultExpansion
 
 instance leftStructure {L' : Language} {T : (L.Sum L').Theory} (M : T.ModelCat) : L.Structure M :=
-  (Lhom.sumInl : L →ᴸ L.Sum L').reduct M
+  (LHom.sumInl : L →ᴸ L.Sum L').reduct M
 #align first_order.language.Theory.Model.left_Structure FirstOrder.Language.Theory.ModelCat.leftStructure
 
 instance rightStructure {L' : Language} {T : (L.Sum L').Theory} (M : T.ModelCat) : L'.Structure M :=
-  (Lhom.sumInr : L' →ᴸ L.Sum L').reduct M
+  (LHom.sumInr : L' →ᴸ L.Sum L').reduct M
 #align first_order.language.Theory.Model.right_Structure FirstOrder.Language.Theory.ModelCat.rightStructure
 
 /-- A model of a theory is also a model of any subtheory. -/

b3951c65

bump to nightly-2023-02-21-16

mathlib commit https://github.com/leanprover-community/mathlib/commit/bd9851ca476957ea4549eb19b40e7b5ade9428cc

1107b979

Changes in mathlib4

mathlib3

mathlib4

b3951c65

chore(ModelTheory/ElementarySubstructures): Split elementary substructures into their own file (#9026)

This PR splits the file ModelTheory/ElementaryMaps into two files, moving elementary substructure code into ModelTheory/ElementarySubstructures, to make room for new API on those.

Two basic lemmas, FirstOrder.Language.Substructure.realize_boundedFormula_top and FirstOrder.Language.Substructure.realize_formula_top, are instead moved to the file ModelTheory/Substructures.

Co-authored-by: Yaël Dillies <yael.dillies@gmail.com> Co-authored-by: Aaron Anderson <65780815+awainverse@users.noreply.github.com>

a5732e8f

Diff

@@ -3,7 +3,7 @@ Copyright (c) 2022 Aaron Anderson. All rights reserved.
 Released under Apache 2.0 license as described in the file LICENSE.
 Authors: Aaron Anderson
 -/
-import Mathlib.ModelTheory.ElementaryMaps
+import Mathlib.ModelTheory.ElementarySubstructures
 import Mathlib.CategoryTheory.ConcreteCategory.Bundled
 
 #align_import model_theory.bundled from "leanprover-community/mathlib"@"b3951c65c6e797ff162ae8b69eab0063bcfb3d73"

b3951c65

chore: banish Type _ and Sort _ (#6499)

We remove all possible occurences of Type _ and Sort _ in favor of Type* and Sort*.

This has nice performance benefits.

32de3f67

Diff

@@ -209,7 +209,7 @@ theorem coe_of {M : Type w} [L.Structure M] [Nonempty M] (h : M ⊨ T) : (h.bund
 end Theory
 
 /-- A structure that is elementarily equivalent to a model, bundled as a model. -/
-def ElementarilyEquivalent.toModel {M : T.ModelType} {N : Type _} [LN : L.Structure N]
+def ElementarilyEquivalent.toModel {M : T.ModelType} {N : Type*} [LN : L.Structure N]
     (h : M ≅[L] N) : T.ModelType where
   Carrier := N
   struc := LN

b3951c65

chore: script to replace headers with #align_import statements (#5979)

depends on: #5966

Co-authored-by: Eric Wieser <wieser.eric@gmail.com> Co-authored-by: Scott Morrison <scott.morrison@gmail.com>

89aa3a3b

Diff

@@ -2,15 +2,12 @@
 Copyright (c) 2022 Aaron Anderson. All rights reserved.
 Released under Apache 2.0 license as described in the file LICENSE.
 Authors: Aaron Anderson
-
-! This file was ported from Lean 3 source module model_theory.bundled
-! leanprover-community/mathlib commit b3951c65c6e797ff162ae8b69eab0063bcfb3d73
-! Please do not edit these lines, except to modify the commit id
-! if you have ported upstream changes.
 -/
 import Mathlib.ModelTheory.ElementaryMaps
 import Mathlib.CategoryTheory.ConcreteCategory.Bundled
 
+#align_import model_theory.bundled from "leanprover-community/mathlib"@"b3951c65c6e797ff162ae8b69eab0063bcfb3d73"
+
 /-!
 # Bundled First-Order Structures
 This file bundles types together with their first-order structure.

b3951c65

refactor: increase the priority of FirstOrder.Language.Theory.ModelType.struc (#3979)

In Lean4, other instances precedes FirstOrder.Language.Theory.ModelType.struc, it's issues in ModelTheory.Satisfiability.

cfd84264

Diff

@@ -85,7 +85,9 @@ structure ModelType where
 #align first_order.language.Theory.Model.is_model FirstOrder.Language.Theory.ModelType.is_model
 #align first_order.language.Theory.Model.nonempty' FirstOrder.Language.Theory.ModelType.nonempty'
 
-attribute [instance] ModelType.struc ModelType.is_model ModelType.nonempty'
+-- Porting note: In Lean4, other instances precedes `FirstOrder.Language.Theory.ModelType.struc`,
+-- it's issues in `ModelTheory.Satisfiability`. So, we increase these priorities.
+attribute [instance 2000] ModelType.struc ModelType.is_model ModelType.nonempty'
 
 namespace ModelType

b3951c65

doc: fix the docs on ModelTheory/* (#3968)

a2ab29ce

Diff

@@ -16,8 +16,8 @@ import Mathlib.CategoryTheory.ConcreteCategory.Bundled
 This file bundles types together with their first-order structure.
 
 ## Main Definitions
-* `FirstOrder.language.Theory.ModelType` is the type of nonempty models of a particular theory.
-* `FirstOrder.language.equivSetoid` is the isomorphism equivalence relation on bundled structures.
+* `FirstOrder.Language.Theory.ModelType` is the type of nonempty models of a particular theory.
+* `FirstOrder.Language.equivSetoid` is the isomorphism equivalence relation on bundled structures.
 
 ## TODO
 * Define category structures on bundled structures and models.

b3951c65

feat: port ModelTheory.Bundled (#3933)

Co-authored-by: ChrisHughes24 <chrishughes24@gmail.com>

9443ba42

`model_theory.bundled` ⟷ `Mathlib.ModelTheory.Bundled`

Changes since the initial port

Changes in mathlib3

Changes in mathlib3port

Changes in mathlib4

Dependencies 8 + 365

model_theory.bundled ⟷ Mathlib.ModelTheory.Bundled

Changes since the initial port

Changes in mathlib3

Changes in mathlib3port

Changes in mathlib4

Dependencies 8 + 365

`model_theory.bundled` ⟷ `Mathlib.ModelTheory.Bundled`