From 2746f1a2d7606e3295e12e9c2e6833663658ffa8 Mon Sep 17 00:00:00 2001
From: Eduardo Julian
Date: Sat, 21 Jul 2018 22:58:54 -0400
Subject: Re-named "Symbol" to "Identifier".

---
 luxc/src/lux/analyser.clj           | 10 +++++-----
 luxc/src/lux/analyser/case.clj      |  6 +++---
 luxc/src/lux/analyser/lux.clj       |  2 +-
 luxc/src/lux/analyser/module.clj    |  6 +++---
 luxc/src/lux/base.clj               |  4 ++--
 luxc/src/lux/compiler/cache.clj     |  6 +++---
 luxc/src/lux/compiler/cache/ann.clj |  8 ++++----
 luxc/src/lux/compiler/jvm/lux.clj   |  4 ++--
 luxc/src/lux/lexer.clj              |  8 ++++----
 luxc/src/lux/parser.clj             |  4 ++--
 luxc/src/lux/type.clj               |  2 +-
 11 files changed, 30 insertions(+), 30 deletions(-)

(limited to 'luxc/src')

diff --git a/luxc/src/lux/analyser.clj b/luxc/src/lux/analyser.clj
index 6e2d8f7aa..f818572e5 100644
--- a/luxc/src/lux/analyser.clj
+++ b/luxc/src/lux/analyser.clj
@@ -101,9 +101,9 @@
       (&/with-analysis-meta cursor exo-type
         (analyse-variant+ analyse exo-type ?ident &/$Nil))
 
-      (&/$Symbol ?ident)
+      (&/$Identifier ?ident)
       (&/with-analysis-meta cursor exo-type
-        (&&lux/analyse-symbol analyse exo-type ?ident))
+        (&&lux/analyse-identifier analyse exo-type ?ident))
 
       (&/$Form (&/$Cons [command-meta command] parameters))
       (|case command
@@ -128,7 +128,7 @@
               (&&lux/analyse-coerce analyse eval! exo-type ?type ?value)))
 
           "lux def"
