- Relocated the "object" and "concatenative" modules.

4 files changed, 12 insertions, 11 deletions

diff --git a/stdlib/source/lux/paradigm/concatenative.lux b/stdlib/source/lux/control/concatenative.lux
index a0854ffcf..a0854ffcf 100644
--- a/stdlib/source/lux/paradigm/concatenative.lux
+++ b/stdlib/source/lux/control/concatenative.lux
diff --git a/stdlib/source/lux/paradigm/object.lux b/stdlib/source/lux/type/object.lux
index c7cdcb4d3..961be9b03 100644
--- a/stdlib/source/lux/paradigm/object.lux
+++ b/stdlib/source/lux/type/object.lux
@@ -234,11 +234,12 @@
 (do-template [<name> <category>]
   [(def: (<name> raw)
      (-> Text Text)
-     (format raw "//OOP:" <category>))]
+     (let [[module kind] (ident-for <category>)]
+       (format "{" kind "@" module "}" raw)))]
 
-  [signatureN "Signature"]
-  [stateN     "State"]
-  [structN    "Struct"]
+  [signatureN #;;Signature]
+  [stateN     #;;State]
+  [structN    #;;Struct]
   )
 
 (def: (getterN export interface g!parameters g!ext g!child ancestors)
diff --git a/stdlib/test/test/lux/paradigm/object.lux b/stdlib/test/test/lux/type/object.lux
index 215dcee77..c85ff5770 100644
--- a/stdlib/test/test/lux/paradigm/object.lux
+++ b/stdlib/test/test/lux/type/object.lux
@@ -1,7 +1,7 @@
 (;module:
   lux
   (lux (data (coll [list]))
-       (paradigm object)))
+       (type object)))
 
 ## No parameters
 (interface: Counter
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]