De-sigil-ification: : [Part 2]

14 files changed, 28 insertions, 36 deletions

diff --git a/stdlib/source/documentation/lux/data/collection/array.lux b/stdlib/source/documentation/lux/data/collection/array.lux
index 0c5013c8c..a6f4d203b 100644
--- a/stdlib/source/documentation/lux/data/collection/array.lux
+++ b/stdlib/source/documentation/lux/data/collection/array.lux
@@ -9,7 +9,6 @@
     ["[0]" text (.only \n)
      ["%" format (.only format)]]]
    [macro
-    [syntax (.only syntax:)]
     ["[0]" code]
     ["[0]" template]]]]
  [\\library
diff --git a/stdlib/source/documentation/lux/data/collection/bits.lux b/stdlib/source/documentation/lux/data/collection/bits.lux
index c00811010..dc2f65a41 100644
--- a/stdlib/source/documentation/lux/data/collection/bits.lux
+++ b/stdlib/source/documentation/lux/data/collection/bits.lux
@@ -9,7 +9,6 @@
     ["[0]" text (.only \n)
      ["%" format (.only format)]]]
    [macro
-    [syntax (.only syntax:)]
     ["[0]" code]
     ["[0]" template]]]]
  [\\library
diff --git a/stdlib/source/documentation/lux/data/collection/dictionary.lux b/stdlib/source/documentation/lux/data/collection/dictionary.lux
index fa324c8a7..784e39489 100644
--- a/stdlib/source/documentation/lux/data/collection/dictionary.lux
+++ b/stdlib/source/documentation/lux/data/collection/dictionary.lux
@@ -9,7 +9,6 @@
     ["[0]" text (.only \n)
      ["%" format (.only format)]]]
    [macro
-    [syntax (.only syntax:)]
     ["[0]" code]
     ["[0]" template]]]]
  [\\library
diff --git a/stdlib/source/documentation/lux/data/collection/dictionary/ordered.lux b/stdlib/source/documentation/lux/data/collection/dictionary/ordered.lux
index 4ac9ea09e..0558eaed0 100644
--- a/stdlib/source/documentation/lux/data/collection/dictionary/ordered.lux
+++ b/stdlib/source/documentation/lux/data/collection/dictionary/ordered.lux
@@ -9,7 +9,6 @@
     ["[0]" text (.only \n)
      ["%" format (.only format)]]]
    [macro
-    [syntax (.only syntax:)]
     ["[0]" code]
     ["[0]" template]]]]
  [\\library
diff --git a/stdlib/source/documentation/lux/data/collection/dictionary/plist.lux b/stdlib/source/documentation/lux/data/collection/dictionary/plist.lux
index b257ffe2e..885176140 100644
--- a/stdlib/source/documentation/lux/data/collection/dictionary/plist.lux
+++ b/stdlib/source/documentation/lux/data/collection/dictionary/plist.lux
@@ -9,7 +9,6 @@
     ["[0]" text (.only \n)
      ["%" format (.only format)]]]
    [macro
-    [syntax (.only syntax:)]
     ["[0]" code]
     ["[0]" template]]]]
  [\\library
diff --git a/stdlib/source/documentation/lux/data/collection/list.lux b/stdlib/source/documentation/lux/data/collection/list.lux
index a3084604c..28b8011f1 100644
--- a/stdlib/source/documentation/lux/data/collection/list.lux
+++ b/stdlib/source/documentation/lux/data/collection/list.lux
@@ -9,7 +9,6 @@
     ["[0]" text (.only \n)
      ["%" format (.only format)]]]
    [macro
-    [syntax (.only syntax:)]
     ["[0]" code]
     ["[0]" template]]]]
  [\\library
diff --git a/stdlib/source/documentation/lux/data/collection/queue.lux b/stdlib/source/documentation/lux/data/collection/queue.lux
index cde4e7b66..04b1591f4 100644
--- a/stdlib/source/documentation/lux/data/collection/queue.lux
+++ b/stdlib/source/documentation/lux/data/collection/queue.lux
@@ -9,7 +9,6 @@
     ["[0]" text (.only \n)
      ["%" format (.only format)]]]
    [macro
-    [syntax (.only syntax:)]
     ["[0]" code]
     ["[0]" template]]]]
  [\\library
diff --git a/stdlib/source/documentation/lux/data/collection/queue/priority.lux b/stdlib/source/documentation/lux/data/collection/queue/priority.lux
index 655387052..6b03ef53a 100644
--- a/stdlib/source/documentation/lux/data/collection/queue/priority.lux
+++ b/stdlib/source/documentation/lux/data/collection/queue/priority.lux
@@ -9,7 +9,6 @@
     ["[0]" text (.only \n)
      ["%" format (.only format)]]]
    [macro
-    [syntax (.only syntax:)]
     ["[0]" code]
     ["[0]" template]]]]
  [\\library
diff --git a/stdlib/source/documentation/lux/data/collection/sequence.lux b/stdlib/source/documentation/lux/data/collection/sequence.lux
index 77ba80af0..996b1b225 100644
--- a/stdlib/source/documentation/lux/data/collection/sequence.lux
+++ b/stdlib/source/documentation/lux/data/collection/sequence.lux
@@ -9,7 +9,6 @@
     ["[0]" text (.only \n)
      ["%" format (.only format)]]]
    [macro
-    [syntax (.only syntax:)]
     ["[0]" code]
     ["[0]" template]]]]
  [\\library
diff --git a/stdlib/source/documentation/lux/data/collection/stream.lux b/stdlib/source/documentation/lux/data/collection/stream.lux
index b1ada7c34..1ada33efa 100644
--- a/stdlib/source/documentation/lux/data/collection/stream.lux
+++ b/stdlib/source/documentation/lux/data/collection/stream.lux
@@ -9,7 +9,6 @@
     ["[0]" text (.only \n)
      ["%" format (.only format)]]]
    [macro
-    [syntax (.only syntax:)]
     ["[0]" code]
     ["[0]" template]]]]
  [\\library
diff --git a/stdlib/source/documentation/lux/data/color.lux b/stdlib/source/documentation/lux/data/color.lux
index 43d878837..a3d452f5f 100644
--- a/stdlib/source/documentation/lux/data/color.lux
+++ b/stdlib/source/documentation/lux/data/color.lux
@@ -9,7 +9,7 @@
     ["[0]" text (.only \n)
      ["%" format (.only format)]]]
    [macro
-    [syntax (.only syntax:)]
+    [syntax (.only syntax)]
     ["[0]" code]
     ["[0]" template]]]]
  [\\library
@@ -40,8 +40,9 @@
   ""
   [(interpolated ratio end start)])
 
