From 6031fc715b4a16b008d6f288c38739d9bb066490 Mon Sep 17 00:00:00 2001 From: Eduardo Julian Date: Sun, 26 Nov 2017 22:52:18 -0400 Subject: - Changed to the new relative imports syntax. --- new-luxc/source/luxc/lang/analysis/expression.lux | 2 +- new-luxc/source/luxc/lang/analysis/procedure.lux | 10 ++++----- .../luxc/lang/analysis/procedure/host.jvm.lux | 2 +- new-luxc/source/luxc/lang/host/jvm/def.lux | 4 ++-- new-luxc/source/luxc/lang/host/jvm/inst.lux | 4 ++-- new-luxc/source/luxc/lang/host/jvm/type.lux | 12 +++++------ new-luxc/source/luxc/lang/translation/case.jvm.lux | 24 +++++++++++----------- .../source/luxc/lang/translation/primitive.jvm.lux | 3 +-- .../source/luxc/lang/translation/procedure.jvm.lux | 10 ++++----- .../luxc/lang/translation/procedure/host.jvm.lux | 2 +- .../source/luxc/lang/translation/structure.jvm.lux | 3 +-- 11 files changed, 37 insertions(+), 39 deletions(-) (limited to 'new-luxc') diff --git a/new-luxc/source/luxc/lang/analysis/expression.lux b/new-luxc/source/luxc/lang/analysis/expression.lux index 6abe8e62b..b16499c01 100644 --- a/new-luxc/source/luxc/lang/analysis/expression.lux +++ b/new-luxc/source/luxc/lang/analysis/expression.lux @@ -15,7 +15,7 @@ [";L" macro] ["la" analysis] (translation [";T" common]))) - (.. [";A" common] + (// [";A" common] [";A" function] [";A" primitive] [";A" reference] diff --git a/new-luxc/source/luxc/lang/analysis/procedure.lux b/new-luxc/source/luxc/lang/analysis/procedure.lux index 23e1a102d..4e9843ddd 100644 --- a/new-luxc/source/luxc/lang/analysis/procedure.lux +++ b/new-luxc/source/luxc/lang/analysis/procedure.lux @@ -8,15 +8,15 @@ (coll [dict]))) (luxc ["&" lang] (lang ["la" analysis])) - (. ["./;" 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 (analyse-procedure analyse eval proc-name proc-args) (-> &;Analyser &;Eval Text (List Code) (Meta la;Analysis)) diff --git a/new-luxc/source/luxc/lang/analysis/procedure/host.jvm.lux b/new-luxc/source/luxc/lang/analysis/procedure/host.jvm.lux index fad31eca0..bb388434f 100644 --- a/new-luxc/source/luxc/lang/analysis/procedure/host.jvm.lux +++ b/new-luxc/source/luxc/lang/analysis/procedure/host.jvm.lux @@ -25,7 +25,7 @@ ["la" analysis] (analysis ["&;" common] [";A" inference]))) - ["@" ../common] + ["@" //common] ) (exception: #export Wrong-Syntax) diff --git a/new-luxc/source/luxc/lang/host/jvm/def.lux b/new-luxc/source/luxc/lang/host/jvm/def.lux index 60009fb5c..ec1de6b43 100644 --- a/new-luxc/source/luxc/lang/host/jvm/def.lux +++ b/new-luxc/source/luxc/lang/host/jvm/def.lux @@ -6,8 +6,8 @@ (coll ["a" array] [list "list/" Functor])) [host #+ do-to]) - ["$" ..] - (.. ["$t" type])) + ["$" //] + (// ["$t" type])) ## [Host] (host;import #long java.lang.Object) diff --git a/new-luxc/source/luxc/lang/host/jvm/inst.lux b/new-luxc/source/luxc/lang/host/jvm/inst.lux index dc2909b69..e0c10feca 100644 --- a/new-luxc/source/luxc/lang/host/jvm/inst.lux +++ b/new-luxc/source/luxc/lang/host/jvm/inst.lux @@ -10,8 +10,8 @@ [macro] (macro [code] ["s" syntax #+ syntax:])) - ["$" ..] - (.. ["$t" type])) + ["$" //] + (// ["$t" type])) ## [Host] (host;import #long java.lang.Object) diff --git a/new-luxc/source/luxc/lang/host/jvm/type.lux b/new-luxc/source/luxc/lang/host/jvm/type.lux index 3825d443b..03246540c 100644 --- a/new-luxc/source/luxc/lang/host/jvm/type.lux +++ b/new-luxc/source/luxc/lang/host/jvm/type.lux @@ -2,8 +2,8 @@ [lux #- char] (lux (data [text] text/format - (coll [list "L/" Functor]))) - ["$" ..]) + (coll [list "list/" Functor]))) + ["$" //]) ## Types (do-template [ ] @@ -91,7 +91,7 @@ "" (format "<" (|> params - (L/map (|>. #$;Generic signature)) + (list/map (|>. #$;Generic signature)) (text;join-with "")) ">"))] (format "L" (binary-name class) =params ";")) @@ -116,7 +116,7 @@ (def: #export (method-descriptor method) (-> $;Method Text) - (format "(" (text;join-with "" (L/map descriptor (get@ #$;args method))) ")" + (format "(" (text;join-with "" (list/map descriptor (get@ #$;args method))) ")" (case (get@ #$;return method) #;None "V" @@ -126,7 +126,7 @@ (def: #export (method-signature method) (-> $;Method Text) - (format "(" (|> (get@ #$;args method) (L/map signature) (text;join-with "")) ")" + (format "(" (|> (get@ #$;args method) (list/map signature) (text;join-with "")) ")" (case (get@ #$;return method) #;None "V" @@ -134,5 +134,5 @@ (#;Some return) (signature return)) (|> (get@ #$;exceptions method) - (L/map (|>. #$;Generic signature (format "^"))) + (list/map (|>. #$;Generic signature (format "^"))) (text;join-with "")))) 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 - ($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)) ($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) -- cgit v1.2.3