- Re-organized "lux/data/coll/tree/*" modules.

2 files changed, 16 insertions, 16 deletions

diff --git a/stdlib/source/lux/data/coll/tree/parser.lux b/stdlib/source/lux/data/coll/tree/rose/parser.lux
index e5881d097..bee1e07f9 100644
--- a/stdlib/source/lux/data/coll/tree/parser.lux
+++ b/stdlib/source/lux/data/coll/tree/rose/parser.lux
@@ -3,14 +3,14 @@
   (lux (control ["p" parser]
                 ["ex" exception #+ exception:])
        (data ["E" error]))
-  (// ["T" rose]
-      ["Z" zipper]))
+  [// #+ Tree]
+  (// [zipper #+ Zipper]))
 
 (type: #export (Parser t a)
-  (p.Parser (Z.Zipper t) a))
+  (p.Parser (Zipper t) a))
 
 (def: #export (run-zipper zipper parser)
-  (All [t a] (-> (Z.Zipper t) (Parser t a) (E.Error a)))
+  (All [t a] (-> (Zipper t) (Parser t a) (E.Error a)))
   (case (p.run zipper parser)
     (#E.Success [zipper output])
     (#E.Success output)
@@ -19,13 +19,13 @@
     (#E.Error error)))
 
 (def: #export (run tree parser)
-  (All [t a] (-> (T.Tree t) (Parser t a) (E.Error a)))
-  (run-zipper (Z.zip tree) parser))
+  (All [t a] (-> (Tree t) (Parser t a) (E.Error a)))
+  (run-zipper (zipper.zip tree) parser))
 
 (def: #export value
   (All [t] (Parser t t))
   (function (_ zipper)
-    (#E.Success [zipper (Z.value zipper)])))
+    (#E.Success [zipper (zipper.value zipper)])))
 
 (exception: #export Cannot-Move-Further)
 
@@ -38,13 +38,13 @@
            (ex.throw Cannot-Move-Further [])
            (#E.Success [next []])))))]
 
-  [up        Z.up]
-  [down      Z.down]
-  [left      Z.left]
-  [right     Z.right]
-  [root      Z.root]
-  [rightmost Z.rightmost]
-  [leftmost  Z.leftmost]
-  [next      Z.next]
-  [prev      Z.prev]
+  [up        zipper.up]
+  [down      zipper.down]
+  [left      zipper.left]
+  [right     zipper.right]
+  [root      zipper.root]
+  [rightmost zipper.rightmost]
+  [leftmost  zipper.leftmost]
+  [next      zipper.next]
+  [prev      zipper.prev]
   )
diff --git a/stdlib/source/lux/data/coll/tree/zipper.lux b/stdlib/source/lux/data/coll/tree/rose/zipper.lux
index 845dd4c4c..845dd4c4c 100644
--- a/stdlib/source/lux/data/coll/tree/zipper.lux
+++ b/stdlib/source/lux/data/coll/tree/rose/zipper.lux