aboutsummaryrefslogtreecommitdiff
path: root/stdlib/source/lux/tool
diff options
context:
space:
mode:
authorEduardo Julian2019-05-22 20:50:29 -0400
committerEduardo Julian2019-05-22 20:50:29 -0400
commit92dede233083d2a534b0530e582afa3b1ff1025f (patch)
tree99ac73c5182ee3d0988041cc9718f66e8c1bfd79 /stdlib/source/lux/tool
parent0bc505930accb00f74724f384ee42c9a4dd32beb (diff)
Removed the (magical) "imports" annotations tag.
Diffstat (limited to 'stdlib/source/lux/tool')
-rw-r--r--stdlib/source/lux/tool/compiler/phase/extension/analysis/jvm.lux2
-rw-r--r--stdlib/source/lux/tool/compiler/phase/extension/statement.lux13
2 files changed, 6 insertions, 9 deletions
diff --git a/stdlib/source/lux/tool/compiler/phase/extension/analysis/jvm.lux b/stdlib/source/lux/tool/compiler/phase/extension/analysis/jvm.lux
index e14a528b2..fadb92667 100644
--- a/stdlib/source/lux/tool/compiler/phase/extension/analysis/jvm.lux
+++ b/stdlib/source/lux/tool/compiler/phase/extension/analysis/jvm.lux
@@ -82,7 +82,7 @@
(-> Text Phase s (Operation Analysis))]
Handler))
(function (_ extension-name analyse args)
- (case (s.run args syntax)
+ (case (s.run syntax args)
(#error.Success inputs)
(handler extension-name analyse inputs)
diff --git a/stdlib/source/lux/tool/compiler/phase/extension/statement.lux b/stdlib/source/lux/tool/compiler/phase/extension/statement.lux
index 7deb93696..99a8d1fe6 100644
--- a/stdlib/source/lux/tool/compiler/phase/extension/statement.lux
+++ b/stdlib/source/lux/tool/compiler/phase/extension/statement.lux
@@ -168,19 +168,16 @@
Handler
(function (_ extension-name phase inputsC+)
(case inputsC+
- (^ (list annotationsC))
+ (^ (list annotationsC importsC))
(do ///.monad
- [[_ annotationsT annotationsV] (evaluate! Code annotationsC)
- #let [annotationsV (:coerce Code annotationsV)]
- imports (case (s.run (list (|> annotationsV
- (macro.get-ann (name-of #.imports))
- (maybe.default (' []))))
- ..imports)
+ [imports (case (s.run ..imports (list importsC))
(#error.Success imports)
(wrap imports)
(#error.Failure error)
- (///.throw //.invalid-syntax [extension-name %code (list annotationsV)]))
+ (///.throw //.invalid-syntax [extension-name %code (list annotationsC importsC)]))
+ [_ annotationsT annotationsV] (evaluate! Code annotationsC)
+ #let [annotationsV (:coerce Code annotationsV)]
_ (////statement.lift-analysis
(do @
[_ (monad.map @ (function (_ [module alias])