refactor(library/logic): remove 'core' subdirectory

library/algebra/binary.lean

@@ -1,7 +1,7 @@
 -- Copyright (c) 2014 Microsoft Corporation. All rights reserved.
 -- Released under Apache 2.0 license as described in the file LICENSE.
 -- Author: Leonardo de Moura
-import logic.core.eq
+import logic.eq
 open eq.ops
 
 namespace binary

library/algebra/category.lean

@@ -3,7 +3,7 @@
 -- Author: Floris van Doorn
 
 -- category
-import logic.core.eq logic.core.connectives
+import logic.eq logic.connectives
 import data.unit data.sigma data.prod
 import algebra.function
 import logic.axioms.funext

library/algebra/relation.lean

@@ -5,7 +5,7 @@
 -- algebra.relation
 -- ==============
 
-import logic.core.prop
+import logic.prop
 
 
 -- General properties of relations

library/algebra/wf.lean

@@ -1,9 +1,8 @@
 -- Copyright (c) 2014 Microsoft Corporation. All rights reserved.
 -- Released under Apache 2.0 license as described in the file LICENSE.
 -- Author: Leonardo de Moura
-
-import logic.axioms.classical logic.axioms.prop_decidable logic.core.decidable
-import logic.core.identities
+import logic.identities logic.decidable
+import logic.axioms.classical logic.axioms.prop_decidable
 
 open decidable
 

library/data/bool.lean

@@ -2,7 +2,7 @@
 -- Released under Apache 2.0 license as described in the file LICENSE.
 -- Author: Leonardo de Moura
 import general_notation
-import logic.core.connectives logic.core.decidable logic.core.inhabited
+import logic.connectives logic.decidable logic.inhabited
 
 open eq eq.ops decidable
 

library/data/empty.lean

@@ -5,7 +5,7 @@
 -- Empty type
 -- ----------
 
-import logic.core.cast
+import logic.cast
 
 inductive empty : Type
 

library/data/list/basic.lean

@@ -12,7 +12,6 @@
 import tools.tactic
 import data.nat
 import logic tools.helper_tactics
-import logic.core.identities
 
 open nat
 open eq.ops

library/data/nat/basic.lean

@@ -8,7 +8,7 @@
 -- Basic operations on the natural numbers.
 
 import logic data.num tools.tactic algebra.binary tools.helper_tactics
-import logic.core.inhabited
+import logic.inhabited
 
 open tactic binary eq.ops
 open decidable

library/data/nat/order.lean

@@ -7,7 +7,7 @@
 --
 -- The ordering on the natural numbers
 
-import .basic logic.core.decidable
+import .basic logic.decidable
 import tools.fake_simplifier
 
 open nat eq.ops tactic

library/data/num.lean

@@ -3,7 +3,7 @@
 -- Released under Apache 2.0 license as described in the file LICENSE.
 -- Author: Leonardo de Moura
 ----------------------------------------------------------------------------------------------------
-import logic.core.inhabited data.bool general_notation
+import logic.inhabited data.bool general_notation
 open bool
 
 -- pos_num and num are two auxiliary datatypes used when parsing numerals such as 13, 0, 26.

library/data/option.lean

@@ -2,7 +2,7 @@
 -- Released under Apache 2.0 license as described in the file LICENSE.
 -- Author: Leonardo de Moura
 
-import logic.core.eq logic.core.inhabited logic.core.decidable
+import logic.eq logic.inhabited logic.decidable
 open eq.ops decidable
 
 inductive option (A : Type) : Type :=

library/data/prod.lean

@@ -1,7 +1,7 @@
 -- Copyright (c) 2014 Microsoft Corporation. All rights reserved.
 -- Released under Apache 2.0 license as described in the file LICENSE.
 -- Author: Leonardo de Moura, Jeremy Avigad
-import logic.core.inhabited logic.core.eq logic.core.decidable
+import logic.inhabited logic.eq logic.decidable
 
 -- data.prod
 -- =========

library/data/quotient/basic.lean

@@ -5,8 +5,8 @@
 -- Theory data.quotient
 -- ====================
 
-import logic tools.tactic ..subtype logic.core.cast algebra.relation data.prod
-import logic.core.instances
+import logic tools.tactic data.subtype logic.cast algebra.relation data.prod
+import logic.instances
 import .util
 
 open relation prod inhabited nonempty tactic eq.ops

library/data/quotient/classical.lean

