aboutsummaryrefslogtreecommitdiff
path: root/new-luxc/source/luxc/lang
diff options
context:
space:
mode:
authorEduardo Julian2017-11-15 23:40:46 -0400
committerEduardo Julian2017-11-15 23:40:46 -0400
commit37b94ba49afb272c63ec66e42d56b8fba35cea9f (patch)
tree85c5ad242dc2a0d4bf187094e90f779b7072ef8c /new-luxc/source/luxc/lang
parent190b512a822fefbb9c66271feb189cc6ccebaf85 (diff)
- Moved "luxc/lang/host/macro" to "luxc/lang/macro".
Diffstat (limited to 'new-luxc/source/luxc/lang')
-rw-r--r--new-luxc/source/luxc/lang/analysis/expression.lux4
-rw-r--r--new-luxc/source/luxc/lang/macro.lux (renamed from new-luxc/source/luxc/lang/host/macro.lux)6
-rw-r--r--new-luxc/source/luxc/lang/translation.lux6
3 files changed, 8 insertions, 8 deletions
diff --git a/new-luxc/source/luxc/lang/analysis/expression.lux b/new-luxc/source/luxc/lang/analysis/expression.lux
index 5157848ec..5d38f7626 100644
--- a/new-luxc/source/luxc/lang/analysis/expression.lux
+++ b/new-luxc/source/luxc/lang/analysis/expression.lux
@@ -12,7 +12,7 @@
(luxc ["&" lang]
(lang ["&;" module]
[";L" host]
- (host [";H" macro])
+ [";L" macro]
["la" analysis]
(translation [";T" common])))
(.. [";A" common]
@@ -92,7 +92,7 @@
(if (macro;macro? def-anns)
(do @
[expansion (function [compiler]
- (case (macroH;expand (:! Macro def-value) args compiler)
+ (case (macroL;expand (:! Macro def-value) args compiler)
(#e;Success [compiler' output])
(#e;Success [compiler' output])
diff --git a/new-luxc/source/luxc/lang/host/macro.lux b/new-luxc/source/luxc/lang/macro.lux
index d557b6750..4885e21db 100644
--- a/new-luxc/source/luxc/lang/host/macro.lux
+++ b/new-luxc/source/luxc/lang/macro.lux
@@ -4,8 +4,8 @@
(data ["e" error])
[macro]
[host])
- (luxc (lang (translation [";T" common])))
- [..])
+ (luxc (lang [";L" host]
+ (translation [";T" common]))))
(for {"JVM" (as-is (host;import java.lang.reflect.Method
(invoke [Object (Array Object)] #try Object))
@@ -23,7 +23,7 @@
(def: #export (expand macro inputs)
(-> Macro (List Code) (Meta (List Code)))
(do macro;Monad<Meta>
- [class (commonT;load-class ..;function-class)]
+ [class (commonT;load-class hostL;function-class)]
(function [compiler]
(do e;Monad<Error>
[apply-method (Class.getMethod ["apply" _apply-args] class)
diff --git a/new-luxc/source/luxc/lang/translation.lux b/new-luxc/source/luxc/lang/translation.lux
index 9b59e5341..dd84ad024 100644
--- a/new-luxc/source/luxc/lang/translation.lux
+++ b/new-luxc/source/luxc/lang/translation.lux
@@ -17,8 +17,8 @@
["&;" io]
(lang [";L" module]
[";L" host]
- (host [";H" macro]
- ["$" jvm])
+ [";L" macro]
+ (host ["$" jvm])
(analysis [";A" expression]
[";A" common])
(synthesis [";S" expression])
@@ -90,7 +90,7 @@
(if (macro;macro? def-anns)
(do @
[expansion (function [compiler]
- (case (macroH;expand (:! Macro def-value) args compiler)
+ (case (macroL;expand (:! Macro def-value) args compiler)
(#e;Success [compiler' output])
(#e;Success [compiler' output])