Extensible import syntax: Part 1

3 files changed, 16 insertions, 16 deletions

diff --git a/stdlib/source/poly/lux/abstract/equivalence.lux b/stdlib/source/poly/lux/abstract/equivalence.lux
index 1e95ec091..39f92e769 100644
--- a/stdlib/source/poly/lux/abstract/equivalence.lux
+++ b/stdlib/source/poly/lux/abstract/equivalence.lux
@@ -2,7 +2,7 @@
  [library
   [lux "*"
    [abstract
-    [monad {"+" Monad do}]]
+    [monad (.only Monad do)]]
    [control
     ["[0]" maybe]
     ["<>" parser
@@ -11,17 +11,17 @@
     ["[0]" product]
     ["[0]" bit]
     ["[0]" text ("[1]#[0]" monoid)
-     ["%" format {"+" format}]]
+     ["%" format (.only format)]]
     [collection
      ["[0]" list ("[1]#[0]" monad)]
      ["[0]" sequence]
      ["[0]" array]
      ["[0]" queue]
      ["[0]" set]
-     ["[0]" dictionary {"+" Dictionary}]
+     ["[0]" dictionary (.only Dictionary)]
      ["[0]" tree]]]
    [macro
-    [syntax {"+" syntax:}]
+    [syntax (.only syntax:)]
     ["[0]" code]]
    [math
     [number
@@ -36,7 +36,7 @@
     ["[0]" day]
     ["[0]" month]]
    ["[0]" type
-    ["[0]" poly {"+" poly:}]
+    ["[0]" poly (.only poly:)]
     ["[0]" unit]]]]
  [\\library
   ["[0]" /]])
diff --git a/stdlib/source/poly/lux/abstract/functor.lux b/stdlib/source/poly/lux/abstract/functor.lux
index 97c900493..1251bce88 100644
--- a/stdlib/source/poly/lux/abstract/functor.lux
+++ b/stdlib/source/poly/lux/abstract/functor.lux
@@ -2,25 +2,25 @@
  [library
   [lux "*"
    [abstract
-    [monad {"+" Monad do}]]
+    [monad (.only Monad do)]]
    [control
     ["p" parser
      ["<[0]>" type]
-     ["s" code {"+" Parser}]]]
+     ["s" code (.only Parser)]]]
    [data
     ["[0]" product]
     ["[0]" text
-     ["%" format {"+" format}]]
+     ["%" format (.only format)]]
     [collection
      ["[0]" list ("[1]#[0]" monad monoid)]]]
    [macro
-    [syntax {"+" syntax:}]
+    [syntax (.only syntax:)]
     ["[0]" code]]
    [math
     [number
      ["n" nat]]]
    ["[0]" type
-    ["[0]" poly {"+" poly:}]]]]
+    ["[0]" poly (.only poly:)]]]]
  [\\library
   ["[0]" /]])
 
diff --git a/stdlib/source/poly/lux/data/format/json.lux b/stdlib/source/poly/lux/data/format/json.lux
index 9e4a6a369..1c35ac334 100644
--- a/stdlib/source/poly/lux/data/format/json.lux
+++ b/stdlib/source/poly/lux/data/format/json.lux
@@ -3,7 +3,7 @@
   [lux "*"
    ["[0]" debug]
    [abstract
-    [monad {"+" do}]
+    [monad (.only do)]
     ["[0]" codec]]
    [control
     ["[0]" try]
@@ -13,13 +13,13 @@
      ["<[0]>" code]]]
    [data
     ["[0]" text
-     ["%" format {"+" format}]]
+     ["%" format (.only format)]]
     [collection
      ["[0]" list ("[1]#[0]" monad)]
-     ["[0]" sequence {"+" sequence}]
+     ["[0]" sequence (.only sequence)]
      ["[0]" dictionary]]]
    [macro
-    [syntax {"+" syntax:}]
+    [syntax (.only syntax:)]
     ["[0]" code]]
    [math
     [number
@@ -35,9 +35,9 @@
     ["[0]" month]]
    ["[0]" type
     ["[0]" unit]
-    ["[0]" poly {"+" poly:}]]]]
+    ["[0]" poly (.only poly:)]]]]
  [\\library
-  ["[0]" / {"+" JSON}]])
+  ["[0]" / (.only JSON)]])
 
 (def: tag
   (-> Nat Frac)