Updated only/except import syntax to take into account record => variant syntax change.

21 files changed, 75 insertions, 75 deletions

diff --git a/licentia/source/program/licentia.lux b/licentia/source/program/licentia.lux
index fd2ee3202..232b0eee6 100644
--- a/licentia/source/program/licentia.lux
+++ b/licentia/source/program/licentia.lux
@@ -14,16 +14,16 @@
 (.module:
   [library
    [lux "*"
-    [ffi {"+" [import:]}]
-    [program {"+" [program:]}]
+    [ffi {"+" import:}]
+    [program {"+" program:}]
     ["[0]" debug]
     [abstract
-     [monad {"+" [do]}]]
+     [monad {"+" do}]]
     [control
-     [remember {"+" [to_do]}]
-     ["[0]" io {"+" [IO]} ("[1]#[0]" monad)]
+     [remember {"+" to_do}]
+     ["[0]" io {"+" IO} ("[1]#[0]" monad)]
      ["[0]" maybe]
-     ["[0]" try {"+" [Try]}]
+     ["[0]" try {"+" Try}]
      ["[0]" parser
       ["<[0]>" cli]
       ["<[0]>" json]]
@@ -31,7 +31,7 @@
       ["!" capability]]]
     [data
      ["[0]" text
-      ["%" format {"+" [format]}]
+      ["%" format {"+" format}]
       [encoding
        ["[0]" utf8]]]
      [format
diff --git a/licentia/source/program/licentia/document.lux b/licentia/source/program/licentia/document.lux
index b4eb63453..548447170 100644
--- a/licentia/source/program/licentia/document.lux
+++ b/licentia/source/program/licentia/document.lux
@@ -1,9 +1,9 @@
 (.module:
   [library
-   [lux {"-" [or and]}
+   [lux {"-" or and}
     [data
      ["[0]" text
-      ["%" format {"+" [format]}]]
+      ["%" format {"+" format}]]
      [collection
       ["[0]" list ("[1]#[0]" functor)]]]]])
 
diff --git a/licentia/source/program/licentia/input.lux b/licentia/source/program/licentia/input.lux
index ebedde054..6a9db3bc4 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 {"+" do}]]
     [control
-     ["[0]" exception {"+" [exception:]}]
+     ["[0]" exception {"+" exception:}]
      ["<>" parser
-      ["<[0]>" json {"+" [Parser]}]]]
+      ["<[0]>" json {"+" Parser}]]]
     [data
      [text
-      ["%" format {"+" [format]}]]]
+      ["%" format {"+" 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 {"+" Identification
+                   Termination
+                   Liability
+                   Distribution
+                   Commercial
+                   Extension
+                   Entity Black_List
+                   URL Attribution
+                   Addendum
+                   License}
+    ["[0]" time {"+" Period}]
     ["[0]" copyright]]])
 
 (def: identification
diff --git a/licentia/source/program/licentia/license.lux b/licentia/source/program/licentia/license.lux
index c52cbe577..53dd289c6 100644
--- a/licentia/source/program/licentia/license.lux
+++ b/licentia/source/program/licentia/license.lux
@@ -2,7 +2,7 @@
   [library
    [lux "*"]]
   ["[0]" / "_"
-   [time {"+" [Days Months Period]}]
+   [time {"+" Days Months Period}]
    ["[1][0]" copyright]])
 
 (type: .public Identification
diff --git a/licentia/source/program/licentia/license/addendum.lux b/licentia/source/program/licentia/license/addendum.lux
index 9e1fde9a1..8cab3f943 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 {"+" format}]]]]]
+  ["[0]" // {"+" Addendum}
    [//
     ["$" document]]])
 
diff --git a/licentia/source/program/licentia/license/assurance.lux b/licentia/source/program/licentia/license/assurance.lux
index da571d407..4941d6ae5 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 {"+" format}]]]]]
   [//
    ["_" term]
    [//
diff --git a/licentia/source/program/licentia/license/black_list.lux b/licentia/source/program/licentia/license/black_list.lux
index 14e851c99..490566c64 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 {"+" format}]]
      [collection
       ["[0]" list ("[1]#[0]" functor)]]]]]
-  ["[0]" // {"+" [Entity Black_List]}
+  ["[0]" // {"+" Entity Black_List}
    ["_" term]
    [//
     ["$" document]]])
diff --git a/licentia/source/program/licentia/license/commercial.lux b/licentia/source/program/licentia/license/commercial.lux
index 0410347be..3d08211a5 100644
--- a/licentia/source/program/licentia/license/commercial.lux
+++ b/licentia/source/program/licentia/license/commercial.lux
@@ -3,8 +3,8 @@
    [lux "*"
     [data
      ["[0]" text
-      ["%" format {"+" [format]}]]]]]
-  ["[0]" // {"+" [Commercial]}
+      ["%" format {"+" format}]]]]]
+  ["[0]" // {"+" Commercial}
    ["_" term]
    [//
     ["$" document]]])
diff --git a/licentia/source/program/licentia/license/copyright.lux b/licentia/source/program/licentia/license/copyright.lux
index a2cdc6fe5..22cb85fe6 100644
--- a/licentia/source/program/licentia/license/copyright.lux
+++ b/licentia/source/program/licentia/license/copyright.lux
@@ -2,7 +2,7 @@
   [library
    [lux "*"]]
   [//
-   [time {"+" [Year Period]}]])
+   [time {"+" 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 7a2d38381..14670f759 100644
--- a/licentia/source/program/licentia/license/definition.lux
+++ b/licentia/source/program/licentia/license/definition.lux
@@ -1,9 +1,9 @@
 (.module:
   [library
-   [lux {"-" [Definition]}
+   [lux {"-" Definition}
     [data
      ["[0]" text
-      ["%" format {"+" [format]}]]]]]
+      ["%" format {"+" format}]]]]]
   [///
    ["$" document]])
 
