aboutsummaryrefslogtreecommitdiff
path: root/src/lux/analyser/lux.clj
diff options
context:
space:
mode:
authorEduardo Julian2016-01-17 00:51:26 -0400
committerEduardo Julian2016-01-17 00:51:26 -0400
commit80f1597b8a8cc5db3baf32b8ffb82ddf286bc3d3 (patch)
tree39fefc378e75545541fc2ff83264ab74fd09d671 /src/lux/analyser/lux.clj
parente65d1f96a807c4cc88f9e082562bdf963949479e (diff)
- Fixed a bug introduced when I made the change for the "unit" value to be a special String, rather than null.
Diffstat (limited to '')
-rw-r--r--src/lux/analyser/lux.clj6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lux/analyser/lux.clj b/src/lux/analyser/lux.clj
index 7adc32b22..fba8ea15b 100644
--- a/src/lux/analyser/lux.clj
+++ b/src/lux/analyser/lux.clj
@@ -261,7 +261,7 @@
(|do [[[r-module r-name] [endo-type ?meta ?value]] (&&module/find-def module name)
_ (if (and (clojure.lang.Util/identical &type/Type endo-type)
(clojure.lang.Util/identical &type/Type exo-type))
- (return nil)
+ (return &/unit-tag)
(&type/check exo-type endo-type))
_cursor &/cursor]
(return (&/|list (&&/|meta endo-type _cursor
@@ -518,7 +518,7 @@
(|do [module-name &/get-module-name
_ (if (= module-name path)
(fail (str "[Analyser Error] Module can't import itself: " path))
- (return nil))]
+ (return &/unit-tag))]
(&/save-module
(|do [already-compiled? (&&module/exists? path)
active? (&/active-module? path)
@@ -526,7 +526,7 @@
_ (&&module/add-import path)
_ (if (not already-compiled?)
(compile-module path)
- (return nil))]
+ (return &/unit-tag))]
(return &/Nil$)))))
(defn analyse-alias [analyse compile-token ex-alias ex-module]