@@ -2,9 +2,9 @@
 -- Released under Apache 2.0 license as described in the file LICENSE.
 -- Author: Floris van Doorn
 
-import algebra.relation logic.core.nonempty data.subtype
-import .basic
+import algebra.relation logic.nonempty data.subtype
 import logic.axioms.classical logic.axioms.hilbert logic.axioms.funext
+import .basic
 
 namespace quotient
 

library/data/sigma.lean

@@ -1,7 +1,7 @@
 -- Copyright (c) 2014 Microsoft Corporation. All rights reserved.
 -- Released under Apache 2.0 license as described in the file LICENSE.
 -- Author: Leonardo de Moura, Jeremy Avigad, Floris van Doorn
-import logic.core.inhabited logic.core.eq
+import logic.inhabited logic.eq
 open inhabited eq.ops
 
 inductive sigma {A : Type} (B : A → Type) : Type :=

library/data/subtype.lean

@@ -2,7 +2,7 @@
 -- Released under Apache 2.0 license as described in the file LICENSE.
 -- Author: Leonardo de Moura, Jeremy Avigad
 
-import logic.core.inhabited logic.core.eq logic.core.decidable
+import logic.inhabited logic.eq logic.decidable
 
 open decidable
 

library/data/sum.lean

@@ -1,7 +1,7 @@
 -- Copyright (c) 2014 Microsoft Corporation. All rights reserved.
 -- Released under Apache 2.0 license as described in the file LICENSE.
 -- Author: Leonardo de Moura, Jeremy Avigad
-import logic.core.prop logic.core.inhabited logic.core.decidable
+import logic.prop logic.inhabited logic.decidable
 open inhabited decidable eq.ops
 -- data.sum
 -- ========

library/data/unit.lean

@@ -1,7 +1,7 @@
 -- Copyright (c) 2014 Microsoft Corporation. All rights reserved.
 -- Released under Apache 2.0 license as described in the file LICENSE.
 -- Author: Leonardo de Moura
-import logic.core.decidable logic.core.inhabited
+import logic.decidable logic.inhabited
 open decidable
 
 inductive unit : Type :=

library/logic/axioms/classical.lean

@@ -5,7 +5,7 @@
 -- logic.axioms.classical
 -- ======================
 
-import logic.core.quantifiers logic.core.cast algebra.relation
+import logic.quantifiers logic.cast algebra.relation
 
 open eq.ops
 

library/logic/axioms/funext.lean

@@ -5,7 +5,7 @@
 -- logic.axioms.funext
 -- ===================
 
-import logic.core.eq algebra.function
+import logic.eq algebra.function
 open function
 
 -- Function extensionality

library/logic/axioms/hilbert.lean

@@ -8,8 +8,8 @@
 -- Follows Coq.Logic.ClassicalEpsilon (but our definition of "inhabited" is the
 -- constructive one).
 
-import logic.core.quantifiers
-import logic.core.inhabited logic.core.nonempty
+import logic.quantifiers
+import logic.inhabited logic.nonempty
 import data.subtype data.sum
 
 open subtype inhabited nonempty

library/logic/axioms/piext.lean

@@ -2,7 +2,7 @@
 -- Released under Apache 2.0 license as described in the file LICENSE.
 -- Author: Leonardo de Moura
 
-import logic.core.inhabited logic.core.cast
+import logic.inhabited logic.cast
 
 open inhabited
 

library/logic/axioms/prop_decidable.lean

@@ -5,7 +5,7 @@
 -- logic.axioms.prop_decidable
 -- ===========================
 
-import logic.axioms.classical logic.axioms.hilbert logic.core.decidable
+import logic.axioms.classical logic.axioms.hilbert logic.decidable
 open decidable inhabited nonempty
 
 -- Excluded middle + Hilbert implies every proposition is decidable

library/logic/core/core.md

