diff options
Diffstat (limited to 'new-luxc/source/luxc/lang/translation')
12 files changed, 134 insertions, 134 deletions
diff --git a/new-luxc/source/luxc/lang/translation/case.jvm.lux b/new-luxc/source/luxc/lang/translation/case.jvm.lux index e3052c77d..cf2cdb7f1 100644 --- a/new-luxc/source/luxc/lang/translation/case.jvm.lux +++ b/new-luxc/source/luxc/lang/translation/case.jvm.lux @@ -3,7 +3,7 @@ (lux (control [monad #+ do] ["ex" exception #+ exception:]) (data text/format) - [meta "meta/" Monad<Meta>]) + [macro "macro/" Monad<Meta>]) (luxc ["_" lang] (lang [";L" host] (host ["$" jvm] @@ -59,111 +59,111 @@ Nat $;Label $;Label ls;Path (Meta $;Inst)) (case path (^ [_ (#;Form (list [_ (#;Text "lux case exec")] bodyS))]) - (do meta;Monad<Meta> + (do macro;Monad<Meta> [bodyI (translate bodyS)] (wrap (|>. (pop-altI stack-depth) bodyI ($i;GOTO @end)))) (^ [_ (#;Form (list [_ (#;Text "lux case pop")]))]) - (meta/wrap popI) + (macro/wrap popI) (^ [_ (#;Form (list [_ (#;Text "lux case bind")] [_ (#;Nat register)]))]) - (meta/wrap (|>. peekI - ($i;ASTORE register))) + (macro/wrap (|>. peekI + ($i;ASTORE register))) [_ (#;Bool value)] - (meta/wrap (let [jumpI (if value $i;IFEQ $i;IFNE)] - (|>. peekI - ($i;unwrap #$;Boolean) - (jumpI @else)))) + (macro/wrap (let [jumpI (if value $i;IFEQ $i;IFNE)] + (|>. peekI + ($i;unwrap #$;Boolean) + (jumpI @else)))) (^template [<tag> <prep>] [_ (<tag> value)] - (meta/wrap (|>. peekI - ($i;unwrap #$;Long) - ($i;long (|> value <prep>)) - $i;LCMP - ($i;IFNE @else)))) + (macro/wrap (|>. peekI + ($i;unwrap #$;Long) + ($i;long (|> value <prep>)) + $i;LCMP + ($i;IFNE @else)))) ([#;Nat (:! Int)] [#;Int (: Int)] [#;Deg (:! Int)]) [_ (#;Frac value)] - (meta/wrap (|>. peekI - ($i;unwrap #$;Double) - ($i;double value) - $i;DCMPL - ($i;IFNE @else))) + (macro/wrap (|>. peekI + ($i;unwrap #$;Double) + ($i;double value) + $i;DCMPL + ($i;IFNE @else))) [_ (#;Text value)] - (meta/wrap (|>. peekI - ($i;string value) - ($i;INVOKEVIRTUAL "java.lang.Object" - "equals" - ($t;method (list $Object) - (#;Some $t;boolean) - (list)) - false) - ($i;IFEQ @else))) + (macro/wrap (|>. peekI + ($i;string value) + ($i;INVOKEVIRTUAL "java.lang.Object" + "equals" + ($t;method (list $Object) + (#;Some $t;boolean) + (list)) + false) + ($i;IFEQ @else))) (^template [<special> <method>] (^ [_ (#;Form (list [_ (#;Text <special>)] [_ (#;Nat idx)]))]) - (meta/wrap (case idx - +0 - (|>. peekI - ($i;CHECKCAST ($t;descriptor ../runtime;$Tuple)) - ($i;int 0) - $i;AALOAD - pushI) - - _ - (|>. peekI - ($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) - (#;Some $Object) - (list)) - false) - pushI)))) + (macro/wrap (case idx + +0 + (|>. peekI + ($i;CHECKCAST ($t;descriptor ../runtime;$Tuple)) + ($i;int 0) + $i;AALOAD + pushI) + + _ + (|>. peekI + ($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) + (#;Some $Object) + (list)) + false) + pushI)))) (["lux case tuple left" "pm_left"] ["lux case tuple right" "pm_right"]) (^template [<special> <flag>] (^ [_ (#;Form (list [_ (#;Text <special>)] [_ (#;Nat idx)]))]) - (meta/wrap (<| $i;with-label (function [@success]) - $i;with-label (function [@fail]) - (|>. peekI - ($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) - (list)) - false) - $i;DUP - ($i;IFNULL @fail) - ($i;GOTO @success) - ($i;label @fail) - $i;POP - ($i;GOTO @else) - ($i;label @success) - pushI)))) + (macro/wrap (<| $i;with-label (function [@success]) + $i;with-label (function [@fail]) + (|>. peekI + ($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) + (list)) + false) + $i;DUP + ($i;IFNULL @fail) + ($i;GOTO @success) + ($i;label @fail) + $i;POP + ($i;GOTO @else) + ($i;label @success) + pushI)))) (["lux case variant left" $i;NULL] ["lux case variant right" ($i;string "")]) (^ [_ (#;Form (list [_ (#;Text "lux case seq")] leftP rightP))]) - (do meta;Monad<Meta> + (do macro;Monad<Meta> [leftI (translate-path' translate stack-depth @else @end leftP) rightI (translate-path' translate stack-depth @else @end rightP)] (wrap (|>. leftI rightI))) (^ [_ (#;Form (list [_ (#;Text "lux case alt")] leftP rightP))]) - (do meta;Monad<Meta> + (do macro;Monad<Meta> [@alt-else $i;make-label leftI (translate-path' translate (n.inc stack-depth) @alt-else @end leftP) rightI (translate-path' translate stack-depth @else @end rightP)] @@ -179,7 +179,7 @@ (def: (translate-path translate path @end) (-> (-> ls;Synthesis (Meta $;Inst)) ls;Path $;Label (Meta $;Inst)) - (do meta;Monad<Meta> + (do macro;Monad<Meta> [@else $i;make-label pathI (translate-path' translate +1 @else @end path)] (wrap (|>. pathI @@ -208,7 +208,7 @@ (def: #export (translate-case translate valueS path) (-> (-> ls;Synthesis (Meta $;Inst)) ls;Synthesis ls;Path (Meta $;Inst)) - (do meta;Monad<Meta> + (do macro;Monad<Meta> [@end $i;make-label valueI (translate valueS) pathI (translate-path translate path @end)] @@ -222,7 +222,7 @@ (def: #export (translate-let translate register inputS exprS) (-> (-> ls;Synthesis (Meta $;Inst)) Nat ls;Synthesis ls;Synthesis (Meta $;Inst)) - (do meta;Monad<Meta> + (do macro;Monad<Meta> [inputI (translate inputS) exprI (translate exprS)] (wrap (|>. inputI diff --git a/new-luxc/source/luxc/lang/translation/eval.jvm.lux b/new-luxc/source/luxc/lang/translation/eval.jvm.lux index 3c4eea048..11baa3856 100644 --- a/new-luxc/source/luxc/lang/translation/eval.jvm.lux +++ b/new-luxc/source/luxc/lang/translation/eval.jvm.lux @@ -2,7 +2,7 @@ lux (lux (control monad) (data text/format) - [meta] + [macro] [host #+ do-to]) (luxc ["&" lang] (lang (host ["$" jvm] @@ -55,8 +55,8 @@ (def: #export (eval valueI) (-> $;Inst (Meta Top)) - (do meta;Monad<Meta> - [class-name (:: @ map %code (meta;gensym "eval")) + (do macro;Monad<Meta> + [class-name (:: @ map %code (macro;gensym "eval")) #let [writer (|> (do-to (ClassWriter.new ClassWriter.COMPUTE_MAXS) (ClassWriter.visit [commonT;bytecode-version (i.+ Opcodes.ACC_PUBLIC Opcodes.ACC_SUPER) diff --git a/new-luxc/source/luxc/lang/translation/expression.jvm.lux b/new-luxc/source/luxc/lang/translation/expression.jvm.lux index d592c5001..65bb5b772 100644 --- a/new-luxc/source/luxc/lang/translation/expression.jvm.lux +++ b/new-luxc/source/luxc/lang/translation/expression.jvm.lux @@ -5,8 +5,8 @@ ["p" parser]) (data ["e" error] text/format) - [meta] - (meta ["s" syntax])) + [macro] + (macro ["s" syntax])) (luxc ["&" lang] (lang [";L" variable #+ Variable Register] (host ["$" jvm]) diff --git a/new-luxc/source/luxc/lang/translation/function.jvm.lux b/new-luxc/source/luxc/lang/translation/function.jvm.lux index d12eca16e..d8a2077bc 100644 --- a/new-luxc/source/luxc/lang/translation/function.jvm.lux +++ b/new-luxc/source/luxc/lang/translation/function.jvm.lux @@ -4,7 +4,7 @@ (data [text] text/format (coll [list "list/" Functor<List> Monoid<List>])) - [meta]) + [macro]) (luxc ["&" lang] (lang [";L" host] (host ["$" jvm] @@ -103,7 +103,7 @@ (def: (instance class arity env) (-> Text ls;Arity (List Variable) (Meta $;Inst)) - (do meta;Monad<Meta> + (do macro;Monad<Meta> [captureI+ (monad;map @ referenceT;translate-variable env) #let [argsI (if (poly-arg? arity) (|> (nullsI (n.dec arity)) @@ -278,7 +278,7 @@ (with-reset class arity env) applyD ))] - (do meta;Monad<Meta> + (do macro;Monad<Meta> [instanceI (instance class arity env)] (wrap [functionD instanceI])))) @@ -286,7 +286,7 @@ (-> (-> ls;Synthesis (Meta $;Inst)) (List Variable) ls;Arity ls;Synthesis (Meta $;Inst)) - (do meta;Monad<Meta> + (do macro;Monad<Meta> [@begin $i;make-label [function-class bodyI] (hostL;with-sub-context (hostL;with-anchor [@begin +1] @@ -310,7 +310,7 @@ (-> (-> ls;Synthesis (Meta $;Inst)) ls;Synthesis (List ls;Synthesis) (Meta $;Inst)) - (do meta;Monad<Meta> + (do macro;Monad<Meta> [functionI (translate functionS) argsI (monad;map @ translate argsS) #let [applyI (|> (segment runtimeT;num-apply-variants argsI) diff --git a/new-luxc/source/luxc/lang/translation/loop.jvm.lux b/new-luxc/source/luxc/lang/translation/loop.jvm.lux index b5497236f..f5830bf9e 100644 --- a/new-luxc/source/luxc/lang/translation/loop.jvm.lux +++ b/new-luxc/source/luxc/lang/translation/loop.jvm.lux @@ -4,7 +4,7 @@ (data [text] text/format (coll [list "list/" Functor<List> Monoid<List>])) - [meta]) + [macro]) (luxc ["&" lang] (lang [";L" host] (host ["$" jvm] @@ -22,7 +22,7 @@ (-> (-> ls;Synthesis (Meta $;Inst)) (List ls;Synthesis) (Meta $;Inst)) - (do meta;Monad<Meta> + (do macro;Monad<Meta> [[@begin offset] hostL;anchor argsI (monad;map @ (function [[register argS]] (let [register' (|> register (n.+ offset))] @@ -47,7 +47,7 @@ (-> (-> ls;Synthesis (Meta $;Inst)) Nat (List ls;Synthesis) ls;Synthesis (Meta $;Inst)) - (do meta;Monad<Meta> + (do macro;Monad<Meta> [@begin $i;make-label initsI+ (monad;map @ translate initsS+) bodyI (hostL;with-anchor [@begin (n.inc offset)] diff --git a/new-luxc/source/luxc/lang/translation/primitive.jvm.lux b/new-luxc/source/luxc/lang/translation/primitive.jvm.lux index f059aa8da..e8522ebfc 100644 --- a/new-luxc/source/luxc/lang/translation/primitive.jvm.lux +++ b/new-luxc/source/luxc/lang/translation/primitive.jvm.lux @@ -2,7 +2,7 @@ lux (lux (control monad) (data text/format) - [meta "meta/" Monad<Meta>]) + [macro "macro/" Monad<Meta>]) (luxc ["&" lang] (lang [";L" host] (host ["$" jvm] @@ -15,18 +15,18 @@ (def: #export translate-unit (Meta $;Inst) - (meta/wrap ($i;string hostL;unit))) + (macro/wrap ($i;string hostL;unit))) (def: #export (translate-bool value) (-> Bool (Meta $;Inst)) - (meta/wrap ($i;GETSTATIC "java.lang.Boolean" - (if value "TRUE" "FALSE") - ($t;class "java.lang.Boolean" (list))))) + (macro/wrap ($i;GETSTATIC "java.lang.Boolean" + (if value "TRUE" "FALSE") + ($t;class "java.lang.Boolean" (list))))) (do-template [<name> <type> <load> <wrap>] [(def: #export (<name> value) (-> <type> (Meta $;Inst)) - (meta/wrap (|>. (<load> value) <wrap>)))] + (macro/wrap (|>. (<load> value) <wrap>)))] [translate-nat Nat (|>. (:! Int) $i;long) ($i;wrap #$;Long)] [translate-int Int $i;long ($i;wrap #$;Long)] diff --git a/new-luxc/source/luxc/lang/translation/procedure/common.jvm.lux b/new-luxc/source/luxc/lang/translation/procedure/common.jvm.lux index 3cab88e48..0e17f99a6 100644 --- a/new-luxc/source/luxc/lang/translation/procedure/common.jvm.lux +++ b/new-luxc/source/luxc/lang/translation/procedure/common.jvm.lux @@ -8,9 +8,9 @@ text/format (coll [list "list/" Functor<List>] [dict #+ Dict])) - [meta #+ with-gensyms] - (meta [code] - ["s" syntax #+ syntax:]) + [macro #+ with-gensyms] + (macro [code] + ["s" syntax #+ syntax:]) [host]) (luxc ["&" lang] (lang [";L" host] @@ -84,7 +84,7 @@ (syntax: (arity: [name s;local-symbol] [arity s;nat]) (with-gensyms [g!proc g!name g!translate g!inputs] (do @ - [g!input+ (monad;seq @ (list;repeat arity (meta;gensym "input")))] + [g!input+ (monad;seq @ (list;repeat arity (macro;gensym "input")))] (wrap (list (` (def: #export ((~ (code;local-symbol name)) (~ g!proc)) (-> (-> (;;Vector (~ (code;nat arity)) $;Inst) $;Inst) (-> Text ;;Proc)) @@ -92,7 +92,7 @@ (function [(~ g!translate) (~ g!inputs)] (case (~ g!inputs) (^ (list (~@ g!input+))) - (do meta;Monad<Meta> + (do macro;Monad<Meta> [(~@ (|> g!input+ (list/map (function [g!input] (list g!input (` ((~ g!translate) (~ g!input)))))) @@ -100,7 +100,7 @@ ((~' wrap) ((~ g!proc) [(~@ g!input+)]))) (~' _) - (meta;fail (wrong-arity (~ g!name) +1 (list;size (~ g!inputs)))))))))))))) + (macro;fail (wrong-arity (~ g!name) +1 (list;size (~ g!inputs)))))))))))))) (arity: nullary +0) (arity: unary +1) @@ -111,7 +111,7 @@ (-> Variadic (-> Text Proc)) (function [proc-name] (function [translate inputsS] - (do meta;Monad<Meta> + (do macro;Monad<Meta> [inputsI (monad;map @ translate inputsS)] (wrap (proc inputsI)))))) 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 8a28e3cf7..b020fed7b 100644 --- a/new-luxc/source/luxc/lang/translation/procedure/host.jvm.lux +++ b/new-luxc/source/luxc/lang/translation/procedure/host.jvm.lux @@ -10,9 +10,9 @@ ["l" lexer]) (coll [list "list/" Functor<List>] [dict #+ Dict])) - [meta "meta/" Monad<Meta>] - (meta [code] - ["s" syntax #+ syntax:]) + [macro "macro/" Monad<Meta>] + (macro [code] + ["s" syntax #+ syntax:]) [host]) (luxc ["&" lang] (lang [";L" host] @@ -280,7 +280,7 @@ (-> Text @;Proc) (case inputs (^ (list [_ (#;Nat level)] [_ (#;Text class)] lengthS)) - (do meta;Monad<Meta> + (do macro;Monad<Meta> [lengthI (translate lengthS) #let [arrayJT ($t;array level (case class "boolean" $t;boolean @@ -304,7 +304,7 @@ (-> Text @;Proc) (case inputs (^ (list [_ (#;Text class)] idxS arrayS)) - (do meta;Monad<Meta> + (do macro;Monad<Meta> [arrayI (translate arrayS) idxI (translate idxS) #let [loadI (case class @@ -330,7 +330,7 @@ (-> Text @;Proc) (case inputs (^ (list [_ (#;Text class)] idxS valueS arrayS)) - (do meta;Monad<Meta> + (do macro;Monad<Meta> [arrayI (translate arrayS) idxI (translate idxS) valueI (translate valueS) @@ -399,7 +399,7 @@ (-> Text @;Proc) (case inputs (^ (list [_ (#;Text class)])) - (do meta;Monad<Meta> + (do macro;Monad<Meta> [] (wrap (|>. ($i;string class) ($i;INVOKESTATIC "java.lang.Class" "forName" @@ -415,7 +415,7 @@ (-> Text @;Proc) (case inputs (^ (list [_ (#;Text class)] objectS)) - (do meta;Monad<Meta> + (do macro;Monad<Meta> [objectI (translate objectS)] (wrap (|>. objectI ($i;INSTANCEOF class) @@ -452,7 +452,7 @@ (-> Text @;Proc) (case inputs (^ (list [_ (#;Text class)] [_ (#;Text field)] [_ (#;Text unboxed)])) - (do meta;Monad<Meta> + (do macro;Monad<Meta> [] (case (dict;get unboxed primitives) (#;Some primitive) @@ -479,7 +479,7 @@ (-> Text @;Proc) (case inputs (^ (list [_ (#;Text class)] [_ (#;Text field)] [_ (#;Text unboxed)] valueS)) - (do meta;Monad<Meta> + (do macro;Monad<Meta> [valueI (translate valueS)] (case (dict;get unboxed primitives) (#;Some primitive) @@ -511,7 +511,7 @@ (-> Text @;Proc) (case inputs (^ (list [_ (#;Text class)] [_ (#;Text field)] [_ (#;Text unboxed)] objectS)) - (do meta;Monad<Meta> + (do macro;Monad<Meta> [objectI (translate objectS)] (case (dict;get unboxed primitives) (#;Some primitive) @@ -542,7 +542,7 @@ (-> Text @;Proc) (case inputs (^ (list [_ (#;Text class)] [_ (#;Text field)] [_ (#;Text unboxed)] valueS objectS)) - (do meta;Monad<Meta> + (do macro;Monad<Meta> [valueI (translate valueS) objectI (translate objectS)] (case (dict;get unboxed primitives) @@ -605,7 +605,7 @@ (&;throw Invalid-Syntax-For-JVM-Type argD) (#e;Success type) - (meta/wrap type))) + (macro/wrap type))) (def: (prepare-input inputT inputI) (-> $;Type $;Inst $;Inst) @@ -629,10 +629,10 @@ (Meta (List [$;Type $;Inst]))) (case argsS #;Nil - (meta/wrap #;Nil) + (macro/wrap #;Nil) (^ (list& [_ (#;Tuple (list [_ (#;Text argD)] argS))] tail)) - (do meta;Monad<Meta> + (do macro;Monad<Meta> [argT (translate-type argD) argI (:: @ map (prepare-input argT) (translate argS)) =tail (translate-args translate tail)] @@ -645,10 +645,10 @@ (-> Text (Meta (Maybe $;Type))) (case description "void" - (meta/wrap #;None) + (macro/wrap #;None) _ - (meta/map (|>. #;Some) (translate-type description)))) + (macro/map (|>. #;Some) (translate-type description)))) (def: (prepare-return returnT returnI) (-> (Maybe $;Type) $;Inst $;Inst) @@ -670,7 +670,7 @@ (case inputs (^ (list& [_ (#;Text class)] [_ (#;Text method)] [_ (#;Text unboxed)] argsS)) - (do meta;Monad<Meta> + (do macro;Monad<Meta> [argsTI (translate-args translate argsS) returnT (method-return-type unboxed) #let [callI (|>. ($i;fuse (list/map product;right argsTI)) @@ -688,7 +688,7 @@ (case inputs (^ (list& [_ (#;Text class)] [_ (#;Text method)] [_ (#;Text unboxed)] objectS argsS)) - (do meta;Monad<Meta> + (do macro;Monad<Meta> [objectI (translate objectS) argsTI (translate-args translate argsS) returnT (method-return-type unboxed) @@ -712,7 +712,7 @@ (-> Text @;Proc) (case inputs (^ (list& [_ (#;Text class)] argsS)) - (do meta;Monad<Meta> + (do macro;Monad<Meta> [argsTI (translate-args translate argsS)] (wrap (|>. ($i;NEW class) $i;DUP diff --git a/new-luxc/source/luxc/lang/translation/reference.jvm.lux b/new-luxc/source/luxc/lang/translation/reference.jvm.lux index b714558b8..9d0cc91e4 100644 --- a/new-luxc/source/luxc/lang/translation/reference.jvm.lux +++ b/new-luxc/source/luxc/lang/translation/reference.jvm.lux @@ -3,7 +3,7 @@ (lux (control [monad #+ do]) (data [text "text/" Hash<Text>] text/format) - [meta "meta/" Monad<Meta>]) + [macro "macro/" Monad<Meta>]) (luxc ["&" lang] (lang [";L" host] (host ["$" jvm] @@ -24,7 +24,7 @@ (def: #export (translate-captured variable) (-> Variable (Meta $;Inst)) - (do meta;Monad<Meta> + (do macro;Monad<Meta> [function-class hostL;context] (wrap (|>. ($i;ALOAD +0) ($i;GETFIELD function-class @@ -33,7 +33,7 @@ (def: #export (translate-local variable) (-> Variable (Meta $;Inst)) - (meta/wrap ($i;ALOAD (int-to-nat variable)))) + (macro/wrap ($i;ALOAD (int-to-nat variable)))) (def: #export (translate-variable variable) (-> Variable (Meta $;Inst)) @@ -44,4 +44,4 @@ (def: #export (translate-definition [def-module def-name]) (-> Ident (Meta $;Inst)) (let [bytecode-name (format def-module "/" (&;normalize-name def-name) (%n (text/hash def-name)))] - (meta/wrap ($i;GETSTATIC bytecode-name commonT;value-field commonT;$Object)))) + (macro/wrap ($i;GETSTATIC bytecode-name commonT;value-field commonT;$Object)))) diff --git a/new-luxc/source/luxc/lang/translation/runtime.jvm.lux b/new-luxc/source/luxc/lang/translation/runtime.jvm.lux index fa6d6dcad..87174b192 100644 --- a/new-luxc/source/luxc/lang/translation/runtime.jvm.lux +++ b/new-luxc/source/luxc/lang/translation/runtime.jvm.lux @@ -4,7 +4,7 @@ (data text/format (coll [list "list/" Functor<List>])) [math] - [meta] + [macro] [host]) (luxc ["&" lang] (lang [";L" host] @@ -579,7 +579,7 @@ (def: translate-runtime (Meta commonT;Bytecode) - (do meta;Monad<Meta> + (do macro;Monad<Meta> [_ (wrap []) #let [bytecode ($d;class #$;V1.6 #$;Public $;finalC hostL;runtime-class (list) ["java.lang.Object" (list)] (list) (|>. adt-methods @@ -594,7 +594,7 @@ (def: translate-function (Meta commonT;Bytecode) - (do meta;Monad<Meta> + (do macro;Monad<Meta> [_ (wrap []) #let [applyI (|> (list;n.range +2 num-apply-variants) (list/map (function [arity] @@ -625,7 +625,7 @@ (def: #export translate (Meta [commonT;Bytecode commonT;Bytecode]) - (do meta;Monad<Meta> + (do macro;Monad<Meta> [runtime-bc translate-runtime function-bc translate-function] (wrap [runtime-bc function-bc]))) diff --git a/new-luxc/source/luxc/lang/translation/statement.jvm.lux b/new-luxc/source/luxc/lang/translation/statement.jvm.lux index 232519d8b..387181f98 100644 --- a/new-luxc/source/luxc/lang/translation/statement.jvm.lux +++ b/new-luxc/source/luxc/lang/translation/statement.jvm.lux @@ -7,7 +7,7 @@ [text "text/" Monoid<Text> Hash<Text>] text/format (coll [list "list/" Functor<List> Fold<List>])) - [meta] + [macro] [host]) (luxc ["&" lang] ["&;" io] @@ -34,8 +34,8 @@ (def: #export (translate-def def-name valueT valueI metaI metaV) (-> Text Type $;Inst $;Inst Code (Meta Unit)) - (do meta;Monad<Meta> - [current-module meta;current-module-name + (do macro;Monad<Meta> + [current-module macro;current-module-name #let [def-ident [current-module def-name] normal-name (format (&;normalize-name def-name) (%n (text/hash def-name))) bytecode-name (format current-module "/" normal-name) @@ -68,13 +68,13 @@ "Error:\n" error)))) _ (&module;define def-ident [valueT metaV valueV]) - _ (if (meta;type? metaV) - (case (meta;declared-tags metaV) + _ (if (macro;type? metaV) + (case (macro;declared-tags metaV) #;Nil (wrap []) tags - (&module;declare-tags tags (meta;export? metaV) (:! Type valueV))) + (&module;declare-tags tags (macro;export? metaV) (:! Type valueV))) (wrap [])) #let [_ (log! (format "DEF " (%ident def-ident)))]] (commonT;record-artifact (format bytecode-name ".class") bytecode))) diff --git a/new-luxc/source/luxc/lang/translation/structure.jvm.lux b/new-luxc/source/luxc/lang/translation/structure.jvm.lux index 2c04eaa0c..21d72b34b 100644 --- a/new-luxc/source/luxc/lang/translation/structure.jvm.lux +++ b/new-luxc/source/luxc/lang/translation/structure.jvm.lux @@ -4,7 +4,7 @@ ["ex" exception #+ exception:]) (data text/format (coll [list])) - [meta] + [macro] [host #+ do-to]) (luxc ["&" lang] (lang [";L" host] @@ -23,7 +23,7 @@ (def: #export (translate-tuple translate members) (-> (-> ls;Synthesis (Meta $;Inst)) (List ls;Synthesis) (Meta $;Inst)) - (do meta;Monad<Meta> + (do macro;Monad<Meta> [#let [size (list;size members)] _ (&;assert Not-A-Tuple (%code (` [(~@ members)])) (n.>= +2 size)) @@ -49,7 +49,7 @@ (def: #export (translate-variant translate tag tail? member) (-> (-> ls;Synthesis (Meta $;Inst)) Nat Bool ls;Synthesis (Meta $;Inst)) - (do meta;Monad<Meta> + (do macro;Monad<Meta> [memberI (translate member)] (wrap (|>. ($i;int (nat-to-int tag)) (flagI tail?) |