aboutsummaryrefslogtreecommitdiff
path: root/lux-jvm/source/luxc/lang
diff options
context:
space:
mode:
Diffstat (limited to 'lux-jvm/source/luxc/lang')
-rw-r--r--lux-jvm/source/luxc/lang/host/jvm/inst.lux4
-rw-r--r--lux-jvm/source/luxc/lang/synthesis/variable.lux20
-rw-r--r--lux-jvm/source/luxc/lang/translation/jvm/expression.lux4
-rw-r--r--lux-jvm/source/luxc/lang/translation/jvm/extension/host.lux36
-rw-r--r--lux-jvm/source/luxc/lang/translation/jvm/loop.lux2
5 files changed, 33 insertions, 33 deletions
diff --git a/lux-jvm/source/luxc/lang/host/jvm/inst.lux b/lux-jvm/source/luxc/lang/host/jvm/inst.lux
index fbb6da059..1384d1a73 100644
--- a/lux-jvm/source/luxc/lang/host/jvm/inst.lux
+++ b/lux-jvm/source/luxc/lang/host/jvm/inst.lux
@@ -379,7 +379,7 @@
(exec
(ffi.write! idx (ffi.long_to_int key) keys_array)
(ffi.write! idx label labels_array)
- (recur (++ idx))))
+ (again (++ idx))))
[]))]
(do_to visitor
(org/objectweb/asm/MethodVisitor::visitLookupSwitchInsn default keys_array labels_array)))))
@@ -394,7 +394,7 @@
(exec (ffi.write! idx
(maybe.trusted (list.item idx labels))
labels_array)
- (recur (++ idx)))
+ (again (++ idx)))
[]))]
(do_to visitor
(org/objectweb/asm/MethodVisitor::visitTableSwitchInsn min max default labels_array)))))
diff --git a/lux-jvm/source/luxc/lang/synthesis/variable.lux b/lux-jvm/source/luxc/lang/synthesis/variable.lux
index 927ec84e3..02f3c0757 100644
--- a/lux-jvm/source/luxc/lang/synthesis/variable.lux
+++ b/lux-jvm/source/luxc/lang/synthesis/variable.lux
@@ -56,32 +56,32 @@
tracker)
{ls.#Variant tag last? memberS}
- (recur memberS tracker)
+ (again memberS tracker)
{ls.#Tuple membersS}
- (list/mix recur tracker membersS)
+ (list/mix again tracker membersS)
{ls.#Call funcS argsS}
- (list/mix recur (recur funcS tracker) argsS)
+ (list/mix again (again funcS tracker) argsS)
- (^or {ls.#Recur argsS}
+ (^or {ls.#Again argsS}
{ls.#Procedure name argsS})
- (list/mix recur tracker argsS)
+ (list/mix again tracker argsS)
{ls.#Let offset inputS outputS}
- (|> tracker (recur inputS) (recur outputS))
+ (|> tracker (again inputS) (again outputS))
{ls.#If testS thenS elseS}
- (|> tracker (recur testS) (recur thenS) (recur elseS))
+ (|> tracker (again testS) (again thenS) (again elseS))
{ls.#Loop offset initsS bodyS}
- (recur bodyS (list/mix recur tracker initsS))
+ (again bodyS (list/mix again tracker initsS))
{ls.#Case inputS outputPS}
(let [tracker' (list/mix s.has
- (recur inputS tracker)
+ (again inputS tracker)
(bound-vars outputPS))]
- (list/mix recur tracker' (path-bodies outputPS)))
+ (list/mix again tracker' (path-bodies outputPS)))
{ls.#Function arity env bodyS}
(list/mix s.lacks tracker env)
diff --git a/lux-jvm/source/luxc/lang/translation/jvm/expression.lux b/lux-jvm/source/luxc/lang/translation/jvm/expression.lux
index de8ac3c12..087cc8c3b 100644
--- a/lux-jvm/source/luxc/lang/translation/jvm/expression.lux
+++ b/lux-jvm/source/luxc/lang/translation/jvm/expression.lux
@@ -59,8 +59,8 @@
(^ (synthesis.branch/case data))
(case.case translate archive data)
- (^ (synthesis.loop/recur data))
- (loop.recur translate archive data)
+ (^ (synthesis.loop/again data))
+ (loop.again translate archive data)
(^ (synthesis.loop/scope data))
(loop.scope translate archive data)
diff --git a/lux-jvm/source/luxc/lang/translation/jvm/extension/host.lux b/lux-jvm/source/luxc/lang/translation/jvm/extension/host.lux
index e32e35869..a8becd813 100644
--- a/lux-jvm/source/luxc/lang/translation/jvm/extension/host.lux
+++ b/lux-jvm/source/luxc/lang/translation/jvm/extension/host.lux
@@ -831,7 +831,7 @@
body
{synthesis.#Seq _ next}
- (recur next)
+ (again next)
{synthesis.#Then hidden}
hidden))
@@ -867,14 +867,14 @@
(def: (normalize_path normalize)
(-> (-> Synthesis Synthesis)
(-> Path Path))
- (function (recur path)
+ (function (again path)
(case path
(^ (synthesis.path/then bodyS))
(synthesis.path/then (normalize bodyS))
(^template [<tag>]
[(^ {<tag> leftP rightP})
- {<tag> (recur leftP) (recur rightP)}])
+ {<tag> (again leftP) (again rightP)}])
([synthesis.#Alt]
[synthesis.#Seq])
@@ -886,13 +886,13 @@
[synthesis.#Access])
{synthesis.#Bit_Fork when then else}
- {synthesis.#Bit_Fork when (recur then) (maybe#each recur else)}
+ {synthesis.#Bit_Fork when (again then) (maybe#each again else)}
(^template [<tag>]
[{<tag> [[test then] elses]}
- {<tag> [[test (recur then)]
+ {<tag> [[test (again then)]
(list#each (function (_ [else_test else_then])
- [else_test (recur else_then)])
+ [else_test (again else_then)])
elses)]}])
([synthesis.#I64_Fork]
[synthesis.#F64_Fork]
@@ -901,7 +901,7 @@
(def: (normalize_method_body mapping)
(-> (Dictionary Synthesis Variable) Synthesis Synthesis)
- (function (recur body)
+ (function (again body)
(case body
(^ {synthesis.#Primitive value})
body
@@ -910,10 +910,10 @@
body
(^ (synthesis.variant [lefts right? sub]))
- (synthesis.variant [lefts right? (recur sub)])
+ (synthesis.variant [lefts right? (again sub)])
(^ (synthesis.tuple members))
- (synthesis.tuple (list#each recur members))
+ (synthesis.tuple (list#each again members))
(^ (synthesis.variable var))
(|> mapping
@@ -922,22 +922,22 @@
synthesis.variable)
(^ (synthesis.branch/case [inputS pathS]))
- (synthesis.branch/case [(recur inputS) (normalize_path recur pathS)])
+ (synthesis.branch/case [(again inputS) (normalize_path again pathS)])
(^ (synthesis.branch/let [inputS register outputS]))
- (synthesis.branch/let [(recur inputS) register (recur outputS)])
+ (synthesis.branch/let [(again inputS) register (again outputS)])
(^ (synthesis.branch/if [testS thenS elseS]))
- (synthesis.branch/if [(recur testS) (recur thenS) (recur elseS)])
+ (synthesis.branch/if [(again testS) (again thenS) (again elseS)])
(^ (synthesis.branch/get [path recordS]))
- (synthesis.branch/get [path (recur recordS)])
+ (synthesis.branch/get [path (again recordS)])
(^ (synthesis.loop/scope [offset initsS+ bodyS]))
- (synthesis.loop/scope [offset (list#each recur initsS+) (recur bodyS)])
+ (synthesis.loop/scope [offset (list#each again initsS+) (again bodyS)])
- (^ (synthesis.loop/recur updatesS+))
- (synthesis.loop/recur (list#each recur updatesS+))
+ (^ (synthesis.loop/again updatesS+))
+ (synthesis.loop/again (list#each again updatesS+))
(^ (synthesis.function/abstraction [environment arity bodyS]))
(synthesis.function/abstraction [(list#each (function (_ captured)
@@ -955,10 +955,10 @@
bodyS])
(^ (synthesis.function/apply [functionS inputsS+]))
- (synthesis.function/apply [(recur functionS) (list#each recur inputsS+)])
+ (synthesis.function/apply [(again functionS) (list#each again inputsS+)])
{synthesis.#Extension [name inputsS+]}
- {synthesis.#Extension [name (list#each recur inputsS+)]})))
+ {synthesis.#Extension [name (list#each again inputsS+)]})))
(def: $Object
(type.class "java.lang.Object" (list)))
diff --git a/lux-jvm/source/luxc/lang/translation/jvm/loop.lux b/lux-jvm/source/luxc/lang/translation/jvm/loop.lux
index ad0b41e4e..f31a5d094 100644
--- a/lux-jvm/source/luxc/lang/translation/jvm/loop.lux
+++ b/lux-jvm/source/luxc/lang/translation/jvm/loop.lux
@@ -36,7 +36,7 @@
_
false))
-(def: .public (recur translate archive argsS)
+(def: .public (again translate archive argsS)
(Generator (List Synthesis))
(do [@ phase.monad]
[[@begin start] generation.anchor