From 2c1a4d14de8f968ea0530ad471a1999488983c9d Mon Sep 17 00:00:00 2001
From: Eduardo Julian
Date: Sun, 23 Jul 2017 15:13:36 -0400
Subject: - Relocated the "object" and "concatenative" modules.

---
 stdlib/test/test/lux/paradigm/object.lux | 83 --------------------------------
 stdlib/test/test/lux/type/object.lux     | 83 ++++++++++++++++++++++++++++++++
 stdlib/test/tests.lux                    | 12 ++---
 3 files changed, 89 insertions(+), 89 deletions(-)
 delete mode 100644 stdlib/test/test/lux/paradigm/object.lux
 create mode 100644 stdlib/test/test/lux/type/object.lux

(limited to 'stdlib/test')

diff --git a/stdlib/test/test/lux/paradigm/object.lux b/stdlib/test/test/lux/paradigm/object.lux
deleted file mode 100644
index 215dcee77..000000000
--- a/stdlib/test/test/lux/paradigm/object.lux
+++ /dev/null
@@ -1,83 +0,0 @@
-(;module:
-  lux
-  (lux (data (coll [list]))
-       (paradigm object)))
-
-## No parameters
-(interface: Counter
-  (inc [] @)
-  (read [] Nat))
-
-(class: NatC Counter
-  Nat
-
-  (def: inc
-    (update@Counter n.inc))
-  
-  (def: read
-    get@Counter))
-
-(interface: Resettable-Counter
-  #super Counter
-  (reset [] @))
-
-(class: NatRC Resettable-Counter
-  #super NatC
-  Unit
-
-  (def: reset
-    (set@Counter +0)))
-
-## With parameters
-(interface: (Collection a)
-  (add [a] @)
-  (size [] Nat))
-
-(class: (ListC a) (Collection a)
-  (List a)
-
-  (def: (add elem)
-    (update@Collection (|>. (#;Cons elem))))
-
-  (def: size
-    (|>. get@Collection list;size)))
-
-(interface: (Iterable a)
-  #super (Collection a)
-  (enumerate [] (List a)))
-
-(class: (ListI a) (Iterable a)
-  #super (ListC a)
-  Unit
-
-  (def: enumerate
-    get@Collection))
-
-## Polymorphism
-(def: (poly0 counter)
-  (-> Counter Nat)
-  (read counter))
-
-(def: poly0-0 Nat (poly0 (new@NatC +0)))
-(def: poly0-1 Nat (poly0 (new@NatRC +0 [])))
-
-(def: (poly1 counter)
-  (-> Resettable-Counter Nat)
-  (n.+ (read counter)
-       (read (reset counter))))
-
-(def: poly1-0 Nat (poly1 (new@NatRC +0 [])))
-
-(def: (poly2 counter)
-  (-> NatC Nat)
-  (read counter))
-
-(def: poly2-0 Nat (poly2 (new@NatC +0)))
-(def: poly2-1 Nat (poly2 (new@NatRC +0 [])))
-
-(def: (poly3 counter)
-  (-> NatRC Nat)
-  (n.+ (read counter)
-       (read (reset counter))))
-
-(def: poly3-0 Nat (poly3 (new@NatRC +0 [])))
diff --git a/stdlib/test/test/lux/type/object.lux b/stdlib/test/test/lux/type/object.lux
new file mode 100644
index 000000000..c85ff5770
--- /dev/null
+++ b/stdlib/test/test/lux/type/object.lux
@@ -0,0 +1,83 @@
+(;module:
+  lux
+  (lux (data (coll [list]))
+       (type object)))
+
+## No parameters
+(interface: Counter
+  (inc [] @)
+  (read [] Nat))
+
+(class: NatC Counter
+  Nat
+
+  (def: inc
+    (update@Counter n.inc))
+  
+  (def: read
+    get@Counter))
+
+(interface: Resettable-Counter
+  #super Counter
+  (reset [] @))
+
+(class: NatRC Resettable-Counter
+  #super NatC
+  Unit
+
+  (def: reset
+    (set@Counter +0)))
+
+## With parameters
+(interface: (Collection a)
+  (add [a] @)
+  (size [] Nat))
+
+(class: (ListC a) (Collection a)
+  (List a)
+
+  (def: (add elem)
+    (update@Collection (|>. (#;Cons elem))))
+
+  (def: size
+    (|>. get@Collection list;size)))
+
+(interface: (Iterable a)
+  #super (Collection a)
+  (enumerate [] (List a)))
+
+(class: (ListI a) (Iterable a)
+  #super (ListC a)
+  Unit
+
+  (def: enumerate
+    get@Collection))
+
+## Polymorphism
+(def: (poly0 counter)
+  (-> Counter Nat)
+  (read counter))
+
+(def: poly0-0 Nat (poly0 (new@NatC +0)))
+(def: poly0-1 Nat (poly0 (new@NatRC +0 [])))
+
+(def: (poly1 counter)
+  (-> Resettable-Counter Nat)
+  (n.+ (read counter)
+       (read (reset counter))))
+
+(def: poly1-0 Nat (poly1 (new@NatRC +0 [])))
+
+(def: (poly2 counter)
+  (-> NatC Nat)
+  (read counter))
+
+(def: poly2-0 Nat (poly2 (new@NatC +0)))
+(def: poly2-1 Nat (poly2 (new@NatRC +0 [])))
+
+(def: (poly3 counter)
+  (-> NatRC Nat)
+  (n.+ (read counter)
+       (read (reset counter))))
+
+(def: poly3-0 Nat (poly3 (new@NatRC +0 [])))
diff --git a/stdlib/test/tests.lux b/stdlib/test/tests.lux
index ba0da53f8..7c8258bc6 100644
--- a/stdlib/test/tests.lux
+++ b/stdlib/test/tests.lux
@@ -5,7 +5,7 @@
        (concurrency [promise])
        [cli #+ program:]
        [test])
-  (test lux
+  (test ["_;" lux]
         (lux ["_;" cli]
              ["_;" host]
              ["_;" io]
@@ -65,16 +65,16 @@
                           ["poly_;" functor]))
              ["_;" type]
              (type ["_;" check]
-                   ["_;" auto])
-             (paradigm ["_;" object])
+                   ["_;" auto]
+                   ["_;" object])
              ))
-  (lux (control [contract])
+  (lux (control [contract]
+                ["_;" concatenative])
        (data [env]
              [trace]
              [store])
        [macro]
-       (math [random])
-       (paradigm ["_;" concatenative]))
+       (math [random]))
   )
 
 ## [Program]
-- 
cgit v1.2.3