Extensible import syntax: Part 1

20 files changed, 92 insertions, 92 deletions

diff --git a/licentia/source/program/licentia.lux b/licentia/source/program/licentia.lux
index 7576f739a..2a5da043f 100644
--- a/licentia/source/program/licentia.lux
+++ b/licentia/source/program/licentia.lux
@@ -14,16 +14,16 @@
 (.using
  [library
   [lux "*"
-   [ffi {"+" import:}]
-   [program {"+" program:}]
+   [ffi (.only import:)]
+   [program (.only program:)]
    ["[0]" debug]
    [abstract
-    [monad {"+" do}]]
+    [monad (.only do)]]
    [control
-    [remember {"+" to_do}]
-    ["[0]" io {"+" IO} ("[1]#[0]" monad)]
+    [remember (.only to_do)]
+    ["[0]" io (.only IO) ("[1]#[0]" monad)]
     ["[0]" maybe]
-    ["[0]" try {"+" Try}]
+    ["[0]" try (.only Try)]
     ["[0]" parser
      ["<[0]>" cli]
      ["<[0]>" json]]
@@ -31,7 +31,7 @@
      ["!" capability]]]
    [data
     ["[0]" text
-     ["%" format {"+" format}]
+     ["%" format (.only format)]
      [encoding
       ["[0]" utf8]]]
     [format
diff --git a/licentia/source/program/licentia/document.lux b/licentia/source/program/licentia/document.lux
index 4a3253f76..0754cca43 100644
--- a/licentia/source/program/licentia/document.lux
+++ b/licentia/source/program/licentia/document.lux
@@ -3,7 +3,7 @@
   [lux {"-" or and}
    [data
     ["[0]" text
-     ["%" format {"+" format}]]
+     ["%" format (.only format)]]
     [collection
      ["[0]" list ("[1]#[0]" functor)]]]]])
 
diff --git a/licentia/source/program/licentia/input.lux b/licentia/source/program/licentia/input.lux
index b92d0e52e..21de87b90 100644
--- a/licentia/source/program/licentia/input.lux
+++ b/licentia/source/program/licentia/input.lux
@@ -2,31 +2,31 @@
  [library
   [lux "*"
    [abstract
-    [monad {"+" do}]]
+    [monad (.only do)]]
    [control
-    ["[0]" exception {"+" exception:}]
+    ["[0]" exception (.only exception:)]
     ["<>" parser
-     ["<[0]>" json {"+" Parser}]]]
+     ["<[0]>" json (.only Parser)]]]
    [data
     [text
-     ["%" format {"+" format}]]]
+     ["%" format (.only format)]]]
    [math
     [number
      ["n" nat]
      ["i" int]
      ["f" frac]]]]]
  ["[0]" // "_"
-  ["[1]" license {"+" Identification
-                  Termination
-                  Liability
-                  Distribution
-                  Commercial
-                  Extension
-                  Entity Black_List
-                  URL Attribution
-                  Addendum
-                  License}
-   ["[0]" time {"+" Period}]
+  ["[1]" license (.only Identification
+                        Termination
+                        Liability
+                        Distribution
+                        Commercial
+                        Extension
+                        Entity Black_List
+                        URL Attribution
+                        Addendum
+                        License)
+   ["[0]" time (.only Period)]
    ["[0]" copyright]]])
 
 (def: identification
diff --git a/licentia/source/program/licentia/license.lux b/licentia/source/program/licentia/license.lux
index 6cc1218df..6fce41a82 100644
--- a/licentia/source/program/licentia/license.lux
+++ b/licentia/source/program/licentia/license.lux
@@ -1,9 +1,9 @@
 (.using
-  [library
-   [lux "*"]]
-  ["[0]" / "_"
-   [time {"+" Days Months Period}]
-   ["[1][0]" copyright]])
+ [library
+  [lux "*"]]
+ ["[0]" / "_"
+  [time (.only Days Months Period)]
+  ["[1][0]" copyright]])
 
 (type: .public Identification
   (Record
diff --git a/licentia/source/program/licentia/license/addendum.lux b/licentia/source/program/licentia/license/addendum.lux
index 3aa71b353..2fe9e1c9a 100644
--- a/licentia/source/program/licentia/license/addendum.lux
+++ b/licentia/source/program/licentia/license/addendum.lux
@@ -3,8 +3,8 @@
   [lux "*"
    [data
     [text
-     ["%" format {"+" format}]]]]]
- ["[0]" // {"+" Addendum}
+     ["%" format (.only format)]]]]]
+ ["[0]" // (.only Addendum)
   [//
    ["$" document]]])
 
