diff options
Diffstat (limited to 'stdlib/source/library/lux/control/concatenative.lux')
| -rw-r--r-- | stdlib/source/library/lux/control/concatenative.lux | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/stdlib/source/library/lux/control/concatenative.lux b/stdlib/source/library/lux/control/concatenative.lux index f4170b94a..0eded28b3 100644 --- a/stdlib/source/library/lux/control/concatenative.lux +++ b/stdlib/source/library/lux/control/concatenative.lux @@ -11,7 +11,7 @@ ["%" format {"+" format}]] [collection ["[0]" list ("[1]#[0]" mix functor)]]] - ["[0]" macro {"+" with_identifiers} + ["[0]" macro {"+" with_symbols} ["[0]" code] ["[0]" template] [syntax {"+" syntax:} @@ -36,7 +36,7 @@ (def: aliases^ (Parser (List Alias)) - (|> (<>.and <code>.local_identifier <code>.any) + (|> (<>.and <code>.local_symbol <code>.any) <>.some <code>.tuple)) @@ -82,7 +82,7 @@ (syntax: .public (=> [[aliases inputs outputs] signature^]) (let [de_alias (function (_ aliased) (list#mix (function (_ [from to] pre) - (code.replaced (code.local_identifier from) to pre)) + (code.replaced (code.local_symbol from) to pre)) aliased aliases))] (case [(value@ #bottom inputs) @@ -95,11 +95,11 @@ (~ (de_alias outputC))))))) [?bottomI ?bottomO] - (with_identifiers [g!stack] + (with_symbols [g!stack] (monad.do meta.monad [inputC (singleton (macro.full_expansion (stack_mix (value@ #top inputs) (maybe.else g!stack ?bottomI)))) outputC (singleton (macro.full_expansion (stack_mix (value@ #top outputs) (maybe.else g!stack ?bottomO))))] - (with_identifiers [g!_] + (with_symbols [g!_] (in (list (` (All ((~ g!_) (~ g!stack)) (-> (~ (de_alias inputC)) (~ (de_alias outputC))))))))))))) @@ -120,19 +120,19 @@ (Parser [Code Text Code (List Code)]) (|export|.parser ($_ <>.and - <code>.local_identifier + <code>.local_symbol <code>.any (<>.many <code>.any)))) (syntax: .public (word: [[export_policy name type commands] ..word]) - (in (list (` (def: (~ export_policy) (~ (code.local_identifier name)) + (in (list (` (def: (~ export_policy) (~ (code.local_symbol name)) (~ type) (|>> (~+ commands))))))) (syntax: .public (apply [arity (<>.only (n.> 0) <code>.nat)]) - (with_identifiers [g!_ g!func g!stack g!output] + (with_symbols [g!_ g!func g!stack g!output] (monad.do [! meta.monad] - [g!inputs (|> (macro.identifier "input") (list.repeated arity) (monad.all !))] + [g!inputs (|> (macro.symbol "input") (list.repeated arity) (monad.all !))] (in (list (` (: (All ((~ g!_) (~+ g!inputs) (~ g!output)) (-> (-> (~+ g!inputs) (~ g!output)) (=> [(~+ g!inputs)] [(~ g!output)]))) @@ -141,7 +141,7 @@ [(~ g!stack) ((~ g!func) (~+ g!inputs))]))))))))) (template [<arity>] - [(`` (def: .public (~~ (template.identifier ["apply/" <arity>])) + [(`` (def: .public (~~ (template.symbol ["apply/" <arity>])) (..apply <arity>)))] [1] [2] [3] [4] |