Created the "lux/abstract" branch and moved some modules into it.

36 files changed, 64 insertions, 45 deletions

diff --git a/stdlib/source/lux/tool/compiler/analysis.lux b/stdlib/source/lux/tool/compiler/analysis.lux
index c2a6d0cb7..2f173007b 100644
--- a/stdlib/source/lux/tool/compiler/analysis.lux
+++ b/stdlib/source/lux/tool/compiler/analysis.lux
@@ -1,6 +1,6 @@
 (.module:
   [lux (#- nat int rev)
-   [control
+   [abstract
     [monad (#+ do)]]
    [data
     ["." product]
diff --git a/stdlib/source/lux/tool/compiler/meta/archive.lux b/stdlib/source/lux/tool/compiler/meta/archive.lux
index e9ecee8cd..46a6ce0a6 100644
--- a/stdlib/source/lux/tool/compiler/meta/archive.lux
+++ b/stdlib/source/lux/tool/compiler/meta/archive.lux
@@ -1,9 +1,10 @@
 (.module:
   [lux (#- Module)
-   [control
-    ["ex" exception (#+ exception:)]
+   [abstract
     ["." equivalence (#+ Equivalence)]
     ["." monad (#+ do)]]
+   [control
+    ["ex" exception (#+ exception:)]]
    [data
     ["." error (#+ Error)]
     ["." name]
diff --git a/stdlib/source/lux/tool/compiler/meta/archive/signature.lux b/stdlib/source/lux/tool/compiler/meta/archive/signature.lux
index b8b9c43b2..7c9f0cbe2 100644
--- a/stdlib/source/lux/tool/compiler/meta/archive/signature.lux
+++ b/stdlib/source/lux/tool/compiler/meta/archive/signature.lux
@@ -1,6 +1,6 @@
 (.module:
   [lux #*
-   [control
+   [abstract
     ["." equivalence (#+ Equivalence)]]
    [data
     ["." name]
diff --git a/stdlib/source/lux/tool/compiler/phase.lux b/stdlib/source/lux/tool/compiler/phase.lux
index 3ae66af16..09657c3cf 100644
--- a/stdlib/source/lux/tool/compiler/phase.lux
+++ b/stdlib/source/lux/tool/compiler/phase.lux
@@ -1,9 +1,10 @@
 (.module:
   [lux #*
+   [abstract
+    [monad (#+ do)]]
    [control
     ["." state]
-    ["ex" exception (#+ Exception exception:)]
-    [monad (#+ do)]]
+    ["ex" exception (#+ Exception exception:)]]
    [data
     ["." product]
     ["." error (#+ Error) ("#;." functor)]
diff --git a/stdlib/source/lux/tool/compiler/phase/extension.lux b/stdlib/source/lux/tool/compiler/phase/extension.lux
index 7ce75f6e5..87e7474d4 100644
--- a/stdlib/source/lux/tool/compiler/phase/extension.lux
+++ b/stdlib/source/lux/tool/compiler/phase/extension.lux
@@ -1,7 +1,8 @@
 (.module:
   [lux (#- Name)
+   [abstract
+    [monad (#+ do)]]
    [control
-    [monad (#+ do)]
     ["ex" exception (#+ exception:)]]
    [data
     ["." error (#+ Error)]
diff --git a/stdlib/source/lux/tool/compiler/phase/extension/bundle.lux b/stdlib/source/lux/tool/compiler/phase/extension/bundle.lux
index ad99db848..28015b956 100644
--- a/stdlib/source/lux/tool/compiler/phase/extension/bundle.lux
+++ b/stdlib/source/lux/tool/compiler/phase/extension/bundle.lux
@@ -1,6 +1,6 @@
 (.module:
   [lux #*
-   [control
+   [abstract
     [monad (#+ do)]]
    [data
     ["." text
diff --git a/stdlib/source/lux/tool/compiler/phase/generation.lux b/stdlib/source/lux/tool/compiler/phase/generation.lux
index f0609d666..3053752fe 100644
--- a/stdlib/source/lux/tool/compiler/phase/generation.lux
+++ b/stdlib/source/lux/tool/compiler/phase/generation.lux
@@ -1,7 +1,8 @@
 (.module:
   [lux (#- Module)
+   [abstract
+    [monad (#+ do)]]
    [control
-    [monad (#+ do)]
     ["." exception (#+ exception:)]]
    [data
     ["." product]
diff --git a/stdlib/source/lux/tool/compiler/phase/generation/extension.lux b/stdlib/source/lux/tool/compiler/phase/generation/extension.lux
index 681fd35f8..7c08e94cc 100644
--- a/stdlib/source/lux/tool/compiler/phase/generation/extension.lux
+++ b/stdlib/source/lux/tool/compiler/phase/generation/extension.lux
@@ -1,6 +1,6 @@
 (.module:
   [lux #*
-   [control
+   [abstract
     ["." monad (#+ do)]]
    [data
     [collection
diff --git a/stdlib/source/lux/tool/compiler/phase/generation/js.lux b/stdlib/source/lux/tool/compiler/phase/generation/js.lux
index 29c95ff43..37a8d1bc6 100644
--- a/stdlib/source/lux/tool/compiler/phase/generation/js.lux
+++ b/stdlib/source/lux/tool/compiler/phase/generation/js.lux
@@ -1,6 +1,6 @@
 (.module:
   [lux #*
-   [control
+   [abstract
     [monad (#+ do)]]]
   [/
    [runtime (#+ Phase)]
diff --git a/stdlib/source/lux/tool/compiler/phase/generation/js/case.lux b/stdlib/source/lux/tool/compiler/phase/generation/js/case.lux
index 4561e5e84..86c7197ec 100644
--- a/stdlib/source/lux/tool/compiler/phase/generation/js/case.lux
+++ b/stdlib/source/lux/tool/compiler/phase/generation/js/case.lux
@@ -1,7 +1,8 @@
 (.module:
   [lux (#- case let if)
+   [abstract
+    [monad (#+ do)]]
    [control
-    [monad (#+ do)]
     ["ex" exception (#+ exception:)]]
    [data
     ["." text
diff --git a/stdlib/source/lux/tool/compiler/phase/generation/js/extension/common.lux b/stdlib/source/lux/tool/compiler/phase/generation/js/extension/common.lux
index 2ee78f394..3cc75105f 100644
--- a/stdlib/source/lux/tool/compiler/phase/generation/js/extension/common.lux
+++ b/stdlib/source/lux/tool/compiler/phase/generation/js/extension/common.lux
@@ -1,6 +1,6 @@
 (.module:
   [lux #*
-   [control
+   [abstract
     ["." monad (#+ do)]]
    [data
     ["." product]
diff --git a/stdlib/source/lux/tool/compiler/phase/generation/js/extension/host.lux b/stdlib/source/lux/tool/compiler/phase/generation/js/extension/host.lux
index 70f581d69..f78daf215 100644
--- a/stdlib/source/lux/tool/compiler/phase/generation/js/extension/host.lux
+++ b/stdlib/source/lux/tool/compiler/phase/generation/js/extension/host.lux
@@ -1,6 +1,6 @@
 (.module:
   [lux #*
-   [control
+   [abstract
     ["." monad (#+ do)]]
    [data
     ["." product]
diff --git a/stdlib/source/lux/tool/compiler/phase/generation/js/function.lux b/stdlib/source/lux/tool/compiler/phase/generation/js/function.lux
index 10a53986f..4839c9978 100644
--- a/stdlib/source/lux/tool/compiler/phase/generation/js/function.lux
+++ b/stdlib/source/lux/tool/compiler/phase/generation/js/function.lux
@@ -1,7 +1,8 @@
 (.module:
   [lux (#- function)
+   [abstract
+    ["." monad (#+ do)]]
    [control
-    ["." monad (#+ do)]
     pipe]
    [data
     ["." product]
diff --git a/stdlib/source/lux/tool/compiler/phase/generation/js/loop.lux b/stdlib/source/lux/tool/compiler/phase/generation/js/loop.lux
index d905db9a2..9ab04cae6 100644
--- a/stdlib/source/lux/tool/compiler/phase/generation/js/loop.lux
+++ b/stdlib/source/lux/tool/compiler/phase/generation/js/loop.lux
@@ -1,6 +1,6 @@
 (.module:
   [lux (#- Scope)
-   [control
+   [abstract
     ["." monad (#+ do)]]
    [data
     ["." product]
diff --git a/stdlib/source/lux/tool/compiler/phase/generation/js/runtime.lux b/stdlib/source/lux/tool/compiler/phase/generation/js/runtime.lux
index 821633e50..97eee0025 100644
--- a/stdlib/source/lux/tool/compiler/phase/generation/js/runtime.lux
+++ b/stdlib/source/lux/tool/compiler/phase/generation/js/runtime.lux
@@ -1,8 +1,9 @@
 (.module:
   [lux #*
    ["." function]
+   [abstract
+    [monad (#+ do)]]
    [control
-    [monad (#+ do)]
     ["p" parser]]
    [data
     [number (#+ hex)
diff --git a/stdlib/source/lux/tool/compiler/phase/generation/js/structure.lux b/stdlib/source/lux/tool/compiler/phase/generation/js/structure.lux
index c6b413afb..a70376569 100644
--- a/stdlib/source/lux/tool/compiler/phase/generation/js/structure.lux
+++ b/stdlib/source/lux/tool/compiler/phase/generation/js/structure.lux
@@ -1,6 +1,6 @@
 (.module:
   [lux #*
-   [control
+   [abstract
     ["." monad (#+ do)]]
    [host
     ["_" js (#+ Expression)]]]
diff --git a/stdlib/source/lux/tool/compiler/phase/generation/python.lux b/stdlib/source/lux/tool/compiler/phase/generation/python.lux
index 29c95ff43..37a8d1bc6 100644
--- a/stdlib/source/lux/tool/compiler/phase/generation/python.lux
+++ b/stdlib/source/lux/tool/compiler/phase/generation/python.lux
@@ -1,6 +1,6 @@
 (.module:
   [lux #*
-   [control
+   [abstract
     [monad (#+ do)]]]
   [/
    [runtime (#+ Phase)]
diff --git a/stdlib/source/lux/tool/compiler/phase/generation/python/case.lux b/stdlib/source/lux/tool/compiler/phase/generation/python/case.lux
index b1f53a8b2..359cfdb3b 100644
--- a/stdlib/source/lux/tool/compiler/phase/generation/python/case.lux
+++ b/stdlib/source/lux/tool/compiler/phase/generation/python/case.lux
@@ -1,7 +1,8 @@
 (.module:
   [lux (#- case let if)
+   [abstract
+    [monad (#+ do)]]
    [control
-    [monad (#+ do)]
     ["ex" exception (#+ exception:)]]
    [data
     ["." text
diff --git a/stdlib/source/lux/tool/compiler/phase/generation/python/extension/common.lux b/stdlib/source/lux/tool/compiler/phase/generation/python/extension/common.lux
index 7ff70b393..46cd6d79e 100644
--- a/stdlib/source/lux/tool/compiler/phase/generation/python/extension/common.lux
+++ b/stdlib/source/lux/tool/compiler/phase/generation/python/extension/common.lux
@@ -1,7 +1,7 @@
 (.module:
   [lux #*
    ["." function]
-   [control
+   [abstract
     ["." monad (#+ do)]]
    [data
     ["." product]
diff --git a/stdlib/source/lux/tool/compiler/phase/generation/python/extension/host.lux b/stdlib/source/lux/tool/compiler/phase/generation/python/extension/host.lux
index 92887899b..242022c87 100644
--- a/stdlib/source/lux/tool/compiler/phase/generation/python/extension/host.lux
+++ b/stdlib/source/lux/tool/compiler/phase/generation/python/extension/host.lux
@@ -1,6 +1,6 @@
 (.module:
   [lux #*
-   [control
+   [abstract
     ["." monad (#+ do)]]
    [data
     ["." product]
diff --git a/stdlib/source/lux/tool/compiler/phase/generation/python/function.lux b/stdlib/source/lux/tool/compiler/phase/generation/python/function.lux
index 3ba95e0f3..a5f918dc1 100644
--- a/stdlib/source/lux/tool/compiler/phase/generation/python/function.lux
+++ b/stdlib/source/lux/tool/compiler/phase/generation/python/function.lux
@@ -1,7 +1,8 @@
 (.module:
   [lux (#- function)
+   [abstract
+    ["." monad (#+ do)]]
    [control
-    ["." monad (#+ do)]
     pipe]
    [data
     ["." product]
diff --git a/stdlib/source/lux/tool/compiler/phase/generation/python/loop.lux b/stdlib/source/lux/tool/compiler/phase/generation/python/loop.lux
index 7666319bf..12d83b756 100644
--- a/stdlib/source/lux/tool/compiler/phase/generation/python/loop.lux
+++ b/stdlib/source/lux/tool/compiler/phase/generation/python/loop.lux
@@ -1,6 +1,6 @@
 (.module:
   [lux (#- Scope)
-   [control
+   [abstract
     ["." monad (#+ do)]]
    [data
     ["." product]
diff --git a/stdlib/source/lux/tool/compiler/phase/generation/python/runtime.lux b/stdlib/source/lux/tool/compiler/phase/generation/python/runtime.lux
index 36184e21c..d10434000 100644
--- a/stdlib/source/lux/tool/compiler/phase/generation/python/runtime.lux
+++ b/stdlib/source/lux/tool/compiler/phase/generation/python/runtime.lux
@@ -1,8 +1,9 @@
 (.module:
   [lux (#- inc)
    ["." function]
+   [abstract
+    [monad (#+ do)]]
    [control
-    [monad (#+ do)]
     ["p" parser]]
    [data
     [number (#+ hex)
diff --git a/stdlib/source/lux/tool/compiler/phase/generation/python/structure.lux b/stdlib/source/lux/tool/compiler/phase/generation/python/structure.lux
index 6daf5e532..93a83883d 100644
--- a/stdlib/source/lux/tool/compiler/phase/generation/python/structure.lux
+++ b/stdlib/source/lux/tool/compiler/phase/generation/python/structure.lux
@@ -1,6 +1,6 @@
 (.module:
   [lux #*
-   [control
+   [abstract
     ["." monad (#+ do)]]
    [host
     ["_" python (#+ Expression)]]]
diff --git a/stdlib/source/lux/tool/compiler/phase/generation/scheme.lux b/stdlib/source/lux/tool/compiler/phase/generation/scheme.lux
index 5da2a016e..2ccf4f45a 100644
--- a/stdlib/source/lux/tool/compiler/phase/generation/scheme.lux
+++ b/stdlib/source/lux/tool/compiler/phase/generation/scheme.lux
@@ -1,6 +1,6 @@
 (.module:
   [lux #*
-   [control
+   [abstract
     [monad (#+ do)]]]
   [/
    [runtime (#+ Phase)]
diff --git a/stdlib/source/lux/tool/compiler/phase/generation/scheme/case.jvm.lux b/stdlib/source/lux/tool/compiler/phase/generation/scheme/case.jvm.lux
index 49733e6f3..d68abbdd7 100644
--- a/stdlib/source/lux/tool/compiler/phase/generation/scheme/case.jvm.lux
+++ b/stdlib/source/lux/tool/compiler/phase/generation/scheme/case.jvm.lux
@@ -1,7 +1,8 @@
 (.module:
   [lux (#- case let if)
+   [abstract
+    [monad (#+ do)]]
    [control
-    [monad (#+ do)]
     ["ex" exception (#+ exception:)]]
    [data
     ["." number]
@@ -97,9 +98,9 @@
 (def: (pm-catch handler)
   (-> Expression Computation)
   (_.lambda [(list @alt-error) #.None]
-       (_.if (|> @alt-error (_.eqv?/2 pm-error))
-         handler
-         (_.raise/1 @alt-error))))
+            (_.if (|> @alt-error (_.eqv?/2 pm-error))
+              handler
+              (_.raise/1 @alt-error))))
 
 (def: (pattern-matching' generate pathP)
   (-> Phase Path (Operation Expression))
diff --git a/stdlib/source/lux/tool/compiler/phase/generation/scheme/extension/common.jvm.lux b/stdlib/source/lux/tool/compiler/phase/generation/scheme/extension/common.jvm.lux
index 0de327e23..cb96a5718 100644
--- a/stdlib/source/lux/tool/compiler/phase/generation/scheme/extension/common.jvm.lux
+++ b/stdlib/source/lux/tool/compiler/phase/generation/scheme/extension/common.jvm.lux
@@ -1,7 +1,8 @@
 (.module:
   [lux #*
+   [abstract
+    ["." monad (#+ do)]]
    [control
-    ["." monad (#+ do)]
     ["ex" exception (#+ exception:)]]
    [data
     ["e" error]
diff --git a/stdlib/source/lux/tool/compiler/phase/generation/scheme/function.jvm.lux b/stdlib/source/lux/tool/compiler/phase/generation/scheme/function.jvm.lux
index 2cbb89825..28bfd36ba 100644
--- a/stdlib/source/lux/tool/compiler/phase/generation/scheme/function.jvm.lux
+++ b/stdlib/source/lux/tool/compiler/phase/generation/scheme/function.jvm.lux
@@ -1,7 +1,8 @@
 (.module:
   [lux (#- function)
+   [abstract
+    ["." monad (#+ do)]]
    [control
-    ["." monad (#+ do)]
     pipe]
    [data
     ["." product]
diff --git a/stdlib/source/lux/tool/compiler/phase/generation/scheme/loop.jvm.lux b/stdlib/source/lux/tool/compiler/phase/generation/scheme/loop.jvm.lux
index 7064c8301..6922806e2 100644
--- a/stdlib/source/lux/tool/compiler/phase/generation/scheme/loop.jvm.lux
+++ b/stdlib/source/lux/tool/compiler/phase/generation/scheme/loop.jvm.lux
@@ -1,6 +1,6 @@
 (.module:
   [lux (#- Scope)
-   [control
+   [abstract
     ["." monad (#+ do)]]
    [data
     ["." product]
diff --git a/stdlib/source/lux/tool/compiler/phase/generation/scheme/runtime.jvm.lux b/stdlib/source/lux/tool/compiler/phase/generation/scheme/runtime.jvm.lux
index d3c949df1..1e891c006 100644
--- a/stdlib/source/lux/tool/compiler/phase/generation/scheme/runtime.jvm.lux
+++ b/stdlib/source/lux/tool/compiler/phase/generation/scheme/runtime.jvm.lux
@@ -1,9 +1,10 @@
 (.module:
   [lux #*
    ["." function]
-   [control
-    ["p" parser ("#;." monad)]
+   [abstract
     [monad (#+ do)]]
+   [control
+    ["p" parser ("#;." monad)]]
    [data
     [number (#+ hex)]
     [text
diff --git a/stdlib/source/lux/tool/compiler/phase/generation/scheme/structure.jvm.lux b/stdlib/source/lux/tool/compiler/phase/generation/scheme/structure.jvm.lux
index 7419ad239..e44ab508b 100644
--- a/stdlib/source/lux/tool/compiler/phase/generation/scheme/structure.jvm.lux
+++ b/stdlib/source/lux/tool/compiler/phase/generation/scheme/structure.jvm.lux
@@ -1,6 +1,6 @@
 (.module:
   [lux #*
-   [control
+   [abstract
     ["." monad (#+ do)]]
    [host
     ["_" scheme (#+ Expression)]]]
diff --git a/stdlib/source/lux/tool/compiler/phase/synthesis/case.lux b/stdlib/source/lux/tool/compiler/phase/synthesis/case.lux
index 7da1a41c7..ea8615949 100644
--- a/stdlib/source/lux/tool/compiler/phase/synthesis/case.lux
+++ b/stdlib/source/lux/tool/compiler/phase/synthesis/case.lux
@@ -1,9 +1,10 @@
 (.module:
   [lux #*
-   [control
+   [abstract
     [equivalence (#+ Equivalence)]
-    [pipe (#+ when> new> case>)]
     ["." monad (#+ do)]]
+   [control
+    [pipe (#+ when> new> case>)]]
    [data
     ["." product]
     ["." bit ("#@." equivalence)]
diff --git a/stdlib/source/lux/tool/compiler/phase/synthesis/function.lux b/stdlib/source/lux/tool/compiler/phase/synthesis/function.lux
index a1bc743c3..8d1b71d90 100644
--- a/stdlib/source/lux/tool/compiler/phase/synthesis/function.lux
+++ b/stdlib/source/lux/tool/compiler/phase/synthesis/function.lux
@@ -1,7 +1,8 @@
 (.module:
   [lux #*
+   [abstract
+    ["." monad (#+ do)]]
    [control
-    ["." monad (#+ do)]
     ["ex" exception (#+ exception:)]]
    [data
     ["." maybe]
diff --git a/stdlib/source/lux/tool/compiler/phase/synthesis/loop.lux b/stdlib/source/lux/tool/compiler/phase/synthesis/loop.lux
index 54bec7b03..0ac6cc12b 100644
--- a/stdlib/source/lux/tool/compiler/phase/synthesis/loop.lux
+++ b/stdlib/source/lux/tool/compiler/phase/synthesis/loop.lux
@@ -1,7 +1,8 @@
 (.module:
   [lux (#- loop)
+   [abstract
+    ["." monad (#+ do)]]
    [control
-    ["." monad (#+ do)]
     ["p" parser]]
    [data
     ["." maybe ("#;." monad)]
diff --git a/stdlib/source/lux/tool/compiler/reference.lux b/stdlib/source/lux/tool/compiler/reference.lux
index 7022b2496..20d819ef7 100644
--- a/stdlib/source/lux/tool/compiler/reference.lux
+++ b/stdlib/source/lux/tool/compiler/reference.lux
@@ -1,8 +1,9 @@
 (.module:
   [lux #*
-   [control
+   [abstract
     [equivalence (#+ Equivalence)]
-    [hash (#+ Hash)]
+    [hash (#+ Hash)]]
+   [control
     pipe]
    [data
     [text
diff --git a/stdlib/source/lux/tool/compiler/synthesis.lux b/stdlib/source/lux/tool/compiler/synthesis.lux
index 39b62ac88..d12c8c3ea 100644
--- a/stdlib/source/lux/tool/compiler/synthesis.lux
+++ b/stdlib/source/lux/tool/compiler/synthesis.lux
@@ -1,8 +1,9 @@
 (.module:
   [lux (#- i64 Scope)
-   [control
+   [abstract
     [monad (#+ do)]
-    [equivalence (#+ Equivalence)]
+    [equivalence (#+ Equivalence)]]
+   [control
     ["ex" exception (#+ exception:)]]
    [data
     ["." bit ("#;." equivalence)]