aboutsummaryrefslogtreecommitdiff
path: root/stdlib/source/lux/tool
diff options
context:
space:
mode:
authorEduardo Julian2019-04-17 19:24:47 -0400
committerEduardo Julian2019-04-17 19:24:47 -0400
commita3389210ed2787c11a34fd1b587d6b120dddb29b (patch)
tree894b4e905b9ace40ab9476a8cdfdb4142de6930b /stdlib/source/lux/tool
parent84b5e5becced7eaad0f733f13d4c9f5064dd63ea (diff)
Fixed an issue with weird spacing at the end of lines in "lux/time/duration".
Diffstat (limited to 'stdlib/source/lux/tool')
-rw-r--r--stdlib/source/lux/tool/compiler/phase/macro.lux15
1 files changed, 6 insertions, 9 deletions
diff --git a/stdlib/source/lux/tool/compiler/phase/macro.lux b/stdlib/source/lux/tool/compiler/phase/macro.lux
index ddbde68ad..9a94f9a4b 100644
--- a/stdlib/source/lux/tool/compiler/phase/macro.lux
+++ b/stdlib/source/lux/tool/compiler/phase/macro.lux
@@ -10,24 +10,21 @@
format]
[collection
[array (#+ Array)]
- ["." list ("#;." functor)]]]
+ ["." list ("#@." functor)]]]
["." macro]]
["." //])
(exception: #export (expansion-failed {macro Name} {inputs (List Code)} {error Text})
(exception.report
["Macro" (%name macro)]
- ["Inputs" (|> inputs
- (list;map (|>> %code (format text.new-line text.tab)))
- (text.join-with ""))]
+ ["Inputs" (exception.enumerate %code inputs)]
["Error" error]))
-(exception: #export (must-have-single-expansion {macro Name} {inputs (List Code)})
+(exception: #export (must-have-single-expansion {macro Name} {inputs (List Code)} {outputs (List Code)})
(exception.report
["Macro" (%name macro)]
- ["Inputs" (|> inputs
- (list;map (|>> %code (format text.new-line text.tab)))
- (text.join-with ""))]))
+ ["Inputs" (exception.enumerate %code inputs)]
+ ["Outputs" (exception.enumerate %code outputs)]))
(type: #export Expander
(-> Macro (List Code) Lux (Error (Error [Lux (List Code)]))))
@@ -53,4 +50,4 @@
(wrap single)
_
- (//.throw must-have-single-expansion [name inputs]))))
+ (//.throw must-have-single-expansion [name inputs expansion]))))