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/lang/translation/common-lisp/expression.jvm.lux |  2 +-
 .../translation/common-lisp/procedure/common.jvm.lux     |  4 ++--
 .../luxc/lang/translation/common-lisp/runtime.jvm.lux    | 16 ++++++++--------
 .../luxc/lang/translation/common-lisp/statement.jvm.lux  |  2 +-
 4 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'new-luxc/source/luxc/lang/translation/common-lisp')

diff --git a/new-luxc/source/luxc/lang/translation/common-lisp/expression.jvm.lux b/new-luxc/source/luxc/lang/translation/common-lisp/expression.jvm.lux
index d3761ff6b..45887cdae 100644
--- a/new-luxc/source/luxc/lang/translation/common-lisp/expression.jvm.lux
+++ b/new-luxc/source/luxc/lang/translation/common-lisp/expression.jvm.lux
@@ -57,7 +57,7 @@
     (^ [_ (#.Form (list [_ (#.Int var)]))])
     (referenceT.translate-variable var)
 
-    [_ (#.Symbol definition)]
+    [_ (#.Identifier definition)]
     (referenceT.translate-definition definition)
 
     (^code ("lux call" (~ functionS) (~+ argsS)))
diff --git a/new-luxc/source/luxc/lang/translation/common-lisp/procedure/common.jvm.lux b/new-luxc/source/luxc/lang/translation/common-lisp/procedure/common.jvm.lux
index 8148bf0c6..ba2e0a8b4 100644
--- a/new-luxc/source/luxc/lang/translation/common-lisp/procedure/common.jvm.lux
+++ b/new-luxc/source/luxc/lang/translation/common-lisp/procedure/common.jvm.lux
@@ -61,11 +61,11 @@
           "Expected: " (|> expected .int %i) "\n"
           "  Actual: " (|> actual .int %i)))
 
-(syntax: (arity: {name s.local-symbol} {arity s.nat})
+(syntax: (arity: {name s.local-identifier} {arity s.nat})
   (with-gensyms [g!_ g!proc g!name g!translate g!inputs]
     (do @
       [g!input+ (monad.seq @ (list.repeat arity (macro.gensym "input")))]
-      (wrap (list (` (def: #export ((~ (code.local-symbol name)) (~ g!proc))
+      (wrap (list (` (def: #export ((~ (code.local-identifier name)) (~ g!proc))
                        (-> (-> (..Vector (~ (code.nat arity)) Expression) Expression)
                            (-> Text ..Proc))
                        (function ((~ g!_) (~ g!name))
diff --git a/new-luxc/source/luxc/lang/translation/common-lisp/runtime.jvm.lux b/new-luxc/source/luxc/lang/translation/common-lisp/runtime.jvm.lux
index fe0a620d9..3750bc674 100644
--- a/new-luxc/source/luxc/lang/translation/common-lisp/runtime.jvm.lux
+++ b/new-luxc/source/luxc/lang/translation/common-lisp/runtime.jvm.lux
@@ -55,19 +55,19 @@
 
 (def: declaration
   (s.Syntax [Text (List Text)])
-  (p.either (p.seq s.local-symbol (p/wrap (list)))
-            (s.form (p.seq s.local-symbol (p.some s.local-symbol)))))
+  (p.either (p.seq s.local-identifier (p/wrap (list)))
+            (s.form (p.seq s.local-identifier (p.some s.local-identifier)))))
 
 (syntax: (runtime: {[name args] declaration}
            definition)
-  (let [implementation (code.local-symbol (format "@@" name))
+  (let [implementation (code.local-identifier (format "@@" name))
         runtime (format prefix "__" (lang.normalize-name name))
         $runtime (` (_.var (~ (code.text runtime))))
         @runtime (` (@@ (~ $runtime)))
-        argsC+ (list/map code.local-symbol args)
+        argsC+ (list/map code.local-identifier args)
         argsLC+ (list/map (|>> lang.normalize-name (format "LRV__") code.text (~) (_.var) (`))
                           args)
-        declaration (` ((~ (code.local-symbol name))
+        declaration (` ((~ (code.local-identifier name))
                         (~+ argsC+)))
         type (` (-> (~+ (list.repeat (list.size argsC+) (` _.Expression)))
                     _.Expression))]
@@ -93,11 +93,11 @@
                                (_.defun (~ $runtime) (list (~+ argsLC+))
                                         (~ definition))))))))))))
 
-(syntax: #export (with-vars {vars (s.tuple (p.many s.local-symbol))}
+(syntax: #export (with-vars {vars (s.tuple (p.many s.local-identifier))}
                    body)
   (wrap (list (` (let [(~+ (|> vars
                                (list/map (function (_ var)
-                                           (list (code.local-symbol var)
+                                           (list (code.local-identifier var)
                                                  (` (_.var (~ (code.text (format "LRV__" (lang.normalize-name var)))))))))
                                list/join))]
                    (~ body))))))
@@ -320,7 +320,7 @@
         (_.progn (list (_.setq! process//incoming (_.list (list)))
                        (_.map/3 _.nil
                                 (_.lambda (_.poly (list process))
-                                     (_.funcall (list ..unit) (@@ process)))
+                                          (_.funcall (list ..unit) (@@ process)))
                                 (@@ queue))
                        (process//loop ..unit)))))
     ..unit))
diff --git a/new-luxc/source/luxc/lang/translation/common-lisp/statement.jvm.lux b/new-luxc/source/luxc/lang/translation/common-lisp/statement.jvm.lux
index 549142f3f..74bf3d118 100644
--- a/new-luxc/source/luxc/lang/translation/common-lisp/statement.jvm.lux
+++ b/new-luxc/source/luxc/lang/translation/common-lisp/statement.jvm.lux
@@ -15,7 +15,7 @@
   (do macro.Monad<Meta>
     [current-module macro.current-module-name
      #let [def-ident [current-module name]]]
-    (case (macro.get-symbol-ann (ident-for #.alias) metaV)
+    (case (macro.get-identifier-ann (ident-for #.alias) metaV)
       (#.Some real-def)
       (do @
         [[realT realA realV] (macro.find-def real-def)
-- 
cgit v1.2.3