refactor(init): init/category ==> init.control

library/init/category/default.lean

@@ -1,10 +0,0 @@
-/-
-Copyright (c) 2016 Microsoft Corporation. All rights reserved.
-Released under Apache 2.0 license as described in the file LICENSE.
-Authors: Leonardo de Moura
--/
-prelude
-import init.category.applicative init.category.functor init.category.alternative
-import init.category.monad init.category.lift init.category.lawful
-import init.category.state init.category.id init.category.except init.category.reader
-import init.category.option

library/init/control/alternative.lean

@@ -4,7 +4,7 @@ Released under Apache 2.0 license as described in the file LICENSE.
 Author: Leonardo de Moura
 -/
 prelude
-import init.logic init.category.applicative
+import init.logic init.control.applicative
 universes u v
 
 class has_orelse (f : Type u → Type v) : Type (max (u+1) v) :=

library/init/control/applicative.lean

@@ -4,7 +4,7 @@ Released under Apache 2.0 license as described in the file LICENSE.
 Authors: Leonardo de Moura, Sebastian Ullrich
 -/
 prelude
-import init.category.functor
+import init.control.functor
 open function
 universes u v
 

library/init/control/combinators.lean

@@ -6,7 +6,7 @@ Authors: Jeremy Avigad, Leonardo de Moura
 Monad combinators, as in Haskell's Control.Monad.
 -/
 prelude
-import init.category.monad init.category.alternative init.data.list.basic
+import init.control.monad init.control.alternative init.data.list.basic
 universes u v w
 
 def list.mmap {m : Type u → Type v} [monad m] {α : Type w} {β : Type u} (f : α → m β) : list α → m (list β)

library/init/control/default.lean

@@ -0,0 +1,10 @@
+/-
+Copyright (c) 2016 Microsoft Corporation. All rights reserved.
+Released under Apache 2.0 license as described in the file LICENSE.
+Authors: Leonardo de Moura
+-/
+prelude
+import init.control.applicative init.control.functor init.control.alternative
+import init.control.monad init.control.lift init.control.lawful
+import init.control.state init.control.id init.control.except init.control.reader
+import init.control.option

library/init/control/except.lean

@@ -7,7 +7,7 @@ The except monad transformer.
 -/
 
 prelude
-import init.category.alternative init.category.lift
+import init.control.alternative init.control.lift
 universes u v w
 
 inductive except (ε : Type u) (α : Type v)

library/init/control/id.lean

@@ -6,7 +6,7 @@ Authors: Sebastian Ullrich
 The identity monad.
 -/
 prelude
-import init.category.lift
+import init.control.lift
 universe u
 
 @[inline] def id_bind {α β : Type u} (x : α) (f : α → id β) : id β := f x

library/init/control/lawful.lean

@@ -4,8 +4,8 @@ Released under Apache 2.0 license as described in the file LICENSE.
 Authors: Sebastian Ullrich
 -/
 prelude
-import init.category.monad init.meta.interactive
-import init.category.state init.category.except init.category.reader init.category.option
+import init.control.monad init.meta.interactive
+import init.control.state init.control.except init.control.reader init.control.option
 universes u v
 
 open function

library/init/control/lift.lean

@@ -10,7 +10,7 @@ Please see https://hackage.haskell.org/package/layers-0.1/docs/Documentation-Lay
 -/
 prelude
 import init.function init.coe
-import init.category.monad
+import init.control.monad
 
 universes u v w
 
@@ -43,7 +43,7 @@ instance has_monad_lift_t_refl (m) : has_monad_lift_t m m :=
 @[simp] lemma monad_lift_refl {m : Type u → Type v} {α} : (monad_lift : m α → m α) = id := rfl
 
 
