From f9e33ae96aec4741385a576719786092c9e68043 Mon Sep 17 00:00:00 2001
From: Eduardo Julian
Date: Sat, 4 Jun 2022 19:34:42 -0400
Subject: De-sigil-ification: #

---
 stdlib/source/library/lux.lux | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'stdlib/source/library/lux.lux')

diff --git a/stdlib/source/library/lux.lux b/stdlib/source/library/lux.lux
index 13ff44b45..cdcb304a0 100644
--- a/stdlib/source/library/lux.lux
+++ b/stdlib/source/library/lux.lux
@@ -2711,7 +2711,7 @@
          _
          {#None}))
 
-(def:' .private (globalP tokens)
+(def:' .private (symbolP tokens)
        (-> (List Code) (Maybe [(List Code) Symbol]))
        (case tokens
          (pattern (partial_list [_ {#Symbol it}] tokens'))
@@ -3479,7 +3479,7 @@
 
 (def: referral_parser
   (Parser Referral)
-  (formP (andP globalP (someP anyP))))
+  (formP (andP symbolP (someP anyP))))
 
 (def: (referrals_parser aliased?)
   (-> Bit (Parser (List Referral)))
@@ -4168,7 +4168,7 @@
                                       ..textP
                                       ..textP))
                        ..textP
-                       (..orP (..manyP ..globalP)
+                       (..orP (..manyP ..symbolP)
                               (..manyP ..anyP)))
                   tokens)
     {.#Some [current_module,imported_module,import_alias alias implementations]}
@@ -4262,19 +4262,19 @@
                      referrals)))
 
     _
-    (failure "Wrong syntax for refer")))
+    (failure (..wrong_syntax_error (symbol ..refer)))))
 
-(macro: .public (# tokens)
+(macro: .public (at tokens)
   (case tokens
     (pattern (list struct [_ {#Symbol member}]))
     (meta#in (list (` (..let [(..open (~ (text$ (alias_stand_in 0)))) (~ struct)]
                         (~ (symbol$ member))))))
 
     (pattern (partial_list struct member args))
-    (meta#in (list (` ((..# (~ struct) (~ member)) (~+ args)))))
+    (meta#in (list (` ((..at (~ struct) (~ member)) (~+ args)))))
     
     _
-    (failure "Wrong syntax for #")))
+    (failure (..wrong_syntax_error (symbol ..at)))))
 
 (macro: .public (has tokens)
   (case tokens
@@ -4601,7 +4601,7 @@
             (again &rest (plist#with var_name expansion map)))
           
           {#End}
-          (# meta_monad #in (list#conjoint (list#each normal bodies))))))
+          (at meta_monad #in (list#conjoint (list#each normal bodies))))))
     
     {#None}
     (failure "Wrong syntax for with_expansions")))
@@ -4666,7 +4666,7 @@
     _
     (meta#in token)
     ... TODO: Figure out why this doesn't work:
-    ... (# meta_monad in token)
+    ... (at meta_monad in token)
     ))
 
 (macro: .public (static tokens)
-- 
cgit v1.2.3