@@ -1,29 +0,0 @@
-logic.core
-==========
-
-Logical operations and connectives.
-
-* [prop](prop.lean) : the type Prop
-* [eq](eq.lean) : equality and disequality
-* [connectives](connectives.lean) : propositional connectives
-* [cast](cast.lean) : casts and heterogeneous equality
-* [quantifiers](quantifiers.lean) : existential and universal quantifiers
-* [if](if.lean) : if-then-else
-* [identities](identities.lean) : some useful identities
-* [examples](examples/examples.md)
-
-Type classes for general logical manipulations:
-
-* [inhabited](inhabited.lean) : inhabited types
-* [nonempty](nonempty.lean) : nonempty type
-* [decidable](decidable.lean) : decidable types
-* [instances](instances.lean) : type class instances
-
-Constructively, inhabited types have a witness, while nonempty types
-are "proof irrelevant". Classically (assuming the axioms in
-logic.axioms.hilbert) the two are equivalent. Type class inferences
-are set up to use "inhabited" however, so users should use that to
-declare that types have an element. Use "nonempty" in the hypothesis
-of a theorem when the theorem does not depend on the witness chosen.
-
-

library/logic/core/examples/examples.md

@@ -1,4 +0,0 @@
-logic.connectives.examples
-==========================
-
-* [instances_test](instances_test.lean)

library/logic/decidable.lean

@@ -2,7 +2,7 @@
 -- Released under Apache 2.0 license as described in the file LICENSE.
 -- Author: Leonardo de Moura
 
-import logic.core.connectives
+import logic.connectives
 
 inductive decidable (p : Prop) : Type :=
 inl : p  → decidable p,

library/logic/default.lean

@@ -2,8 +2,8 @@
 --- Released under Apache 2.0 license as described in the file LICENSE.
 --- Author: Jeremy Avigad
 
-import logic.core.connectives logic.core.eq logic.core.cast 
-import logic.core.quantifiers logic.core.if 
-import logic.core.decidable logic.core.inhabited logic.core.nonempty
-import logic.core.instances
-import logic.core.identities
+import logic.connectives logic.eq logic.cast
+import logic.quantifiers logic.if
+import logic.decidable logic.inhabited logic.nonempty
+import logic.instances
+import logic.identities

library/logic/examples/examples.md

@@ -2,3 +2,4 @@ logic.examples
 ==============
 
 * [nuprl_examples](nuprl_examples.lean) : examples from "Logical investigations with the Nuprl Proof Assistant"
+* [instances_test](instances_test.lean)

library/logic/identities.lean

@@ -2,13 +2,13 @@
 -- Released under Apache 2.0 license as described in the file LICENSE.
 -- Authors: Jeremy Avigad, Leonardo de Moura
 
--- logic.connectives.identities
+-- logic.identities
 -- ============================
 
 -- Useful logical identities. In the absence of propositional extensionality, some of the
 -- calculations use the type class support provided by logic.connectives.instances
 
-import logic.core.instances logic.core.decidable logic.core.quantifiers logic.core.cast
+import logic.instances logic.decidable logic.quantifiers logic.cast
 
 open relation decidable relation.iff_ops
 

library/logic/if.lean

@@ -4,7 +4,7 @@
 -- Author: Leonardo de Moura
 ----------------------------------------------------------------------------------------------------
 
-import logic.core.decidable tools.tactic
+import logic.decidable tools.tactic
 open decidable tactic eq.ops
 
 definition ite (c : Prop) {H : decidable c} {A : Type} (t e : A) : A :=

library/logic/inhabited.lean

@@ -2,7 +2,7 @@
 -- Released under Apache 2.0 license as described in the file LICENSE.
 -- Authors: Leonardo de Moura, Jeremy Avigad
 
-import logic.core.connectives
+import logic.connectives
 
 inductive inhabited (A : Type) : Type :=
 mk : A → inhabited A

library/logic/instances.lean

@@ -5,7 +5,7 @@
 -- logic.core.instances
 -- ====================
 
-import logic.core.connectives algebra.relation
+import logic.connectives algebra.relation
 
 namespace relation
 

library/logic/logic.md

@@ -4,6 +4,29 @@ logic
 Logical constructions and axioms. By default, `import logic` does not
 import any additional axioms.
 
-* [core](core/core.md) : logical connectives and type classes
+Logical operations and connectives.
+
+* [prop](prop.lean) : the type Prop
+* [eq](eq.lean) : equality and disequality
+* [connectives](connectives.lean) : propositional connectives
+* [cast](cast.lean) : casts and heterogeneous equality
+* [quantifiers](quantifiers.lean) : existential and universal quantifiers
+* [if](if.lean) : if-then-else
+* [identities](identities.lean) : some useful identities
+
+Type classes for general logical manipulations:
+
+* [inhabited](inhabited.lean) : inhabited types
+* [nonempty](nonempty.lean) : nonempty type
+* [decidable](decidable.lean) : decidable types
+* [instances](instances.lean) : type class instances
+
+Constructively, inhabited types have a witness, while nonempty types
+are "proof irrelevant". Classically (assuming the axioms in
+logic.axioms.hilbert) the two are equivalent. Type class inferences
+are set up to use "inhabited" however, so users should use that to
+declare that types have an element. Use "nonempty" in the hypothesis
+of a theorem when the theorem does not depend on the witness chosen.
+
 * [axioms](axioms/axioms.md) : additional axioms
 * [examples](examples/examples.md)

