Extensible import syntax: Part 1

8 files changed, 47 insertions, 47 deletions

diff --git a/stdlib/source/specification/compositor/analysis/type.lux b/stdlib/source/specification/compositor/analysis/type.lux
index 2cbc93cea..0f1be3da9 100644
--- a/stdlib/source/specification/compositor/analysis/type.lux
+++ b/stdlib/source/specification/compositor/analysis/type.lux
@@ -1,21 +1,21 @@
 (.using
  [lux "*"
-  ["_" test {"+" Test}]
+  ["_" test (.only Test)]
   [abstract
-   [monad {"+" do}]]
+   [monad (.only do)]]
   [control
    ["[0]" pipe]
    ["[0]" io]
    ["[0]" try]]
   [math
-   ["r" random {"+" Random}]]
+   ["r" random (.only Random)]]
   [macro
    ["[0]" code]]
   [tool
    [compiler
-    [analysis {"+" State+}]
+    [analysis (.only State+)]
     ["[0]" phase
-     [macro {"+" Expander}]
+     [macro (.only Expander)]
      ["[0]" analysis
       ["[1]/[0]" scope]
       ["[1]/[0]" type]]]]]])
diff --git a/stdlib/source/specification/compositor/common.lux b/stdlib/source/specification/compositor/common.lux
index 58546822c..483468015 100644
--- a/stdlib/source/specification/compositor/common.lux
+++ b/stdlib/source/specification/compositor/common.lux
@@ -1,23 +1,23 @@
 (.using
  [lux "*"
   [abstract
-   [monad {"+" do}]]
+   [monad (.only do)]]
   [control
-   ["[0]" io {"+" IO}]
-   ["[0]" try {"+" Try}]]
+   ["[0]" io (.only IO)]
+   ["[0]" try (.only Try)]]
   [tool
    [compiler
     ["[0]" reference]
     ["[0]" analysis]
-    ["[0]" synthesis {"+" Synthesis}]
+    ["[0]" synthesis (.only Synthesis)]
     ["[0]" directive]
     ["[0]" phase
-     ["[0]" macro {"+" Expander}]
-     ["[0]" generation {"+" Operation}]
-     [extension {"+" Extender}
+     ["[0]" macro (.only Expander)]
+     ["[0]" generation (.only Operation)]
+     [extension (.only Extender)
       ["[0]" bundle]]]
     [default
-     ["[0]" platform {"+" Platform}]]]]])
+     ["[0]" platform (.only Platform)]]]]])
 
 (type: .public Runner
   (-> Text Synthesis (Try Any)))
diff --git a/stdlib/source/specification/compositor/generation/case.lux b/stdlib/source/specification/compositor/generation/case.lux
index 1e5502e17..bfc499232 100644
--- a/stdlib/source/specification/compositor/generation/case.lux
+++ b/stdlib/source/specification/compositor/generation/case.lux
@@ -1,32 +1,32 @@
 (.using
  [lux {"-" case}
-  ["_" test {"+" Test}]
+  ["_" test (.only Test)]
   [abstract
-   [monad {"+" do}]]
+   [monad (.only do)]]
   [control
    ["[0]" pipe]
-   ["[0]" try {"+" Try}]]
+   ["[0]" try (.only Try)]]
   [data
    ["[0]" text ("[1]#[0]" equivalence)
-    ["%" format {"+" format}]]
+    ["%" format (.only format)]]
    [number
     ["n" nat]
     ["f" frac]]
    [collection
     ["[0]" list ("[1]#[0]" mix)]]]
   [math
-   ["r" random {"+" Random}]]
+   ["r" random (.only Random)]]
   [tool
    [compiler
     ["[0]" reference]
     ["[0]" analysis]
-    ["[0]" synthesis {"+" Path Synthesis}]
+    ["[0]" synthesis (.only Path Synthesis)]
     ["[0]" phase
      ["[1]/[0]" synthesis
       ["[0]" case]]
      ["[0]" extension/synthesis]]]]]
  [///
-  [common {"+" Runner}]])
+  [common (.only Runner)]])
 
 (def: limit Nat 10)
 
