Moved the text lexers under "lux/control/parser/".

5 files changed, 20 insertions, 11 deletions

diff --git a/stdlib/source/test/lux/control.lux b/stdlib/source/test/lux/control.lux
index 9d95dc969..bacb4cb24 100644
--- a/stdlib/source/test/lux/control.lux
+++ b/stdlib/source/test/lux/control.lux
@@ -19,6 +19,8 @@
     ["#." frp]
     ["#." actor]
     ["#." stm]]
+   ["#." parser #_
+    ["#/." text]]
    [security
     ["#." privacy]
     ["#." integrity]]
@@ -34,6 +36,12 @@
       /stm.test
       ))
 
+(def: parser
+  Test
+  ($_ _.and
+      /parser/text.test
+      ))
+
 (def: security
   Test
   ($_ _.and
@@ -57,5 +65,6 @@
       /thread.test
       /writer.test
       ..concurrency
+      ..parser
       ..security
       ))
diff --git a/stdlib/source/test/lux/data/text/lexer.lux b/stdlib/source/test/lux/control/parser/text.lux
index 3693b0fd0..3693b0fd0 100644
--- a/stdlib/source/test/lux/data/text/lexer.lux
+++ b/stdlib/source/test/lux/control/parser/text.lux
diff --git a/stdlib/source/test/lux/data.lux b/stdlib/source/test/lux/data.lux
index 92680f03a..a29358b6b 100644
--- a/stdlib/source/test/lux/data.lux
+++ b/stdlib/source/test/lux/data.lux
@@ -20,7 +20,6 @@
     ["#." ratio]
     ["#." complex]]
    ["#." text
-    ["#/." lexer]
     ["#/." regex]]
    [format
     ["#." json]
@@ -42,7 +41,6 @@
 (def: text
   ($_ _.and
       /text.test
-      /text/lexer.test
       /text/regex.test
       ))
 
diff --git a/stdlib/source/test/lux/data/text/regex.lux b/stdlib/source/test/lux/data/text/regex.lux
index a683c446f..eeec23d2f 100644
--- a/stdlib/source/test/lux/data/text/regex.lux
+++ b/stdlib/source/test/lux/data/text/regex.lux
@@ -5,12 +5,12 @@
    [abstract/monad (#+ do)]
    [control
     pipe
-    ["p" parser]]
+    ["p" parser
+     ["<.>" text (#+ Lexer)]]]
    [data
     [number (#+ hex)]
     ["." error]
-    ["." text ("#@." equivalence)
-     ["." lexer (#+ Lexer)]]]
+    ["." text ("#@." equivalence)]]
    [math
     ["r" random]]
    ["." macro
@@ -20,7 +20,7 @@
 
 (def: (should-pass regex input)
   (-> (Lexer Text) Text Bit)
-  (|> (lexer.run input regex)
+  (|> (<text>.run input regex)
       (case> (#error.Success parsed)
              (text@= parsed input)
 
@@ -29,7 +29,7 @@
 
 (def: (text-should-pass test regex input)
   (-> Text (Lexer Text) Text Bit)
-  (|> (lexer.run input regex)
+  (|> (<text>.run input regex)
       (case> (#error.Success parsed)
              (text@= test parsed)
 
@@ -38,7 +38,7 @@
 
 (def: (should-fail regex input)
   (All [a] (-> (Lexer a) Text Bit))
-  (|> (lexer.run input regex)
+  (|> (<text>.run input regex)
       (case> (#error.Failure _)
              true
 
@@ -47,7 +47,7 @@
 
 (syntax: (should-check pattern regex input)
   (macro.with-gensyms [g!message g!_]
-    (wrap (list (` (|> (lexer.run (~ input) (~ regex))
+    (wrap (list (` (|> (<text>.run (~ input) (~ regex))
                        (case> (^ (#error.Success (~ pattern)))
                               true
 
diff --git a/stdlib/source/test/lux/tool/compiler/default/syntax.lux b/stdlib/source/test/lux/tool/compiler/default/syntax.lux
index 9f36c551f..a0005cc64 100644
--- a/stdlib/source/test/lux/tool/compiler/default/syntax.lux
+++ b/stdlib/source/test/lux/tool/compiler/default/syntax.lux
@@ -6,10 +6,12 @@
     ["." name]]
    ["r" math/random (#+ Random) ("#@." monad)]
    ["_" test (#+ Test)]
+   [control
+    [parser
+     ["l" text]]]
    [data
     ["." error]
-    ["." text
-     ["l" lexer]]
+    ["." text]
     [collection
      ["." list]
      ["." dictionary (#+ Dictionary)]]]