aboutsummaryrefslogtreecommitdiff
path: root/stdlib/source/library
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--stdlib/source/library/lux.lux34
-rw-r--r--stdlib/source/library/lux/abstract/comonad.lux2
-rw-r--r--stdlib/source/library/lux/abstract/monad.lux2
-rw-r--r--stdlib/source/library/lux/control/parser/binary.lux2
-rw-r--r--stdlib/source/library/lux/control/try.lux2
-rw-r--r--stdlib/source/library/lux/data/format/binary.lux2
-rw-r--r--stdlib/source/library/lux/data/text/format.lux2
-rw-r--r--stdlib/source/library/lux/macro.lux6
-rw-r--r--stdlib/source/library/lux/macro/syntax.lux2
-rw-r--r--stdlib/source/library/lux/meta/location.lux2
-rw-r--r--stdlib/source/library/lux/target/common_lisp.lux2
-rw-r--r--stdlib/source/library/lux/target/jvm/bytecode.lux4
-rw-r--r--stdlib/source/library/lux/target/jvm/encoding/unsigned.lux4
-rw-r--r--stdlib/source/library/lux/target/ruby.lux2
-rw-r--r--stdlib/source/library/lux/target/scheme.lux2
-rw-r--r--stdlib/source/library/lux/tool/compiler/language/lux.lux2
-rw-r--r--stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/lux.lux6
-rw-r--r--stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/ruby/loop.lux2
-rw-r--r--stdlib/source/library/lux/tool/compiler/language/lux/syntax.lux2
-rw-r--r--stdlib/source/library/lux/type.lux4
-rw-r--r--stdlib/source/library/lux/type/abstract.lux8
21 files changed, 47 insertions, 47 deletions
diff --git a/stdlib/source/library/lux.lux b/stdlib/source/library/lux.lux
index f3f3601d3..c488444dd 100644
--- a/stdlib/source/library/lux.lux
+++ b/stdlib/source/library/lux.lux
@@ -4575,13 +4575,13 @@
(|>> symbol#encoded
(text#composite "Wrong syntax for ")))
-(macro: .public (name_of tokens)
+(macro: .public (symbol tokens)
(case tokens
(^ (list [_ {#Identifier [module name]}]))
(in_meta (list (` [(~ (text$ module)) (~ (text$ name))])))
_
- (failure (..wrong_syntax_error [..prelude_module "name_of"]))))
+ (failure (..wrong_syntax_error [..prelude_module "symbol"]))))
(def: (scope_type_vars state)
(Meta (List Nat))
@@ -4605,7 +4605,7 @@
(failure (text#composite "Indexed-type does not exist: " (nat#encoded idx)))))
_
- (failure (..wrong_syntax_error (name_of ..$)))))
+ (failure (..wrong_syntax_error (symbol ..$)))))
(def: .public (same? reference sample)
(All (_ a)
@@ -4621,7 +4621,7 @@
branches)))
_
- (failure (..wrong_syntax_error (name_of ..^@)))))
+ (failure (..wrong_syntax_error (symbol ..^@)))))
(macro: .public (^|> tokens)
(case tokens
@@ -4633,7 +4633,7 @@
branches)))
_
- (failure (..wrong_syntax_error (name_of ..^|>)))))
+ (failure (..wrong_syntax_error (symbol ..^|>)))))
(macro: .public (:expected tokens)
(case tokens
@@ -4643,7 +4643,7 @@
(in (list (` ("lux type as" (~ (type_code type)) (~ expr))))))
_
- (failure (..wrong_syntax_error (name_of ..:expected)))))
+ (failure (..wrong_syntax_error (symbol ..:expected)))))
(def: location
(Meta Location)
@@ -4661,7 +4661,7 @@
(in (list (` (..panic! (~ (text$ message)))))))
_
- (failure (..wrong_syntax_error (name_of ..undefined)))))
+ (failure (..wrong_syntax_error (symbol ..undefined)))))
(macro: .public (:of tokens)
(case tokens
@@ -4677,7 +4677,7 @@
(..:of (~ g!temp)))))))
_
- (failure (..wrong_syntax_error (name_of ..:of)))))
+ (failure (..wrong_syntax_error (symbol ..:of)))))
(def: (tupleP tokens)
(-> (List Code) (Maybe [(List Code) (List Code)]))
@@ -4723,7 +4723,7 @@
{.#Left (~ (text$ (..wrong_syntax_error [this_module name])))}))))))
{#None}
- (failure (..wrong_syntax_error (name_of ..template:)))))
+ (failure (..wrong_syntax_error (symbol ..template:)))))
(macro: .public (as_is tokens compiler)
{#Right [compiler tokens]})
@@ -4737,7 +4737,7 @@
[compiler] {#Right})
_
- {#Left (..wrong_syntax_error (name_of ..char))}))
+ {#Left (..wrong_syntax_error (symbol ..char))}))
(def: target
(Meta Text)
@@ -4807,7 +4807,7 @@
(target_pick target options {#None})
{#None}
- (failure (..wrong_syntax_error (name_of ..for))))
+ (failure (..wrong_syntax_error (symbol ..for))))
(^ (list [_ {#Tuple options}] default))
(case (pairs' options)
@@ -4815,10 +4815,10 @@
(target_pick target options {#Some default})
{#None}
- (failure (..wrong_syntax_error (name_of ..for))))
+ (failure (..wrong_syntax_error (symbol ..for))))
_
- (failure (..wrong_syntax_error (name_of ..for))))))
+ (failure (..wrong_syntax_error (symbol ..for))))))
(def: (embedded_expansions code)
(-> Code (Meta [(List [Code Code]) Code]))
@@ -4853,7 +4853,7 @@
(~ labelled))))))
_
- (failure (..wrong_syntax_error (name_of ..``)))))
+ (failure (..wrong_syntax_error (symbol ..``)))))
(def: (name$ [module name])
(-> Symbol Code)
@@ -4932,7 +4932,7 @@
(in (list pattern)))
_
- (failure (..wrong_syntax_error (name_of ..^code)))))
+ (failure (..wrong_syntax_error (symbol ..^code)))))
(def: .public false
Bit
@@ -4955,7 +4955,7 @@
(..failure ":let requires an even number of parts"))
_
- (..failure (..wrong_syntax_error (name_of ..:let)))))
+ (..failure (..wrong_syntax_error (symbol ..:let)))))
(macro: .public (try tokens)
(case tokens
@@ -4967,7 +4967,7 @@
(~ expression)))))))
_
- (..failure (..wrong_syntax_error (name_of ..try)))))
+ (..failure (..wrong_syntax_error (symbol ..try)))))
(def: (methodP tokens)
(-> (List Code) (Maybe [(List Code) [Text Code]]))
diff --git a/stdlib/source/library/lux/abstract/comonad.lux b/stdlib/source/library/lux/abstract/comonad.lux
index 067e918bf..af96eb4e2 100644
--- a/stdlib/source/library/lux/abstract/comonad.lux
+++ b/stdlib/source/library/lux/abstract/comonad.lux
@@ -36,7 +36,7 @@
{.#None}))
{.#Some [?name comonad bindings body]}
(if (|> bindings list.size (n.% 2) (n.= 0))
- (let [[module short] (name_of ..be)
+ (let [[module short] (symbol ..be)
identifier (: (-> Text Code)
(|>> ($_ "lux text concat" module " " short " ") [""] {.#Identifier} [location.dummy]))
g!_ (identifier "_")
diff --git a/stdlib/source/library/lux/abstract/monad.lux b/stdlib/source/library/lux/abstract/monad.lux
index 62162ef72..db53c915d 100644
--- a/stdlib/source/library/lux/abstract/monad.lux
+++ b/stdlib/source/library/lux/abstract/monad.lux
@@ -67,7 +67,7 @@
{.#None}))
{.#Some [?name monad bindings body]}
(if (|> bindings list#size .int ("lux i64 %" +2) ("lux i64 =" +0))
- (let [[module short] (name_of ..do)
+ (let [[module short] (symbol ..do)
identifier (: (-> Text Code)
(|>> ($_ "lux text concat" module " " short " ") [""] {.#Identifier} [location.dummy]))
g!_ (identifier "_")
diff --git a/stdlib/source/library/lux/control/parser/binary.lux b/stdlib/source/library/lux/control/parser/binary.lux
index 2d52aaee3..63ee6d36e 100644
--- a/stdlib/source/library/lux/control/parser/binary.lux
+++ b/stdlib/source/library/lux/control/parser/binary.lux
@@ -1,6 +1,6 @@
(.module:
[library
- [lux {"-" and or nat int rev list type}
+ [lux {"-" and or nat int rev list type symbol}
[type {"+" :sharing}]
[abstract
[hash {"+" Hash}]
diff --git a/stdlib/source/library/lux/control/try.lux b/stdlib/source/library/lux/control/try.lux
index 9567a738e..fbe4b4e6a 100644
--- a/stdlib/source/library/lux/control/try.lux
+++ b/stdlib/source/library/lux/control/try.lux
@@ -129,7 +129,7 @@
{.#None}
{#Failure (`` (("lux in-module" (~~ (static .prelude_module)) .symbol#encoded)
- (name_of ..of_maybe)))}))
+ (symbol ..of_maybe)))}))
(macro: .public (else tokens compiler)
(case tokens
diff --git a/stdlib/source/library/lux/data/format/binary.lux b/stdlib/source/library/lux/data/format/binary.lux
index fa55d392e..ec07e1002 100644
--- a/stdlib/source/library/lux/data/format/binary.lux
+++ b/stdlib/source/library/lux/data/format/binary.lux
@@ -1,6 +1,6 @@
(.module:
[library
- [lux {"-" and or nat int rev list type}
+ [lux {"-" and or nat int rev list type symbol}
[abstract
[monoid {"+" Monoid}]
[monad {"+" Monad do}]
diff --git a/stdlib/source/library/lux/data/text/format.lux b/stdlib/source/library/lux/data/text/format.lux
index 8a5509a8f..ea27fee06 100644
--- a/stdlib/source/library/lux/data/text/format.lux
+++ b/stdlib/source/library/lux/data/text/format.lux
@@ -1,6 +1,6 @@
(.module:
[library
- [lux {"-" list nat int rev type}
+ [lux {"-" list nat int rev type symbol}
[abstract
[monad {"+" do}]
[functor
diff --git a/stdlib/source/library/lux/macro.lux b/stdlib/source/library/lux/macro.lux
index cb81d841b..3f1d04553 100644
--- a/stdlib/source/library/lux/macro.lux
+++ b/stdlib/source/library/lux/macro.lux
@@ -128,7 +128,7 @@
(~ body))))))
_
- (//.failure (..wrong_syntax_error (name_of ..with_identifiers)))))
+ (//.failure (..wrong_syntax_error (symbol ..with_identifiers)))))
(def: .public (one_expansion token)
(-> Code (Meta Code))
@@ -143,8 +143,8 @@
(template [<macro> <func>]
[(macro: .public (<macro> tokens)
- (let [[module _] (name_of .._)
- [_ short] (name_of <macro>)
+ (let [[module _] (symbol .._)
+ [_ short] (symbol <macro>)
macro_name [module short]]
(case (: (Maybe [Bit Code])
(case tokens
diff --git a/stdlib/source/library/lux/macro/syntax.lux b/stdlib/source/library/lux/macro/syntax.lux
index 319ace41d..e1107fa4e 100644
--- a/stdlib/source/library/lux/macro/syntax.lux
+++ b/stdlib/source/library/lux/macro/syntax.lux
@@ -93,4 +93,4 @@
{try.#Failure ((~! text.interposed) (~! text.new_line) (list (~ error_msg) (~ g!error)))})))))))
{try.#Failure error}
- (meta.failure (macro.wrong_syntax_error (name_of ..syntax:)))))
+ (meta.failure (macro.wrong_syntax_error (symbol ..syntax:)))))
diff --git a/stdlib/source/library/lux/meta/location.lux b/stdlib/source/library/lux/meta/location.lux
index 6cc10a3c2..93711e772 100644
--- a/stdlib/source/library/lux/meta/location.lux
+++ b/stdlib/source/library/lux/meta/location.lux
@@ -29,7 +29,7 @@
(~ [..dummy {.#Nat (value@ .#column location)}])])))]})
_
- {.#Left (`` (("lux in-module" (~~ (static .prelude_module)) wrong_syntax_error) (name_of ..here)))}))
+ {.#Left (`` (("lux in-module" (~~ (static .prelude_module)) wrong_syntax_error) (symbol ..here)))}))
(def: .public (format it)
(-> Location Text)
diff --git a/stdlib/source/library/lux/target/common_lisp.lux b/stdlib/source/library/lux/target/common_lisp.lux
index 21258a8bf..04e8c791f 100644
--- a/stdlib/source/library/lux/target/common_lisp.lux
+++ b/stdlib/source/library/lux/target/common_lisp.lux
@@ -1,6 +1,6 @@
(.module:
[library
- [lux {"-" Code int if cond or and comment let}
+ [lux {"-" Code int if cond or and comment let symbol}
[control
[pipe {"+" case> cond> new>}]]
[data
diff --git a/stdlib/source/library/lux/target/jvm/bytecode.lux b/stdlib/source/library/lux/target/jvm/bytecode.lux
index b269b69b7..c7fee0eed 100644
--- a/stdlib/source/library/lux/target/jvm/bytecode.lux
+++ b/stdlib/source/library/lux/target/jvm/bytecode.lux
@@ -754,7 +754,7 @@
[(function (_ resolver)
(do try.monad
[[expected @to] (..resolve_label label resolver)
- _ (exception.assertion ..mismatched_environments [(name_of <instruction>) label @here expected actual]
+ _ (exception.assertion ..mismatched_environments [(symbol <instruction>) label @here expected actual]
(# /stack.equivalence = expected actual))
jump (..jump @from @to)]
(case jump
@@ -805,7 +805,7 @@
(case (dictionary.value label resolver)
{.#Some [expected {.#Some @to}]}
(do try.monad
- [_ (exception.assertion ..mismatched_environments [(name_of <instruction>) label @here expected actual]
+ [_ (exception.assertion ..mismatched_environments [(symbol <instruction>) label @here expected actual]
(# /stack.equivalence = expected actual))
jump (..jump @from @to)]
(case jump
diff --git a/stdlib/source/library/lux/target/jvm/encoding/unsigned.lux b/stdlib/source/library/lux/target/jvm/encoding/unsigned.lux
index bff5a4439..9549340c3 100644
--- a/stdlib/source/library/lux/target/jvm/encoding/unsigned.lux
+++ b/stdlib/source/library/lux/target/jvm/encoding/unsigned.lux
@@ -73,7 +73,7 @@
(def: .public (<constructor> value)
(-> Nat (Try <name>))
(if (n.> (:representation <maximum>) value)
- (exception.except ..value_exceeds_the_maximum [(name_of <name>) value <maximum>])
+ (exception.except ..value_exceeds_the_maximum [(symbol <name>) value <maximum>])
{try.#Success (:abstraction value)}))
(def: .public (<+> parameter subject)
@@ -87,7 +87,7 @@
(let [parameter' (:representation parameter)
subject' (:representation subject)]
(if (n.> subject' parameter')
- (exception.except ..subtraction_cannot_yield_negative_value [(name_of <name>) parameter subject])
+ (exception.except ..subtraction_cannot_yield_negative_value [(symbol <name>) parameter subject])
{try.#Success (:abstraction (n.- parameter' subject'))})))
(def: .public (<max> left right)
diff --git a/stdlib/source/library/lux/target/ruby.lux b/stdlib/source/library/lux/target/ruby.lux
index cd633c813..1824a139f 100644
--- a/stdlib/source/library/lux/target/ruby.lux
+++ b/stdlib/source/library/lux/target/ruby.lux
@@ -1,6 +1,6 @@
(.module:
[library
- [lux {"-" Location Code static int if cond function or and not comment local global}
+ [lux {"-" Location Code static int if cond function or and not comment local global symbol}
["@" target]
[abstract
[equivalence {"+" Equivalence}]
diff --git a/stdlib/source/library/lux/target/scheme.lux b/stdlib/source/library/lux/target/scheme.lux
index 1bf857bf8..3f3688b76 100644
--- a/stdlib/source/library/lux/target/scheme.lux
+++ b/stdlib/source/library/lux/target/scheme.lux
@@ -1,6 +1,6 @@
(.module:
[library
- [lux {"-" Code int or and if cond let}
+ [lux {"-" Code int or and if cond let symbol}
["@" target]
[abstract
[equivalence {"+" Equivalence}]
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux.lux b/stdlib/source/library/lux/tool/compiler/language/lux.lux
index 06da2b69c..447ccee15 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux.lux
@@ -86,6 +86,6 @@
(def: .public key
(Key .Module)
- (key.key [signature.#name (name_of ..compiler)
+ (key.key [signature.#name (symbol ..compiler)
signature.#version /version.version]
(module.empty 0)))
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/lux.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/lux.lux
index 88bef0ffd..7f090639f 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/lux.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/lux.lux
@@ -210,9 +210,9 @@
(function (_ extension_name phase archive valueC)
(do [! ////.monad]
[_ (typeA.infer .Macro)
- input_type (loop [input_name (name_of .Macro')]
+ input_type (loop [input_name (symbol .Macro')]
(do !
- [input_type (///.lifted (meta.definition (name_of .Macro')))]
+ [input_type (///.lifted (meta.definition (symbol .Macro')))]
(case input_type
(^or {.#Definition [exported? def_type def_value]}
{.#Type [exported? def_value labels]})
@@ -220,7 +220,7 @@
(^or {.#Tag _}
{.#Slot _})
- (////.failure (exception.error ..not_a_type [(name_of .Macro')]))
+ (////.failure (exception.error ..not_a_type [(symbol .Macro')]))
{.#Alias real_name}
(recur real_name))))]
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/ruby/loop.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/ruby/loop.lux
index 7e6bd24ff..70cb4a42a 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/ruby/loop.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/ruby/loop.lux
@@ -1,6 +1,6 @@
(.module:
[library
- [lux {"-" Scope}
+ [lux {"-" Scope symbol}
[abstract
["[0]" monad {"+" do}]]
[data
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/syntax.lux b/stdlib/source/library/lux/tool/compiler/language/lux/syntax.lux
index d64167384..6da850247 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/syntax.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/syntax.lux
@@ -172,7 +172,7 @@
(template: (!failure parser where offset source_code)
[{.#Left [[where offset source_code]
- (exception.error ..unrecognized_input [where (%.symbol (name_of parser)) source_code offset])]}])
+ (exception.error ..unrecognized_input [where (%.symbol (symbol parser)) source_code offset])]}])
(template: (!end_of_file where offset source_code current_module)
[{.#Left [[where offset source_code]
diff --git a/stdlib/source/library/lux/type.lux b/stdlib/source/library/lux/type.lux
index 98a966e31..c0737d326 100644
--- a/stdlib/source/library/lux/type.lux
+++ b/stdlib/source/library/lux/type.lux
@@ -385,7 +385,7 @@
(in (list g!_secret_marker_))))
(def: secret_marker
- (`` (name_of (~~ (new_secret_marker)))))
+ (`` (symbol (~~ (new_secret_marker)))))
(syntax: .public (:log! [input (<>.or (<>.and <code>.identifier
(<>.maybe (<>.after (<code>.identifier! ..secret_marker) <code>.any)))
@@ -397,7 +397,7 @@
valueT (meta.type valueN)
.let [_ ("lux io log"
($_ text#composite
- (symbol#encoded (name_of ..:log!)) " " (location.format location) text.new_line
+ (symbol#encoded (symbol ..:log!)) " " (location.format location) text.new_line
"Expression: " (case valueC
{.#Some valueC}
(code.format valueC)
diff --git a/stdlib/source/library/lux/type/abstract.lux b/stdlib/source/library/lux/type/abstract.lux
index 915c035c3..9de534c9b 100644
--- a/stdlib/source/library/lux/type/abstract.lux
+++ b/stdlib/source/library/lux/type/abstract.lux
@@ -80,7 +80,7 @@
(def: (peek! frame)
(-> (Maybe Text) (Meta Frame))
(function (_ compiler)
- (let [[reference definition_reference] (name_of ..frames)
+ (let [[reference definition_reference] (symbol ..frames)
current_frames (peek_frames reference definition_reference (value@ .#modules compiler))]
(case (case frame
{.#Some frame}
@@ -141,7 +141,7 @@
(-> Frame (Meta Any))
(function (_ compiler)
{.#Right [(revised@ .#modules
- (..push_frame (name_of ..frames) frame)
+ (..push_frame (symbol ..frames) frame)
compiler)
[]]}))
@@ -174,7 +174,7 @@
(syntax: (pop! [])
(function (_ compiler)
{.#Right [(revised@ .#modules
- (..pop_frame (name_of ..frames))
+ (..pop_frame (symbol ..frames))
compiler)
(list)]}))
@@ -201,7 +201,7 @@
(def: representation_definition_name
(-> Text Text)
(|>> ($_ text#composite
- (symbol#encoded (name_of ..#Representation))
+ (symbol#encoded (symbol ..#Representation))
" ")))
(def: declaration