-(syntax: (palette_documentation [[_ name] <code>.symbol])
-  (in (list (code.text (format "A " (text.replaced "_" "-" name) " palette.")))))
+(def: palette_documentation
+  (syntax (_ [[_ name] <code>.symbol])
+    (in (list (code.text (format "A " (text.replaced "_" "-" name) " palette."))))))
 
 (documentation: /.analogous
   (palette_documentation /.analogous)
diff --git a/stdlib/source/documentation/lux/data/color/named.lux b/stdlib/source/documentation/lux/data/color/named.lux
index 6b62d598e..398a4d7ef 100644
--- a/stdlib/source/documentation/lux/data/color/named.lux
+++ b/stdlib/source/documentation/lux/data/color/named.lux
@@ -9,7 +9,6 @@
     ["[0]" text
      ["%" format (.only format)]]]
    [macro
-    [syntax (.only syntax:)]
     ["[0]" code]
     ["[0]" template]]
    [math
diff --git a/stdlib/source/documentation/lux/macro.lux b/stdlib/source/documentation/lux/macro.lux
index 1e60483d6..d9968fe02 100644
--- a/stdlib/source/documentation/lux/macro.lux
+++ b/stdlib/source/documentation/lux/macro.lux
@@ -39,14 +39,15 @@
 
 (documentation: /.with_symbols
   "Creates new symbols and offers them to the body expression."
-  [(syntax: (synchronized [lock any
-                           body any])
-     (with_symbols [g!lock g!body g!_]
-       (in (list (` (let [(~ g!lock) (~ lock)
-                          (~ g!_) ("jvm monitorenter" (~ g!lock))
-                          (~ g!body) (~ body)
-                          (~ g!_) ("jvm monitorexit" (~ g!lock))]
-                      (~ g!body)))))))])
+  [(def: synchronized
+     (syntax (_ [lock any
+                 body any])
+       (with_symbols [g!lock g!body g!_]
+         (in (list (` (let [(~ g!lock) (~ lock)
+                            (~ g!_) ("jvm monitorenter" (~ g!lock))
+                            (~ g!body) (~ body)
+                            (~ g!_) ("jvm monitorexit" (~ g!lock))]
+                        (~ g!body))))))))])
 
 (documentation: /.one_expansion
   "Works just like expand, except that it ensures that the output is a single Code token."
diff --git a/stdlib/source/documentation/lux/macro/syntax.lux b/stdlib/source/documentation/lux/macro/syntax.lux
index 525777d61..db6e4640d 100644
--- a/stdlib/source/documentation/lux/macro/syntax.lux
+++ b/stdlib/source/documentation/lux/macro/syntax.lux
@@ -18,29 +18,30 @@
  [\\library
   ["[0]" /]])
 
