aboutsummaryrefslogtreecommitdiff
path: root/new-luxc/source/luxc/lang/translation/r
diff options
context:
space:
mode:
authorEduardo Julian2017-11-15 23:22:30 -0400
committerEduardo Julian2017-11-15 23:22:30 -0400
commit190b512a822fefbb9c66271feb189cc6ccebaf85 (patch)
tree6d317f54649be741c67e03c71a8b6006b83f00ec /new-luxc/source/luxc/lang/translation/r
parentf11c10f72d003555d76c9803954e2bd8b347362d (diff)
- Re-named "lux/meta" to to "lux/macro".
Diffstat (limited to '')
-rw-r--r--new-luxc/source/luxc/lang/translation/reference.jvm.lux8
-rw-r--r--new-luxc/source/luxc/lang/translation/runtime.jvm.lux8
2 files changed, 8 insertions, 8 deletions
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])))