diff --git a/stdlib/source/specification/compositor/generation/common.lux b/stdlib/source/specification/compositor/generation/common.lux
index e93a46c29..b20c2e646 100644
--- a/stdlib/source/specification/compositor/generation/common.lux
+++ b/stdlib/source/specification/compositor/generation/common.lux
@@ -1,11 +1,11 @@
 (.using
  [lux {"-" i64}
-  ["_" test {"+" Test}]
+  ["_" test (.only Test)]
   [abstract
-   [monad {"+" do}]]
+   [monad (.only do)]]
   [control
    ["[0]" pipe]
-   ["[0]" try {"+" Try}]]
+   ["[0]" try (.only Try)]]
   [data
    ["[0]" bit ("[1]#[0]" equivalence)]
    [number
@@ -14,13 +14,13 @@
     ["i" int]
     ["f" frac]]
    ["[0]" text ("[1]#[0]" equivalence)
-    ["%" format {"+" format}]]
+    ["%" format (.only format)]]
    [collection
     ["[0]" list]]]
   [macro
    ["^" pattern]]
   [math
-   ["r" random {"+" Random}]]
+   ["r" random (.only Random)]]
   [tool
    [compiler
     ["[0]" reference]
@@ -28,7 +28,7 @@
  ["[0]" // "_"
   ["[1][0]" case]
   [//
-   [common {"+" Runner}]]])
+   [common (.only Runner)]]])
 
 (def: safe
   (-> Text Text)
diff --git a/stdlib/source/specification/compositor/generation/function.lux b/stdlib/source/specification/compositor/generation/function.lux
index 33db49436..b49305c50 100644
--- a/stdlib/source/specification/compositor/generation/function.lux
+++ b/stdlib/source/specification/compositor/generation/function.lux
@@ -1,8 +1,8 @@
 (.using
  [lux {"-" function}
-  ["_" test {"+" Test}]
+  ["_" test (.only Test)]
   [abstract
-   [monad {"+" do}]
+   [monad (.only do)]
    ["[0]" enum]]
   [control
    ["[0]" maybe]]
@@ -12,16 +12,16 @@
    [collection
     ["[0]" list ("[1]#[0]" functor)]]]
   [math
-   ["r" random {"+" Random} ("[1]#[0]" monad)]]
+   ["r" random (.only Random) ("[1]#[0]" monad)]]
   [tool
    [compiler
-    [analysis {"+" Arity}]
-    ["[0]" reference {"+" Register}]
-    ["[0]" synthesis {"+" Synthesis}]]]]
+    [analysis (.only Arity)]
+    ["[0]" reference (.only Register)]
+    ["[0]" synthesis (.only Synthesis)]]]]
  ["[0]" // "_"
   ["[1][0]" case]
   [//
-   [common {"+" Runner}]]])
+   [common (.only Runner)]]])
 
 (def: max_arity
   Arity
diff --git a/stdlib/source/specification/compositor/generation/primitive.lux b/stdlib/source/specification/compositor/generation/primitive.lux
index d79b226c3..6e61088c4 100644
--- a/stdlib/source/specification/compositor/generation/primitive.lux
+++ b/stdlib/source/specification/compositor/generation/primitive.lux
@@ -1,8 +1,8 @@
 (.using
  [lux "*"
-  ["_" test {"+" Test}]
+  ["_" test (.only Test)]
   [abstract
-   [monad {"+" do}]]
+   [monad (.only do)]]
   [control
    ["[0]" pipe]
    ["[0]" try]]
@@ -11,14 +11,14 @@
    [number
     ["f" frac]]
    ["[0]" text ("[1]#[0]" equivalence)
-    ["%" format {"+" format}]]]
+    ["%" format (.only format)]]]
   [math
    ["r" random]]
   [tool
    [compiler
     ["[0]" synthesis]]]]
  [///
-  [common {"+" Runner}]])
+  [common (.only Runner)]])
 
 (def: (f/=' reference subject)
   (-> Frac Frac Bit)
diff --git a/stdlib/source/specification/compositor/generation/reference.lux b/stdlib/source/specification/compositor/generation/reference.lux
index f0893573f..56bb78a2f 100644
--- a/stdlib/source/specification/compositor/generation/reference.lux
+++ b/stdlib/source/specification/compositor/generation/reference.lux
@@ -1,8 +1,8 @@
 (.using
  [lux {"-" symbol}
-  ["_" test {"+" Test}]
+  ["_" test (.only Test)]
   [abstract
-   [monad {"+" do}]]
+   [monad (.only do)]]
   [control
    ["[0]" pipe]
    ["[0]" try]]
@@ -15,9 +15,9 @@
     ["[0]" reference]
     ["[0]" synthesis]]]
   [math
-   ["r" random {"+" Random}]]]
+   ["r" random (.only Random)]]]
  [///
-  [common {"+" Runner Definer}]])
+  [common (.only Runner Definer)]])
 
 (def: symbol
   (Random Symbol)
diff --git a/stdlib/source/specification/compositor/generation/structure.lux b/stdlib/source/specification/compositor/generation/structure.lux
index 3080f6abd..79e6374fb 100644
--- a/stdlib/source/specification/compositor/generation/structure.lux
+++ b/stdlib/source/specification/compositor/generation/structure.lux
@@ -1,8 +1,8 @@
 (.using
  [lux "*"
-  ["_" test {"+" Test}]
+  ["_" test (.only Test)]
   [abstract
-   [monad {"+" do}]]
+   [monad (.only do)]]
   [control
    ["[0]" pipe]
    ["[0]" maybe]
@@ -12,19 +12,19 @@
     ["n" nat]
     ["i" int]]
    ["[0]" text ("[1]#[0]" equivalence)
-    ["%" format {"+" format}]]
+    ["%" format (.only format)]]
    [collection
-    ["[0]" array {"+" Array}]
+    ["[0]" array (.only Array)]
     ["[0]" list ("[1]#[0]" functor)]]]
   [math
    ["r" random]]
-  ["[0]" ffi {"+" import:}]
+  ["[0]" ffi (.only import:)]
   [tool
    [compiler
     ["[0]" analysis]
     ["[0]" synthesis]]]]
  [///
-  [common {"+" Runner}]])
+  [common (.only Runner)]])
 
 (import: java/lang/Integer)