-/-- A functor in the category of monads. Can be used to lift monad-transforming functions.
+/-- A functor in the control of monads. Can be used to lift monad-transforming functions.
     Based on pipes' [MFunctor](https://hackage.haskell.org/package/pipes-2.4.0/docs/Control-MFunctor.html),
     but not restricted to monad transformers.
     Alternatively, an implementation of [MonadTransFunctor](http://duairc.netsoc.ie/layers-docs/Control-Monad-Layer.html#t:MonadTransFunctor). -/

library/init/control/monad.lean

@@ -4,7 +4,7 @@ Released under Apache 2.0 license as described in the file LICENSE.
 Authors: Leonardo de Moura, Luke Nelson, Jared Roesch, Sebastian Ullrich
 -/
 prelude
-import init.category.applicative
+import init.control.applicative
 universes u v
 
 open function

library/init/control/monad_fail.lean

@@ -4,7 +4,7 @@ Released under Apache 2.0 license as described in the file LICENSE.
 Authors: Leonardo de Moura
 -/
 prelude
-import init.category.lift init.data.string.basic
+import init.control.lift init.data.string.basic
 
 universes u v
 

library/init/control/option.lean

@@ -4,7 +4,7 @@ Released under Apache 2.0 license as described in the file LICENSE.
 Authors: Leonardo de Moura, Sebastian Ullrich
 -/
 prelude
-import init.category.alternative init.category.lift init.category.except
+import init.control.alternative init.control.lift init.control.except
 
 universes u v
 

library/init/control/reader.lean

@@ -7,7 +7,7 @@ The reader monad transformer for passing immutable state.
 -/
 
 prelude
-import init.category.lift init.category.id init.category.alternative init.category.except
+import init.control.lift init.control.id init.control.alternative init.control.except
 universes u v w
 
 /-- An implementation of [ReaderT](https://hackage.haskell.org/package/transformers-0.5.5.0/docs/Control-Monad-Trans-Reader.html#t:ReaderT) -/

library/init/control/state.lean

@@ -6,8 +6,8 @@ Authors: Leonardo de Moura, Sebastian Ullrich
 The state monad transformer.
 -/
 prelude
-import init.category.alternative init.category.lift
-import init.category.id init.category.except
+import init.control.alternative init.control.lift
+import init.control.id init.control.except
 universes u v w
 
 structure state_t (σ : Type u) (m : Type u → Type v) (α : Type u) : Type (max u v) :=

library/init/data/list/instances.lean

@@ -5,7 +5,7 @@ Author: Leonardo de Moura
 -/
 prelude
 import init.data.list.basic
-import init.category.lawful
+import init.control.lawful
 open list
 
 universes u v

library/init/data/option/basic.lean

@@ -4,7 +4,7 @@ Released under Apache 2.0 license as described in the file LICENSE.
 Authors: Leonardo de Moura
 -/
 prelude
-import init.logic init.category.monad init.category.alternative
+import init.logic init.control.monad init.control.alternative
 open decidable
 
 universes u v

library/init/data/option/instances.lean

@@ -6,7 +6,7 @@ Authors: Leonardo de Moura
 prelude
 import init.data.option.basic
 import init.meta.tactic
-import init.category.lawful
+import init.control.lawful
 
 universes u v
 

library/init/data/set.lean

@@ -5,7 +5,7 @@ Authors: Leonardo de Moura
 -/
 prelude
 import init.meta.interactive
-import init.category.lawful
+import init.control.lawful
 
 universes u v
 def set (α : Type u) := α → Prop

library/init/default.lean

@@ -4,8 +4,8 @@ Released under Apache 2.0 license as described in the file LICENSE.
 Authors: Leonardo de Moura
 -/
 prelude
-import init.core init.logic init.category init.data.basic init.version
-import init.propext init.funext init.category.combinators init.function init.classical
+import init.core init.logic init.control init.data.basic init.version
+import init.propext init.funext init.function init.classical
 import init.util init.coe init.wf init.meta init.meta.well_founded_tactics init.data
 
 @[user_attribute]

library/init/lean/ir/ir.lean

@@ -4,7 +4,7 @@ Released under Apache 2.0 license as described in the file LICENSE.
 Authors: Leonardo de Moura
 -/
 prelude
-import init.data.rbmap init.data.int init.category.state init.category.except init.category.combinators
+import init.data.rbmap init.data.int init.control.state init.control.except init.control.combinators
 
 /-
 Missing

library/init/lean/parser/parser.lean

@@ -8,7 +8,7 @@ paper:
 https://www.microsoft.com/en-us/research/wp-content/uploads/2016/02/parsec-paper-letter.pdf
 -/
 prelude
-import init.data.to_string init.data.string.basic init.data.list.basic init.category.except
+import init.data.to_string init.data.string.basic init.data.list.basic init.control.except
 namespace lean
 namespace parser
 

library/init/meta/exceptional.lean

@@ -4,7 +4,7 @@ Released under Apache 2.0 license as described in the file LICENSE.
 Authors: Leonardo de Moura
 -/
 prelude
-import init.category.monad init.meta.format init.util
+import init.control.monad init.meta.format init.util
 /-
 Remark: we use a function that produces a format object as the exception information.
 Motivation: the formatting object may be big, and we may create it on demand.

library/init/meta/expr.lean

@@ -4,7 +4,7 @@ Released under Apache 2.0 license as described in the file LICENSE.
 Authors: Leonardo de Moura
 -/
 prelude
-import init.meta.level init.category.monad init.meta.rb_map
+import init.meta.level init.control.monad init.meta.rb_map
 universes u v
 open native
 structure pos :=

library/init/meta/interaction_monad.lean

@@ -5,7 +5,7 @@ Authors: Leonardo de Moura, Sebastian Ullrich
 -/
 prelude
 import init.function init.data.option.basic init.util
-import init.category.combinators init.category.monad init.category.alternative init.category.monad_fail
+import init.control.combinators init.control.monad init.control.alternative init.control.monad_fail
 import init.data.nat.div init.meta.exceptional init.meta.format init.meta.environment
 import init.meta.pexpr init.data.repr init.data.string.basic init.data.to_string
 

library/init/meta/interactive.lean

@@ -5,7 +5,7 @@ Authors: Leonardo de Moura
 -/
 prelude
 import init.meta.tactic init.meta.rewrite_tactic init.meta.simp_tactic
-import init.category.combinators
+import init.control.combinators
 import init.meta.interactive_base init.meta.derive init.meta.match_tactic
 import init.meta.congr_tactic
 

library/init/meta/rb_map.lean

@@ -4,7 +4,7 @@ Released under Apache 2.0 license as described in the file LICENSE.
 Authors: Leonardo de Moura, Jeremy Avigad
 -/
 prelude
-import init.data.ordering.basic init.function init.meta.name init.meta.format init.category.monad
+import init.data.ordering.basic init.function init.meta.name init.meta.format init.control.monad
 
 open format
 

library/init/meta/tactic.lean

@@ -5,7 +5,7 @@ Authors: Leonardo de Moura
 -/
 prelude
 import init.function init.data.option.basic init.util
-import init.category.combinators init.category.monad init.category.alternative init.category.monad_fail
+import init.control.combinators init.control.monad init.control.alternative init.control.monad_fail
 import init.data.nat.div init.meta.exceptional init.meta.format init.meta.environment
 import init.meta.pexpr init.data.repr init.data.string.basic init.meta.interaction_monad