aboutsummaryrefslogtreecommitdiff
path: root/new-luxc/source/luxc/lang/host
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/host
parentf11c10f72d003555d76c9803954e2bd8b347362d (diff)
- Re-named "lux/meta" to to "lux/macro".
Diffstat (limited to 'new-luxc/source/luxc/lang/host')
-rw-r--r--new-luxc/source/luxc/lang/host/jvm.lux6
-rw-r--r--new-luxc/source/luxc/lang/host/jvm/inst.lux6
-rw-r--r--new-luxc/source/luxc/lang/host/macro.lux4
3 files changed, 8 insertions, 8 deletions
diff --git a/new-luxc/source/luxc/lang/host/jvm.lux b/new-luxc/source/luxc/lang/host/jvm.lux
index 24d4a9ea9..f96b3e646 100644
--- a/new-luxc/source/luxc/lang/host/jvm.lux
+++ b/new-luxc/source/luxc/lang/host/jvm.lux
@@ -3,9 +3,9 @@
(lux (control monad
["p" parser])
(data (coll [list "list/" Functor<List>]))
- [meta]
- (meta [code]
- ["s" syntax #+ syntax:])
+ [macro]
+ (macro [code]
+ ["s" syntax #+ syntax:])
[host]))
## [Host]
diff --git a/new-luxc/source/luxc/lang/host/jvm/inst.lux b/new-luxc/source/luxc/lang/host/jvm/inst.lux
index 37ab75020..dc2909b69 100644
--- a/new-luxc/source/luxc/lang/host/jvm/inst.lux
+++ b/new-luxc/source/luxc/lang/host/jvm/inst.lux
@@ -7,9 +7,9 @@
text/format
(coll [list "L/" Functor<List>]))
[host #+ do-to]
- [meta]
- (meta [code]
- ["s" syntax #+ syntax:]))
+ [macro]
+ (macro [code]
+ ["s" syntax #+ syntax:]))
["$" ..]
(.. ["$t" type]))
diff --git a/new-luxc/source/luxc/lang/host/macro.lux b/new-luxc/source/luxc/lang/host/macro.lux
index 01f8c3bdb..d557b6750 100644
--- a/new-luxc/source/luxc/lang/host/macro.lux
+++ b/new-luxc/source/luxc/lang/host/macro.lux
@@ -2,7 +2,7 @@
lux
(lux (control [monad #+ do])
(data ["e" error])
- [meta]
+ [macro]
[host])
(luxc (lang (translation [";T" common])))
[..])
@@ -22,7 +22,7 @@
(host;array-write +1 _object-class)))
(def: #export (expand macro inputs)
(-> Macro (List Code) (Meta (List Code)))
- (do meta;Monad<Meta>
+ (do macro;Monad<Meta>
[class (commonT;load-class ..;function-class)]
(function [compiler]
(do e;Monad<Error>