library/logic/quantifiers.lean

@@ -2,7 +2,7 @@
 -- Released under Apache 2.0 license as described in the file LICENSE.
 -- Authors: Leonardo de Moura, Jeremy Avigad
 
-import .connectives ..core.nonempty
+import logic.connectives logic.nonempty
 
 open inhabited nonempty
 

tests/lean/interactive/eq2.lean

@@ -7,7 +7,7 @@
 
 -- Equality.
 
-import logic.core.prop
+import logic.prop
 
 -- eq
 -- --

tests/lean/interactive/findp.lean

@@ -1,4 +1,4 @@
-import logic.core.eq algebra.relation
+import logic.eq algebra.relation
 
 check proof_irrel
 

tests/lean/interactive/num2.lean

@@ -3,7 +3,7 @@
 -- Released under Apache 2.0 license as described in the file LICENSE.
 -- Author: Leonardo de Moura
 ----------------------------------------------------------------------------------------------------
-import logic.core.inhabited
+import logic.inhabited
 
 -- pos_num and num are two auxiliary datatypes used when parsing numerals such as 13, 0, 26.
 -- The parser will generate the terms (pos (bit1 (bit1 (bit0 one)))), zero, and (pos (bit0 (bit1 (bit1 one)))).

tests/lean/run/cat.lean

@@ -3,7 +3,7 @@
 -- Author: Floris van Doorn
 
 -- category
-import logic.core.eq logic.core.connectives
+import logic.eq logic.connectives
 import data.unit data.sigma data.prod
 import algebra.function
 

tests/lean/run/congr_imp_bug.lean

@@ -3,7 +3,7 @@
 --- Released under Apache 2.0 license as described in the file LICENSE.
 --- Author: Jeremy Avigad
 ----------------------------------------------------------------------------------------------------
-import logic.core.connectives algebra.function
+import logic.connectives algebra.function
 open function
 
 namespace congr

tests/lean/run/ctx.lean

@@ -1,4 +1,4 @@
-import data.nat logic.core.inhabited
+import data.nat logic.inhabited
 open nat inhabited
 
 constant N : Type.{1}

tests/lean/run/group3.lean

@@ -7,7 +7,7 @@
 
 -- Various structures with 1, *, inv, including groups.
 
-import logic.core.eq logic.core.connectives
+import logic.eq logic.connectives
 import data.unit data.sigma data.prod
 import algebra.function algebra.binary
 

tests/lean/run/sum_bug.lean

@@ -1,9 +1,7 @@
 -- Copyright (c) 2014 Microsoft Corporation. All rights reserved.
 -- Released under Apache 2.0 license as described in the file LICENSE.
 -- Author: Leonardo de Moura, Jeremy Avigad
-
-import logic.core.prop logic.core.inhabited logic.core.decidable
-
+import logic.prop logic.inhabited logic.decidable
 open inhabited decidable
 
 -- TODO: take this outside the namespace when the inductive package handles it better

tests/lean/run/tactic17.lean

@@ -5,6 +5,6 @@ constant A : Type.{1}
 constant f : A → A → A
 
 theorem tst {a b c : A} (H1 : a = b) (H2 : b = c) : f a b = f b c
-:= by apply (@congr A A (f a) (f b));
+:= by apply (@congr A A _ _ (f a) (f b));
       apply (congr_arg f);
       !assumption

tests/lean/run/tt1.lean

@@ -1,4 +1,4 @@
-import data.prod data.num logic.core.quantifiers
+import data.prod data.num logic.quantifiers
 open prod
 
 check (true, false, 10)

tests/lean/slow/cat_sec_var_bug.lean

@@ -3,7 +3,7 @@
 -- Author: Floris van Doorn
 
 -- category
-import logic.core.eq logic.core.connectives
+import logic.eq logic.connectives
 import data.unit data.sigma data.prod
 import algebra.function
 import logic.axioms.funext