diff options
Diffstat (limited to 'new-luxc/source/luxc/lang/translation')
5 files changed, 20 insertions, 22 deletions
diff --git a/new-luxc/source/luxc/lang/translation/case.jvm.lux b/new-luxc/source/luxc/lang/translation/case.jvm.lux index cf2cdb7f1..3363e007c 100644 --- a/new-luxc/source/luxc/lang/translation/case.jvm.lux +++ b/new-luxc/source/luxc/lang/translation/case.jvm.lux @@ -10,7 +10,7 @@ (jvm ["$t" type] ["$i" inst])) ["ls" synthesis])) - [../runtime]) + [//runtime]) (def: $Object $;Type ($t;class "java.lang.Object" (list))) @@ -29,7 +29,7 @@ (|>. $i;DUP ($i;INVOKESTATIC hostL;runtime-class "pm_peek" - ($t;method (list ../runtime;$Stack) + ($t;method (list //runtime;$Stack) (#;Some $Object) (list)) false))) @@ -38,8 +38,8 @@ $;Inst (|>. ($i;INVOKESTATIC hostL;runtime-class "pm_pop" - ($t;method (list ../runtime;$Stack) - (#;Some ../runtime;$Stack) + ($t;method (list //runtime;$Stack) + (#;Some //runtime;$Stack) (list)) false))) @@ -47,8 +47,8 @@ $;Inst (|>. ($i;INVOKESTATIC hostL;runtime-class "pm_push" - ($t;method (list ../runtime;$Stack $Object) - (#;Some ../runtime;$Stack) + ($t;method (list //runtime;$Stack $Object) + (#;Some //runtime;$Stack) (list)) false))) @@ -112,18 +112,18 @@ (macro/wrap (case idx +0 (|>. peekI - ($i;CHECKCAST ($t;descriptor ../runtime;$Tuple)) + ($i;CHECKCAST ($t;descriptor //runtime;$Tuple)) ($i;int 0) $i;AALOAD pushI) _ (|>. peekI - ($i;CHECKCAST ($t;descriptor ../runtime;$Tuple)) + ($i;CHECKCAST ($t;descriptor //runtime;$Tuple)) ($i;int (nat-to-int idx)) ($i;INVOKESTATIC hostL;runtime-class <method> - ($t;method (list ../runtime;$Tuple $t;int) + ($t;method (list //runtime;$Tuple $t;int) (#;Some $Object) (list)) false) @@ -136,12 +136,12 @@ (macro/wrap (<| $i;with-label (function [@success]) $i;with-label (function [@fail]) (|>. peekI - ($i;CHECKCAST ($t;descriptor ../runtime;$Variant)) + ($i;CHECKCAST ($t;descriptor //runtime;$Variant)) ($i;int (nat-to-int idx)) <flag> ($i;INVOKESTATIC hostL;runtime-class "pm_variant" - ($t;method (list ../runtime;$Variant ../runtime;$Tag ../runtime;$Flag) - (#;Some ../runtime;$Datum) + ($t;method (list //runtime;$Variant //runtime;$Tag //runtime;$Flag) + (#;Some //runtime;$Datum) (list)) false) $i;DUP diff --git a/new-luxc/source/luxc/lang/translation/primitive.jvm.lux b/new-luxc/source/luxc/lang/translation/primitive.jvm.lux index e8522ebfc..acd3b95e3 100644 --- a/new-luxc/source/luxc/lang/translation/primitive.jvm.lux +++ b/new-luxc/source/luxc/lang/translation/primitive.jvm.lux @@ -10,8 +10,7 @@ ["$t" type])) ["la" analysis] ["ls" synthesis] - (translation [";T" common]))) - [../runtime]) + (translation [";T" common])))) (def: #export translate-unit (Meta $;Inst) diff --git a/new-luxc/source/luxc/lang/translation/procedure.jvm.lux b/new-luxc/source/luxc/lang/translation/procedure.jvm.lux index 917edd78d..14fbe2f1a 100644 --- a/new-luxc/source/luxc/lang/translation/procedure.jvm.lux +++ b/new-luxc/source/luxc/lang/translation/procedure.jvm.lux @@ -8,15 +8,15 @@ (luxc ["&" lang] (lang (host ["$" jvm]) ["ls" synthesis])) - (. ["./;" common] - ["./;" host])) + (/ ["/;" common] + ["/;" host])) (exception: #export Unknown-Procedure) (def: procedures - ./common;Bundle - (|> ./common;procedures - (dict;merge ./host;procedures))) + /common;Bundle + (|> /common;procedures + (dict;merge /host;procedures))) (def: #export (translate-procedure translate name args) (-> (-> ls;Synthesis (Meta $;Inst)) Text (List ls;Synthesis) diff --git a/new-luxc/source/luxc/lang/translation/procedure/host.jvm.lux b/new-luxc/source/luxc/lang/translation/procedure/host.jvm.lux index b020fed7b..2aa693d2c 100644 --- a/new-luxc/source/luxc/lang/translation/procedure/host.jvm.lux +++ b/new-luxc/source/luxc/lang/translation/procedure/host.jvm.lux @@ -23,7 +23,7 @@ ["la" analysis] (analysis (procedure ["&;" host])) ["ls" synthesis])) - ["@" ../common]) + ["@" //common]) (exception: #export Invalid-Syntax-For-JVM-Type) (exception: #export Invalid-Syntax-For-Argument-Generation) diff --git a/new-luxc/source/luxc/lang/translation/structure.jvm.lux b/new-luxc/source/luxc/lang/translation/structure.jvm.lux index 21d72b34b..ddb48a31e 100644 --- a/new-luxc/source/luxc/lang/translation/structure.jvm.lux +++ b/new-luxc/source/luxc/lang/translation/structure.jvm.lux @@ -14,8 +14,7 @@ ["$i" inst])) ["la" analysis] ["ls" synthesis] - (translation [";T" common]))) - [../runtime]) + (translation [";T" common])))) (exception: #export Not-A-Tuple) |