diff options
| author | Eduardo Julian | 2021-08-12 03:12:42 -0400 |
|---|---|---|
| committer | Eduardo Julian | 2021-08-12 03:12:42 -0400 |
| commit | 17629d66062b88b040a2397032f6c08361a5f3a7 (patch) | |
| tree | bdc6110750b895667b9e45da5e46bec9609f9a7c /lux-r | |
| parent | a62ce3f9c2b605e0033f4772b0f64c4525de4d86 (diff) | |
Improved binding syntax for "syntax:".
Diffstat (limited to 'lux-r')
| -rw-r--r-- | lux-r/source/luxc/lang/synthesis/variable.lux | 8 | ||||
| -rw-r--r-- | lux-r/source/program.lux | 6 |
2 files changed, 8 insertions, 6 deletions
diff --git a/lux-r/source/luxc/lang/synthesis/variable.lux b/lux-r/source/luxc/lang/synthesis/variable.lux index 932cb3dcb..f747a82df 100644 --- a/lux-r/source/luxc/lang/synthesis/variable.lux +++ b/lux-r/source/luxc/lang/synthesis/variable.lux @@ -46,11 +46,11 @@ (def: (unused-vars current-arity bound exprS) (-> ls.Arity (List Variable) ls.Synthesis (List Variable)) (let [tracker (loop [exprS exprS - tracker (list/fold s.add init-tracker bound)] + tracker (list/fold s.has init-tracker bound)] (case exprS (#ls.Variable var) (if (non-arg? current-arity var) - (s.remove var tracker) + (s.lacks var tracker) tracker) (#ls.Variant tag last? memberS) @@ -76,13 +76,13 @@ (recur bodyS (list/fold recur tracker initsS)) (#ls.Case inputS outputPS) - (let [tracker' (list/fold s.add + (let [tracker' (list/fold s.has (recur inputS tracker) (bound-vars outputPS))] (list/fold recur tracker' (path-bodies outputPS))) (#ls.Function arity env bodyS) - (list/fold s.remove tracker env) + (list/fold s.lacks tracker env) _ tracker diff --git a/lux-r/source/program.lux b/lux-r/source/program.lux index 245883eb4..de859ba50 100644 --- a/lux-r/source/program.lux +++ b/lux-r/source/program.lux @@ -12,7 +12,9 @@ ["." exception (#+ exception:)] ["." io (#+ IO io)] [concurrency - ["." promise (#+ Promise)]]] + ["." promise (#+ Promise)]] + [parser + ["<.>" code]]] [data ["." text ("#\." hash) ["%" format (#+ format)] @@ -176,7 +178,7 @@ ... (|>> (case> #0 (org/armedbear/lisp/Nil::NIL) ... #1 (org/armedbear/lisp/Symbol::T)))) -(syntax: (%%code term) +(syntax: (%%code [term <code>.any]) (wrap (list (code.text (%.code term))))) (def: (host_value value) |