From e37e3713e080606930a5f8442f03dabc4c26a7f9 Mon Sep 17 00:00:00 2001
From: Eduardo Julian
Date: Tue, 21 Nov 2017 16:09:07 -0400
Subject: - Fixed some bugs. - Some small refactoring.

---
 new-luxc/source/luxc/lang/analysis/expression.lux | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

(limited to 'new-luxc/source/luxc/lang/analysis/expression.lux')

diff --git a/new-luxc/source/luxc/lang/analysis/expression.lux b/new-luxc/source/luxc/lang/analysis/expression.lux
index 89fb3b93e..6abe8e62b 100644
--- a/new-luxc/source/luxc/lang/analysis/expression.lux
+++ b/new-luxc/source/luxc/lang/analysis/expression.lux
@@ -93,13 +93,14 @@
                      (case ?macro
                        (#;Some macro)
                        (do @
-                         [expansion (function [compiler]
-                                      (case (macroL;expand macro args compiler)
-                                        (#e;Success [compiler' output])
-                                        (#e;Success [compiler' output])
-
-                                        (#e;Error error)
-                                        ((&;throw Macro-Expansion-Failed error) compiler)))]
+                         [expansion (: (Meta (List Code))
+                                       (function [compiler]
+                                         (case (macroL;expand macro args compiler)
+                                           (#e;Error error)
+                                           ((&;throw Macro-Expansion-Failed error) compiler)
+
+                                           output
+                                           output)))]
                          (case expansion
                            (^ (list single))
                            (analyse single)
-- 
cgit v1.2.3