-(documentation: /.syntax:
+(documentation: /.syntax
   (format \n "A more advanced way to define macros than 'macro'."
           \n "The inputs to the macro can be parsed in complex ways through the use of syntax parsers."
           \n "The macro body is also (implicitly) run in the Meta monad, to save some typing."
           \n "Also, the compiler state can be accessed through a special binding.")
-  [(syntax: .public (object lux_state [.let [imports (class_imports lux_state)]
-                                       .let [class_vars (list)]
-                                       super (opt (super_class_decl^ imports class_vars))
-                                       interfaces (tuple (some (super_class_decl^ imports class_vars)))
-                                       constructor_args (constructor_args^ imports class_vars)
-                                       methods (some (overriden_method_def^ imports))])
-     (let [def_code (all text#composite "anon-class:"
-                         (spaced (list (super_class_decl$ (maybe.else object_super_class super))
-                                       (with_brackets (spaced (list#each super_class_decl$ interfaces)))
-                                       (with_brackets (spaced (list#each constructor_arg$ constructor_args)))
-                                       (with_brackets (spaced (list#each (method_def$ id) methods))))))]
-       (in (list (` ((~ (code.text def_code))))))))])
+  [(def: .public object
+     (syntax (_ lux_state [.let [imports (class_imports lux_state)]
+                           .let [class_vars (list)]
+                           super (opt (super_class_decl^ imports class_vars))
+                           interfaces (tuple (some (super_class_decl^ imports class_vars)))
+                           constructor_args (constructor_args^ imports class_vars)
+                           methods (some (overriden_method_def^ imports))])
+       (let [def_code (all text#composite "anon-class:"
+                           (spaced (list (super_class_decl$ (maybe.else object_super_class super))
+                                         (with_brackets (spaced (list#each super_class_decl$ interfaces)))
+                                         (with_brackets (spaced (list#each constructor_arg$ constructor_args)))
+                                         (with_brackets (spaced (list#each (method_def$ id) methods))))))]
+         (in (list (` ((~ (code.text def_code)))))))))])
 
 (.def: .public documentation
   (.List $.Module)
   ($.module /._
             ""
-            [..syntax:]
+            [..syntax]
             [/check.documentation
              /declaration.documentation
              /definition.documentation