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

6 files changed, 19 insertions, 16 deletions

diff --git a/stdlib/source/lux/data/text.lux b/stdlib/source/lux/data/text.lux
index 384d4e860..bf40c3ef7 100644
--- a/stdlib/source/lux/data/text.lux
+++ b/stdlib/source/lux/data/text.lux
@@ -1,6 +1,6 @@
 (.module:
   [lux #*
-   [control
+   [abstract
     [monoid (#+ Monoid)]
     [equivalence (#+ Equivalence)]
     [order (#+ Order)]
@@ -25,18 +25,18 @@
   (-> Char Text)
   (|>> (:coerce Int) "lux int char"))
 
-(template [<name> <code>]
+(template [<code> <name>]
   [(def: #export <name> (from-code <code>))]
 
-  [null 0]
-  [alarm 7]
-  [back-space 8]
-  [tab 9]
-  [new-line 10]
-  [vertical-tab 11]
-  [form-feed 12]
-  [carriage-return 13]
-  [double-quote 34]
+  [00 null]
+  [07 alarm]
+  [08 back-space]
+  [09 tab]
+  [10 new-line]
+  [11 vertical-tab]
+  [12 form-feed]
+  [13 carriage-return]
+  [34 double-quote]
   )
 
 (def: #export (size x)
diff --git a/stdlib/source/lux/data/text/encoding.lux b/stdlib/source/lux/data/text/encoding.lux
index 8f59bd530..b4372471c 100644
--- a/stdlib/source/lux/data/text/encoding.lux
+++ b/stdlib/source/lux/data/text/encoding.lux
@@ -1,6 +1,6 @@
 (.module:
   [lux #*
-   [control
+   [abstract
     [codec (#+ Codec)]]
    [data
     ["." error (#+ Error)]]
diff --git a/stdlib/source/lux/data/text/format.lux b/stdlib/source/lux/data/text/format.lux
index 0becf8633..a204e567b 100644
--- a/stdlib/source/lux/data/text/format.lux
+++ b/stdlib/source/lux/data/text/format.lux
@@ -1,7 +1,8 @@
 (.module:
   [lux #*
+   [abstract
+    [monad (#+ do)]]
    [control
-    [monad (#+ do)]
     ["p" parser]]
    [data
     ["." bit]
diff --git a/stdlib/source/lux/data/text/lexer.lux b/stdlib/source/lux/data/text/lexer.lux
index e5f19edf6..531d2ae64 100644
--- a/stdlib/source/lux/data/text/lexer.lux
+++ b/stdlib/source/lux/data/text/lexer.lux
@@ -1,7 +1,8 @@
 (.module:
   [lux (#- or and not)
+   [abstract
+    [monad (#+ do Monad)]]
    [control
-    [monad (#+ do Monad)]
     ["p" parser]
     ["ex" exception (#+ exception:)]]
    [data
diff --git a/stdlib/source/lux/data/text/regex.lux b/stdlib/source/lux/data/text/regex.lux
index b94dbb73a..5e867b9b6 100644
--- a/stdlib/source/lux/data/text/regex.lux
+++ b/stdlib/source/lux/data/text/regex.lux
@@ -1,7 +1,8 @@
 (.module:
   [lux #*
+   [abstract
+    monad]
    [control
-    monad
     ["p" parser ("#@." monad)]]
    [data
     ["." product]
diff --git a/stdlib/source/lux/data/text/unicode.lux b/stdlib/source/lux/data/text/unicode.lux
index 11a98b358..a6fd13ebc 100644
--- a/stdlib/source/lux/data/text/unicode.lux
+++ b/stdlib/source/lux/data/text/unicode.lux
@@ -1,6 +1,6 @@
 (.module:
   [lux #*
-   [control
+   [abstract
     ["." interval (#+ Interval)]
     [monoid (#+ Monoid)]]
    [data