diff --git a/licentia/source/program/licentia/license/assurance.lux b/licentia/source/program/licentia/license/assurance.lux
index a36b38dcf..de2538a5d 100644
--- a/licentia/source/program/licentia/license/assurance.lux
+++ b/licentia/source/program/licentia/license/assurance.lux
@@ -3,7 +3,7 @@
   [lux "*"
    [data
     ["[0]" text
-     ["%" format {"+" format}]]]]]
+     ["%" format (.only format)]]]]]
  [//
   ["_" term]
   [//
diff --git a/licentia/source/program/licentia/license/black_list.lux b/licentia/source/program/licentia/license/black_list.lux
index 24d367d6a..be1c01f2e 100644
--- a/licentia/source/program/licentia/license/black_list.lux
+++ b/licentia/source/program/licentia/license/black_list.lux
@@ -5,10 +5,10 @@
     ["[0]" maybe ("[1]#[0]" functor)]]
    [data
     ["[0]" text
-     ["%" format {"+" format}]]
+     ["%" format (.only format)]]
     [collection
      ["[0]" list ("[1]#[0]" functor)]]]]]
- ["[0]" // {"+" Entity Black_List}
+ ["[0]" // (.only Entity Black_List)
   ["_" term]
   [//
    ["$" document]]])
diff --git a/licentia/source/program/licentia/license/commercial.lux b/licentia/source/program/licentia/license/commercial.lux
index aa0cc0005..20279179c 100644
--- a/licentia/source/program/licentia/license/commercial.lux
+++ b/licentia/source/program/licentia/license/commercial.lux
@@ -1,13 +1,13 @@
 (.using
-  [library
-   [lux "*"
-    [data
-     ["[0]" text
-      ["%" format {"+" format}]]]]]
-  ["[0]" // {"+" Commercial}
-   ["_" term]
-   [//
-    ["$" document]]])
+ [library
+  [lux "*"
+   [data
+    ["[0]" text
+     ["%" format (.only format)]]]]]
+ ["[0]" // (.only Commercial)
+  ["_" term]
+  [//
+   ["$" document]]])
 
 (def: .public cannot_sell
   (let [preamble (format "Without limiting other conditions in " _.license)
diff --git a/licentia/source/program/licentia/license/copyright.lux b/licentia/source/program/licentia/license/copyright.lux
index d065d5039..c20dc5f64 100644
--- a/licentia/source/program/licentia/license/copyright.lux
+++ b/licentia/source/program/licentia/license/copyright.lux
@@ -1,8 +1,8 @@
 (.using
-  [library
-   [lux "*"]]
-  [//
-   [time {"+" Year Period}]])
+ [library
+  [lux "*"]]
+ [//
+  [time (.only Year Period)]])
 
 (type: .public Holder
   (Record
diff --git a/licentia/source/program/licentia/license/definition.lux b/licentia/source/program/licentia/license/definition.lux
index 3d002311c..009d83e2e 100644
--- a/licentia/source/program/licentia/license/definition.lux
+++ b/licentia/source/program/licentia/license/definition.lux
@@ -3,7 +3,7 @@
   [lux {"-" Definition}
    [data
     ["[0]" text
-     ["%" format {"+" format}]]]]]
+     ["%" format (.only format)]]]]]
  [///
   ["$" document]])
 
