Re-named "Identifier" to "Symbol".

9 files changed, 43 insertions, 54 deletions

diff --git a/stdlib/source/documentation/lux.lux b/stdlib/source/documentation/lux.lux
index 3bb2eed7d..71fc37125 100644
--- a/stdlib/source/documentation/lux.lux
+++ b/stdlib/source/documentation/lux.lux
@@ -438,7 +438,7 @@
        (^template [<tag>]
          [(^ (list [_ {<tag> [module name]}]))
           (in (list (` [(~ (text$ module)) (~ (text$ name))])))])
-       ([#Identifier] [#Tag])
+       ([#Symbol])
        
        _
        (failure "Wrong syntax for symbol")))])
@@ -707,13 +707,13 @@
                           (compare <text>
                                    (# codec encoded <function> <parameter>)))]
 
-                  [bit #1                              "#1"]
-                  [int +123                            "+123"]
-                  [frac +123.0                         "+123.0"]
-                  [text "123"                           "'123'"]
-                  [identifier ["yolo" "lol"]           "yolo.lol"]
-                  [form (list (bit #1))                "(#1)"]
-                  [tuple (list (bit #1))               "[#1]"]
+                  [bit #1                "#1"]
+                  [int +123              "+123"]
+                  [frac +123.0           "+123.0"]
+                  [text "123"            "'123'"]
+                  [symbol ["yolo" "lol"] "yolo.lol"]
+                  [form (list (bit #1))  "(#1)"]
+                  [tuple (list (bit #1)) "[#1]"]
                   )]
        ($_ and
            <tests>
@@ -763,7 +763,7 @@
      {#Left (format "Static part " (%t static) " does not match URI: " uri)})])
 
 (documentation: /.symbol
-  "Given an identifier or a tag, gives back a 2 tuple with the module and name parts, both as Text."
+  "Gives back a 2 tuple with the module and name parts, both as Text."
   [(symbol ..#doc)
    "=>"
    ["documentation/lux" "#doc"]])
diff --git a/stdlib/source/documentation/lux/control/concatenative.lux b/stdlib/source/documentation/lux/control/concatenative.lux
index 0fd92c9b5..fc76c2a7d 100644
--- a/stdlib/source/documentation/lux/control/concatenative.lux
+++ b/stdlib/source/documentation/lux/control/concatenative.lux
@@ -52,7 +52,7 @@
       ((apply 1) ++))])
 
 (template [<arity>]
-  [(with_expansions [<name> (template.identifier [/._] ["apply/" <arity>])
+  [(with_expansions [<name> (template.symbol [/._] ["apply/" <arity>])
                      <doc> (template.text ["Lift a function of arity " <arity>
                                            " into a concatenative function of arity " <arity> "."])]
      (documentation: <name>
@@ -93,7 +93,7 @@
   "Right-injects the top into sum.")
 
 (template [<input> <word> <func>]
-  [(`` (documentation: (~~ (template.identifier [/._] [<word>]))
+  [(`` (documentation: (~~ (template.symbol [/._] [<word>]))
          (~~ (template.text [<func> " for " <input> " arithmetic."]))))]
 
   [Nat  n/+  n.+]
diff --git a/stdlib/source/documentation/lux/control/parser/code.lux b/stdlib/source/documentation/lux/control/parser/code.lux
index f9177abad..9663b10b8 100644
--- a/stdlib/source/documentation/lux/control/parser/code.lux
+++ b/stdlib/source/documentation/lux/control/parser/code.lux
@@ -22,14 +22,13 @@
    (`` (documentation: <check>
          (format "Checks for a specific " (~~ (template.text [<query>])) " input.")))]
 
-  [/.bit        /.bit!]
-  [/.nat        /.nat!]
-  [/.int        /.int!]
-  [/.rev        /.rev!]
-  [/.frac       /.frac!]
-  [/.text       /.text!]
-  [/.identifier /.identifier!]
-  [/.tag        /.tag!]
+  [/.bit    /.bit!]
+  [/.nat    /.nat!]
+  [/.int    /.int!]
+  [/.rev    /.rev!]
+  [/.frac   /.frac!]
+  [/.text   /.text!]
+  [/.symbol /.symbol!]
   )
 
 (documentation: /.this!
@@ -42,8 +41,7 @@
    (documentation: <check>
      (format "Checks for a specific local " <desc> " (a " <desc> " that has no module prefix)."))]
 
-  [/.local_identifier /.local_identifier! "local identifier"]
-  [       /.local_tag        /.local_tag! "local tag"]
+  [/.local_symbol /.local_symbol! "local symbol"]
   )
 
 (template [<name>]
@@ -97,17 +95,13 @@
              ..frac!
              ..text
              ..text!
-             ..identifier
-             ..identifier!
-             ..tag
-             ..tag!
+             ..symbol
+             ..symbol!
              
              ..this!
 
-             ..local_identifier
-             ..local_identifier!
-             ..local_tag
-             ..local_tag!
+             ..local_symbol
+             ..local_symbol!
              
              ..form
              ..tuple
diff --git a/stdlib/source/documentation/lux/data/color.lux b/stdlib/source/documentation/lux/data/color.lux
index d0ee1440b..37b10911f 100644
--- a/stdlib/source/documentation/lux/data/color.lux
+++ b/stdlib/source/documentation/lux/data/color.lux
@@ -40,7 +40,7 @@
   ""
   [(interpolated ratio end start)])
 
-(syntax: (palette_documentation [[_ name] <code>.identifier])
+(syntax: (palette_documentation [[_ name] <code>.symbol])
   (in (list (code.text (format "A " (text.replaced "_" "-" name) " palette.")))))
 
 (documentation: /.analogous
diff --git a/stdlib/source/documentation/lux/documentation.lux b/stdlib/source/documentation/lux/documentation.lux
index ed64efe96..7ab64966f 100644
--- a/stdlib/source/documentation/lux/documentation.lux
+++ b/stdlib/source/documentation/lux/documentation.lux
@@ -29,7 +29,7 @@
               [..default
                ..documentation:
                ..module
-               (/.default /.unqualified_identifier)
+               (/.default /.unqualified_symbol)
                (/.default /.Definition)
                (/.default /.Module)
                (/.default /.documentation)]
@@ -42,7 +42,7 @@
             [..default
              ..documentation:
              ..module
-             (/.default /.unqualified_identifier)
+             (/.default /.unqualified_symbol)
              (/.default /.Definition)
              (/.default /.Module)
              (/.default /.documentation)]
diff --git a/stdlib/source/documentation/lux/macro.lux b/stdlib/source/documentation/lux/macro.lux
index 660ad8e1c..bd7324743 100644
--- a/stdlib/source/documentation/lux/macro.lux
+++ b/stdlib/source/documentation/lux/macro.lux
@@ -29,19 +29,19 @@
   "Expands all macro-calls everywhere recursively, until only primitive/base code remains."
   [(full_expansion syntax)])
 
-(documentation: /.identifier
+(documentation: /.symbol
   (format "Generates a unique name as an Code node (ready to be used in code templates)."
           \n "A prefix can be given (or just be empty text) to better identify the code for debugging purposes.")
-  [(identifier prefix)])
+  [(symbol prefix)])
 
 (documentation: /.wrong_syntax_error
   "A generic error message for macro syntax failures.")
 
-(documentation: /.with_identifiers
-  "Creates new identifiers and offers them to the body expression."
+(documentation: /.with_symbols
+  "Creates new symbols and offers them to the body expression."
   [(syntax: (synchronized [lock any
                            body any])
-     (with_identifiers [g!lock g!body g!_]
+     (with_symbols [g!lock g!body g!_]
        (in (list (` (let [(~ g!lock) (~ lock)
                           (~ g!_) ("jvm monitorenter" (~ g!lock))
                           (~ g!body) (~ body)
@@ -98,9 +98,9 @@
             [..single_expansion
              ..expansion
              ..full_expansion
-             ..identifier
+             ..symbol
              ..wrong_syntax_error
-             ..with_identifiers
+             ..with_symbols
              ..one_expansion
              ..log_single_expansion!
              ..log_expansion!
diff --git a/stdlib/source/documentation/lux/macro/code.lux b/stdlib/source/documentation/lux/macro/code.lux
index 3c1f4c999..85b2de284 100644
--- a/stdlib/source/documentation/lux/macro/code.lux
+++ b/stdlib/source/documentation/lux/macro/code.lux
@@ -10,11 +10,8 @@
   [\\library
    ["[0]" /]])
 
-(documentation: /.local_identifier
-  "Produces a local identifier (an identifier with no module prefix).")
-
-(documentation: /.local_tag
-  "Produces a local tag (a tag with no module prefix).")
+(documentation: /.local_symbol
+  "Produces a local symbol (an symbol with no module prefix).")
 
 (documentation: /.replaced
   ""
@@ -24,8 +21,7 @@
   (.List $.Module)
   ($.module /._
             ""
-            [..local_identifier
-             ..local_tag
+            [..local_symbol
              ..replaced
              ($.default /.bit)
              ($.default /.nat)
@@ -33,8 +29,7 @@
              ($.default /.rev)
              ($.default /.frac)
              ($.default /.text)
-             ($.default /.identifier)
-             ($.default /.tag)
+             ($.default /.symbol)
              ($.default /.form)
              ($.default /.tuple)
              ($.default /.record)
diff --git a/stdlib/source/documentation/lux/macro/template.lux b/stdlib/source/documentation/lux/macro/template.lux
index 557446ad0..901497f21 100644
--- a/stdlib/source/documentation/lux/macro/template.lux
+++ b/stdlib/source/documentation/lux/macro/template.lux
@@ -39,13 +39,13 @@
    "=>"
    "#0123+456+789.0abcdefghi"])
 
-(documentation: /.identifier
-  (format "An identifier made by concatenating pieces of code."
+(documentation: /.symbol
+  (format "An symbol made by concatenating pieces of code."
           \n "The (optional) module part and the short part are specified independently.")
-  [(identifier ["abc" .def ..ghi])
+  [(symbol ["abc" .def ..ghi])
    "=>"
    abcdefghi]
-  [(identifier [.def] ["abc" .def ..ghi])
+  [(symbol [.def] ["abc" .def ..ghi])
    "=>"
    .abcdefghi])
 
@@ -65,7 +65,7 @@
              ..amount
              ..with_locals
              ..text
-             ..identifier
+             ..symbol
              ..let
              ($.default /.irregular_arguments)]
             []))
diff --git a/stdlib/source/documentation/lux/tool/compiler/language/lux/generation.lux b/stdlib/source/documentation/lux/tool/compiler/language/lux/generation.lux
index a44ba5e66..3d604b7dc 100644
--- a/stdlib/source/documentation/lux/tool/compiler/language/lux/generation.lux
+++ b/stdlib/source/documentation/lux/tool/compiler/language/lux/generation.lux
@@ -40,7 +40,7 @@
              ($.default /.get_registry)
              ($.default /.set_registry)
              ($.default /.next)
-             ($.default /.identifier)
+             ($.default /.symbol)
              ($.default /.enter_module)
              ($.default /.module)
              ($.default /.evaluate!)