diff --git a/licentia/source/program/licentia/license/distribution.lux b/licentia/source/program/licentia/license/distribution.lux
index 1a0e58601..d348a1a44 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 {"+" format}]]
      [collection
       ["[0]" list ("[1]#[0]" monoid)]]]]]
-  ["[0]" // {"+" [Distribution]}
+  ["[0]" // {"+" Distribution}
    ["_" term]
    [//
     ["$" document]]])
diff --git a/licentia/source/program/licentia/license/extension.lux b/licentia/source/program/licentia/license/extension.lux
index e2e2c469f..113416891 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 {"+" format}]]]]]
+  ["[0]" // {"+" Extension}
    ["_" term]
    ["[0]" grant]
-   [time {"+" [Months Period]}]
+   [time {"+" Months Period}]
    [//
     ["$" document]]])
 
diff --git a/licentia/source/program/licentia/license/grant.lux b/licentia/source/program/licentia/license/grant.lux
index 0ec3f8a12..cb4fd319f 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 {"+" format}]]]]]
   [//
-   [time {"+" [Days]}]
+   [time {"+" Days}]
    ["_" term]
    ["[0]" definition]
    [//
diff --git a/licentia/source/program/licentia/license/liability.lux b/licentia/source/program/licentia/license/liability.lux
index 005f27112..e2e796c74 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 {"+" format}]]]]]
   [//
    ["_" term]
    [//
diff --git a/licentia/source/program/licentia/license/limitation.lux b/licentia/source/program/licentia/license/limitation.lux
index e66ccc562..9e7822e09 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 {"+" format}]]]]]
   [//
    ["_" term]
    [//
diff --git a/licentia/source/program/licentia/license/miscellaneous.lux b/licentia/source/program/licentia/license/miscellaneous.lux
index a2d77a122..26a176300 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 {"+" format}]]]]]
   [//
    ["_" term]
    [//
diff --git a/licentia/source/program/licentia/license/notice.lux b/licentia/source/program/licentia/license/notice.lux
index 634cf6a16..3a5edf3c0 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 {"+" 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 3fb986351..f5cc338d8 100644
--- a/licentia/source/program/licentia/license/submission.lux
+++ b/licentia/source/program/licentia/license/submission.lux
@@ -3,7 +3,7 @@
    [lux "*"
     [data
      ["[0]" text
-      ["%" format {"+" [format]}]]]]]
+      ["%" format {"+" format}]]]]]
   [//
    ["_" term]
    [//
diff --git a/licentia/source/program/licentia/license/term.lux b/licentia/source/program/licentia/license/term.lux
index 457bf1bb9..81d844884 100644
--- a/licentia/source/program/licentia/license/term.lux
+++ b/licentia/source/program/licentia/license/term.lux
@@ -1,6 +1,6 @@
 (.module:
   [library
-   [lux {"-" [Definition]}]]
+   [lux {"-" Definition}]]
   ["[0]" // "_"
    ["[1][0]" definition]])
 
diff --git a/licentia/source/program/licentia/output.lux b/licentia/source/program/licentia/output.lux
index 72257a0ac..744263c82 100644
--- a/licentia/source/program/licentia/output.lux
+++ b/licentia/source/program/licentia/output.lux
@@ -1,26 +1,26 @@
 (.module:
   [library
-   [lux {"-" [Definition]}
+   [lux {"-" Definition}
     [control
      ["[0]" maybe ("[1]#[0]" functor)]]
     [data
      ["[0]" bit]
      ["[0]" text
-      ["%" format {"+" [format]}]]
+      ["%" format {"+" format}]]
      [collection
       ["[0]" list ("[1]#[0]" functor monoid)]]]]]
   [//
-   ["[0]" license {"+" [Identification
-                        Termination
-                        Liability
-                        Distribution
-                        Commercial
-                        Extension
-                        Entity Black_List
-                        URL Attribution
-                        License]}
+   ["[0]" license {"+" Identification
+                   Termination
+                   Liability
+                   Distribution
+                   Commercial
+                   Extension
+                   Entity Black_List
+                   URL Attribution
+                   License}
     ["[0]" copyright]
-    ["[0]" definition {"+" [Definition]}]
+    ["[0]" definition {"+" Definition}]
     ["[0]" grant]
     ["[0]" limitation]
     ["[0]" assurance]
diff --git a/licentia/source/test/licentia.lux b/licentia/source/test/licentia.lux
index 40e0f5677..6a945b65c 100644
--- a/licentia/source/test/licentia.lux
+++ b/licentia/source/test/licentia.lux
@@ -1,10 +1,10 @@
 (.module:
   [library
    [lux "*"
-    [program {"+" [program:]}]
-    ["_" test {"+" [Test]}]
+    [program {"+" program:}]
+    ["_" test {"+" Test}]
     [abstract
-     [monad {"+" [do]}]]
+     [monad {"+" 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 {"+" 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 {"+" Identification
+                   Termination
+                   Liability
+                   Distribution
+                   Commercial
+                   Extension
+                   Entity Black_List
+                   URL Attribution
+                   Addendum
+                   License}
+    ["[0]" time {"+" Period}]
     ["[0]" copyright]
     ["[0]" notice]
     ["[0]" definition]