diff --git a/licentia/source/program/licentia/license/distribution.lux b/licentia/source/program/licentia/license/distribution.lux
index 87b397ff7..4632536ba 100644
--- a/licentia/source/program/licentia/license/distribution.lux
+++ b/licentia/source/program/licentia/license/distribution.lux
@@ -3,10 +3,10 @@
   [lux "*"
    [data
     ["[0]" text
-     ["%" format {"+" format}]]
+     ["%" format (.only format)]]
     [collection
      ["[0]" list ("[1]#[0]" monoid)]]]]]
- ["[0]" // {"+" Distribution}
+ ["[0]" // (.only Distribution)
   ["_" term]
   [//
    ["$" document]]])
diff --git a/licentia/source/program/licentia/license/extension.lux b/licentia/source/program/licentia/license/extension.lux
index 82a5a0243..00075dd35 100644
--- a/licentia/source/program/licentia/license/extension.lux
+++ b/licentia/source/program/licentia/license/extension.lux
@@ -3,11 +3,11 @@
   [lux "*"
    [data
     ["[0]" text
-     ["%" format {"+" format}]]]]]
- ["[0]" // {"+" Extension}
+     ["%" format (.only format)]]]]]
+ ["[0]" // (.only Extension)
+  [time (.only Months Period)]
   ["_" term]
   ["[0]" grant]
-  [time {"+" Months Period}]
   [//
    ["$" document]]])
 