-          (|let [(&/$Cons [_ (&/$Symbol "" ?name)]
+          (|let [(&/$Cons [_ (&/$Identifier "" ?name)]
                           (&/$Cons ?value
                                    (&/$Cons ?meta
                                             (&/$Nil))
@@ -176,8 +176,8 @@
             (&&lux/analyse-case analyse exo-type ?input ?pattern-matching)))
 
         ;; Function syntax.
-        (&/$Tuple (&/$Cons [_ (&/$Symbol "" ?self)]
-                           (&/$Cons [_ (&/$Symbol "" ?arg)] (&/$Nil))))
+        (&/$Tuple (&/$Cons [_ (&/$Identifier "" ?self)]
+                           (&/$Cons [_ (&/$Identifier "" ?arg)] (&/$Nil))))
         (|let [(&/$Cons ?body (&/$Nil)) parameters]
           (&/with-analysis-meta cursor exo-type
             (&&lux/analyse-function analyse exo-type ?self ?arg ?body)))
diff --git a/luxc/src/lux/analyser/case.clj b/luxc/src/lux/analyser/case.clj
index 73b4c8df2..4d7b4ccca 100644
--- a/luxc/src/lux/analyser/case.clj
+++ b/luxc/src/lux/analyser/case.clj
@@ -252,7 +252,7 @@
 (defn ^:private analyse-pattern [var?? value-type pattern kont]
   (|let [[meta pattern*] pattern]
     (|case pattern*
-      (&/$Symbol "" name)
+      (&/$Identifier "" name)
       (|case var??
         (&/$Some var-analysis)
         (|do [=kont (&env/with-alias name var-analysis
@@ -265,8 +265,8 @@
               idx &env/next-local-idx]
           (return (&/T [($StoreTestAC idx) =kont]))))
       
-      (&/$Symbol ident)
-      (&/fail-with-loc (str "[Pattern-matching Error] Symbols must be unqualified: " (&/ident->text ident)))
+      (&/$Identifier ident)
+      (&/fail-with-loc (str "[Pattern-matching Error] Identifiers must be unqualified: " (&/ident->text ident)))
 
       (&/$Bit ?value)
       (|do [_ (&type/check value-type &type/Bit)
diff --git a/luxc/src/lux/analyser/lux.clj b/luxc/src/lux/analyser/lux.clj
index 35ac72e93..236eb10a9 100644
--- a/luxc/src/lux/analyser/lux.clj
+++ b/luxc/src/lux/analyser/lux.clj
@@ -300,7 +300,7 @@
            (&/set$ &/$scopes (&/|++ inner* outer) state)))
         ))))
 
-(defn analyse-symbol [analyse exo-type ident]
+(defn analyse-identifier [analyse exo-type ident]
   (|do [:let [[?module ?name] ident]]
     (if (= "" ?module)
       (analyse-local analyse exo-type ?name)
diff --git a/luxc/src/lux/analyser/module.clj b/luxc/src/lux/analyser/module.clj
index 4174932ca..5d72d5e87 100644
--- a/luxc/src/lux/analyser/module.clj
+++ b/luxc/src/lux/analyser/module.clj
@@ -236,7 +236,7 @@
           (|let [[?type ?meta ?value] $def]
             (if (.equals ^Object current-module module)
               (|case (&meta/meta-get &meta/alias-tag ?meta)
-                (&/$Some [_ (&/$Symbol [?r-module ?r-name])])
+                (&/$Some [_ (&/$Identifier [?r-module ?r-name])])
                 ((find-def! ?r-module ?r-name)
                  state)
 
@@ -262,7 +262,7 @@
             (|let [[?type ?meta ?value] $def]
               (if (.equals ^Object current-module module)
                 (|case (&meta/meta-get &meta/alias-tag ?meta)
-                  (&/$Some [_ (&/$Symbol [?r-module ?r-name])])
+                  (&/$Some [_ (&/$Identifier [?r-module ?r-name])])
                   ((find-def ?r-module ?r-name)
                    state)
 
@@ -427,7 +427,7 @@
                               (|let [[k _def-data] kv
                                      [_ ?def-meta _] _def-data]
                                 (|case (&meta/meta-get &meta/alias-tag ?def-meta)
-                                  (&/$Some [_ (&/$Symbol [?r-module ?r-name])])
+                                  (&/$Some [_ (&/$Identifier [?r-module ?r-name])])
                                   (&/T [k (str ?r-module &/+name-separator+ ?r-name) _def-data])
                                   
                                   _
diff --git a/luxc/src/lux/base.clj b/luxc/src/lux/base.clj
index 464b7b585..e6fecf367 100644
--- a/luxc/src/lux/base.clj
+++ b/luxc/src/lux/base.clj
@@ -77,7 +77,7 @@
   ("Rev" 1)
   ("Frac" 1)
   ("Text" 1)
-  ("Symbol" 1)
+  ("Identifier" 1)
   ("Tag" 1)
   ("Form" 1)
   ("Tuple" 1)
@@ -1227,7 +1227,7 @@
       (str "#" ?tag)
       (str "#" ?module +name-separator+ ?tag))
 
-    [_ ($Symbol ?module ?name)]
+    [_ ($Identifier ?module ?name)]
     (if (.equals "" ?module)
       ?name
       (str ?module +name-separator+ ?name))
diff --git a/luxc/src/lux/compiler/cache.clj b/luxc/src/lux/compiler/cache.clj
index 0b8739463..d6b5e8317 100644
--- a/luxc/src/lux/compiler/cache.clj
+++ b/luxc/src/lux/compiler/cache.clj
@@ -89,8 +89,8 @@
 (defn make-tag [ident]
   (&/T [(&/T ["" 0 0]) (&/$Tag ident)]))
 
-(defn make-symbol [ident]
-  (&/T [(&/T ["" 0 0]) (&/$Symbol ident)]))
+(defn make-identifier [ident]
+  (&/T [(&/T ["" 0 0]) (&/$Identifier ident)]))
 
 (defn make-record [ident]
   (&/T [(&/T ["" 0 0]) (&/$Record ident)]))
@@ -101,7 +101,7 @@
       2 (let [[_name _alias] parts
               [_ __module __name] (re-find #"^(.*)\.(.*)$" _alias)
               def-anns (make-record (&/|list (&/T [(make-tag &a-meta/alias-tag)
-                                                   (make-symbol (&/T [__module __name]))])))]
+                                                   (make-identifier (&/T [__module __name]))])))]
           (|do [def-type (&a-module/def-type __module __name)
                 def-value (load-def-value __module __name)]
             (&a-module/define module _name def-type def-anns def-value)))
diff --git a/luxc/src/lux/compiler/cache/ann.clj b/luxc/src/lux/compiler/cache/ann.clj
index bab3d20c7..a7def470a 100644
--- a/luxc/src/lux/compiler/cache/ann.clj
+++ b/luxc/src/lux/compiler/cache/ann.clj
@@ -42,7 +42,7 @@
     [_ (&/$Text value)]
     (str "T" value stop)
 
-    [_ (&/$Symbol ident)]
+    [_ (&/$Identifier ident)]
     (str "@" (serialize-ident ident) stop)
 
     [_ (&/$Tag ident)]
@@ -91,8 +91,8 @@
             [_module _name] (.split ident* "\\." 2)]
         [(&/T [dummy-cursor (<tag> (&/T [_module _name]))]) input*])))
 
-  ^:private deserialize-symbol "@" &/$Symbol
-  ^:private deserialize-tag    "#" &/$Tag)
+  ^:private deserialize-identifier "@" &/$Identifier
+  ^:private deserialize-tag        "#" &/$Tag)
 
 (defn ^:private deserialize-seq [deserializer ^String input]
   (cond (.startsWith input nil-signal)
@@ -130,7 +130,7 @@
       (deserialize-rev input)
       (deserialize-frac input)
       (deserialize-text input)
-      (deserialize-symbol input)
+      (deserialize-identifier input)
       (deserialize-tag input)
       (deserialize-form input)
       (deserialize-tuple input)
diff --git a/luxc/src/lux/compiler/jvm/lux.clj b/luxc/src/lux/compiler/jvm/lux.clj
index d9b9f00d0..06a6650d9 100644
--- a/luxc/src/lux/compiler/jvm/lux.clj
+++ b/luxc/src/lux/compiler/jvm/lux.clj
@@ -300,7 +300,7 @@
     (|do [module-name &/get-module-name
           class-loader &/loader]
       (|case (&a-meta/meta-get &a-meta/alias-tag ?meta)
-        (&/$Some [_ (&/$Symbol [r-module r-name])])
+        (&/$Some [_ (&/$Identifier [r-module r-name])])
         (|case ?meta
           [_ (&/$Record ?meta*)]
           (if (= 1 (&/|length ?meta*))
@@ -315,7 +315,7 @@
             (&/fail-with-loc (str "[Compilation Error] Aliases cannot contain meta-data: " (str module-name &/+name-separator+ ?name)))))
 
         (&/$Some _)
-        (&/fail-with-loc "[Compilation Error] Invalid syntax for lux;alias meta-data. Must be a symbol.")
+        (&/fail-with-loc "[Compilation Error] Invalid syntax for lux;alias meta-data. Must be an identifier.")
         
         _
         (|case (de-ann ?body)
diff --git a/luxc/src/lux/lexer.clj b/luxc/src/lux/lexer.clj
index aac212e26..354bf98e2 100644
--- a/luxc/src/lux/lexer.clj
+++ b/luxc/src/lux/lexer.clj
@@ -15,7 +15,7 @@
   ("Rev" 1)
   ("Frac" 1)
   ("Text" 1)
-  ("Symbol" 1)
+  ("Identifier" 1)
   ("Tag" 1)
   ("Open_Paren" 0)
   ("Close_Paren" 0)
@@ -170,9 +170,9 @@
                           (return (&/T [meta (&/T ["lux" token])])))
                         )))
 
-(def ^:private lex-symbol
+(def ^:private lex-identifier
   (|do [[meta ident] lex-ident]
-    (return (&/T [meta ($Symbol ident)]))))
+    (return (&/T [meta ($Identifier ident)]))))
 
 (def ^:private lex-tag
   (|do [[meta _ _] (&reader/read-text "#")
@@ -211,6 +211,6 @@
                         lex-rev
                         lex-int
                         lex-text
-                        lex-symbol
+                        lex-identifier
                         lex-tag
                         lex-delimiter)))
diff --git a/luxc/src/lux/parser.clj b/luxc/src/lux/parser.clj
index 7a58059b0..dd33129b8 100644
--- a/luxc/src/lux/parser.clj
+++ b/luxc/src/lux/parser.clj
@@ -82,8 +82,8 @@
       (&lexer/$Text ?value)
       (return (&/|list (&/T [meta (&/$Text ?value)])))
 
-      (&lexer/$Symbol ?ident)
-      (return (&/|list (&/T [meta (&/$Symbol ?ident)])))
+      (&lexer/$Identifier ?ident)
+      (return (&/|list (&/T [meta (&/$Identifier ?ident)])))
 
       (&lexer/$Tag ?ident)
       (return (&/|list (&/T [meta (&/$Tag ?ident)])))
diff --git a/luxc/src/lux/type.clj b/luxc/src/lux/type.clj
index 8a498463e..66a072a10 100644
--- a/luxc/src/lux/type.clj
+++ b/luxc/src/lux/type.clj
@@ -162,7 +162,7 @@
                              Frac
                              (&/$Sum ;; "lux;Text"
                               Text
-                              (&/$Sum ;; "lux;Symbol"
+                              (&/$Sum ;; "lux;Identifier"
                                Ident
                                (&/$Sum ;; "lux;Tag"
                                 Ident
-- 
cgit v1.2.3