diff --git a/licentia/source/program/licentia/license/grant.lux b/licentia/source/program/licentia/license/grant.lux
index 9be9208f1..38344fb24 100644
--- a/licentia/source/program/licentia/license/grant.lux
+++ b/licentia/source/program/licentia/license/grant.lux
@@ -3,9 +3,9 @@
   [lux "*"
    [data
     ["[0]" text
-     ["%" format {"+" format}]]]]]
+     ["%" format (.only format)]]]]]
  [//
-  [time {"+" Days}]
+  [time (.only Days)]
   ["_" term]
   ["[0]" definition]
   [//
diff --git a/licentia/source/program/licentia/license/liability.lux b/licentia/source/program/licentia/license/liability.lux
index b6801b900..ee4458e5f 100644
--- a/licentia/source/program/licentia/license/liability.lux
+++ b/licentia/source/program/licentia/license/liability.lux
@@ -3,7 +3,7 @@
   [lux "*"
    [data
     ["[0]" text
-     ["%" format {"+" format}]]]]]
+     ["%" format (.only format)]]]]]
  [//
   ["_" term]
   [//
diff --git a/licentia/source/program/licentia/license/limitation.lux b/licentia/source/program/licentia/license/limitation.lux
index cc8ff460c..33a5753d8 100644
--- a/licentia/source/program/licentia/license/limitation.lux
+++ b/licentia/source/program/licentia/license/limitation.lux
@@ -3,7 +3,7 @@
   [lux "*"
    [data
     ["[0]" text
-     ["%" format {"+" format}]]]]]
+     ["%" format (.only format)]]]]]
  [//
   ["_" term]
   [//
diff --git a/licentia/source/program/licentia/license/miscellaneous.lux b/licentia/source/program/licentia/license/miscellaneous.lux
index 329d5ce9d..dc126ddfb 100644
--- a/licentia/source/program/licentia/license/miscellaneous.lux
+++ b/licentia/source/program/licentia/license/miscellaneous.lux
@@ -3,7 +3,7 @@
   [lux "*"
    [data
     ["[0]" text
-     ["%" format {"+" format}]]]]]
+     ["%" format (.only format)]]]]]
  [//
   ["_" term]
   [//
diff --git a/licentia/source/program/licentia/license/notice.lux b/licentia/source/program/licentia/license/notice.lux
index e9c723909..e9dcb520b 100644
--- a/licentia/source/program/licentia/license/notice.lux
+++ b/licentia/source/program/licentia/license/notice.lux
@@ -3,7 +3,7 @@
   [lux "*"
    [data
     ["[0]" text
-     ["%" format {"+" format}]]
+     ["%" format (.only format)]]
     [collection
      ["[0]" list ("[1]#[0]" functor)]]]
    [math
diff --git a/licentia/source/program/licentia/license/submission.lux b/licentia/source/program/licentia/license/submission.lux
index 1eeddcc6e..367839be3 100644
--- a/licentia/source/program/licentia/license/submission.lux
+++ b/licentia/source/program/licentia/license/submission.lux
@@ -1,13 +1,13 @@
 (.using
-  [library
-   [lux "*"
-    [data
-     ["[0]" text
-      ["%" format {"+" format}]]]]]
+ [library
+  [lux "*"
+   [data
+    ["[0]" text
+     ["%" format (.only format)]]]]]
+ [//
+  ["_" term]
   [//
-   ["_" term]
-   [//
-    ["$" document]]])
+   ["$" document]]])
 
 (def: .public contribution
   (let [on-submissions (let [exception (format "Unless " _.recipient " explicitly states otherwise")
diff --git a/licentia/source/program/licentia/output.lux b/licentia/source/program/licentia/output.lux
index 9f08bd250..5f0fb296f 100644
--- a/licentia/source/program/licentia/output.lux
+++ b/licentia/source/program/licentia/output.lux
@@ -6,21 +6,21 @@
    [data
     ["[0]" bit]
     ["[0]" text
-     ["%" format {"+" format}]]
+     ["%" format (.only format)]]
     [collection
      ["[0]" list ("[1]#[0]" functor monoid)]]]]]
  [//
-  ["[0]" license {"+" Identification
-                  Termination
-                  Liability
-                  Distribution
-                  Commercial
-                  Extension
-                  Entity Black_List
-                  URL Attribution
-                  License}
+  ["[0]" license (.only Identification
+                        Termination
+                        Liability
+                        Distribution
+                        Commercial
+                        Extension
+                        Entity Black_List
+                        URL Attribution
+                        License)
    ["[0]" copyright]
-   ["[0]" definition {"+" Definition}]
+   ["[0]" definition (.only Definition)]
    ["[0]" grant]
    ["[0]" limitation]
    ["[0]" assurance]
diff --git a/licentia/source/test/licentia.lux b/licentia/source/test/licentia.lux
index a6274a7b5..39b76b6b6 100644
--- a/licentia/source/test/licentia.lux
+++ b/licentia/source/test/licentia.lux
@@ -1,10 +1,10 @@
 (.using
  [library
   [lux "*"
-   [program {"+" program:}]
-   ["_" test {"+" Test}]
+   [program (.only program:)]
+   ["_" test (.only Test)]
    [abstract
-    [monad {"+" do}]]
+    [monad (.only do)]]
    [control
     ["[0]" io]
     ["[0]" maybe ("[1]#[0]" functor)]]
@@ -14,22 +14,22 @@
     [collection
      ["[0]" list ("[1]#[0]" functor)]]]
    [math
-    ["[0]" random {"+" Random}]
+    ["[0]" random (.only Random)]
     [number
      ["n" nat ("[1]#[0]" interval)]]]]]
  [\\program
   ["[0]" output]
-  ["[0]" license {"+" Identification
-                  Termination
-                  Liability
-                  Distribution
-                  Commercial
-                  Extension
-                  Entity Black_List
-                  URL Attribution
-                  Addendum
-                  License}
-   ["[0]" time {"+" Period}]
+  ["[0]" license (.only Identification
+                        Termination
+                        Liability
+                        Distribution
+                        Commercial
+                        Extension
+                        Entity Black_List
+                        URL Attribution
+                        Addendum
+                        License)
+   ["[0]" time (.only Period)]
    ["[0]" copyright]
    ["[0]" notice]
    ["[0]" definition]