Merge pull request #4 from LuxLang/v0.2

V0.2

1 files changed, 14 insertions, 16 deletions

diff --git a/src/lux/analyser/base.clj b/src/lux/analyser/base.clj
index 9913da4ae..9fc3f1030 100644
--- a/src/lux/analyser/base.clj
+++ b/src/lux/analyser/base.clj
@@ -1,3 +1,11 @@
+;;   Copyright (c) Eduardo Julian. All rights reserved.
+;;   The use and distribution terms for this software are covered by the
+;;   Eclipse Public License 1.0 (http://opensource.org/licenses/eclipse-1.0.php)
+;;   which can be found in the file epl-v10.html at the root of this distribution.
+;;   By using this software in any fashion, you are agreeing to be bound by
+;;   the terms of this license.
+;;   You must not remove this notice, or any other, from this software.
+
 (ns lux.analyser.base
   (:require [clojure.core.match :as M :refer [match matchv]]
             clojure.core.match.array
@@ -6,32 +14,22 @@
 
 ;; [Exports]
 (defn expr-type [syntax+]
-  ;; (prn 'expr-type syntax+)
-  ;; (prn 'expr-type (aget syntax+ 0))
   (matchv ::M/objects [syntax+]
     [[_ type]]
     (return type)))
 
 (defn analyse-1 [analyse exo-type elem]
   (|do [output (analyse exo-type elem)]
-    (do ;; (prn 'analyse-1 (aget output 0))
-        (matchv ::M/objects [output]
-          [["lux;Cons" [x ["lux;Nil" _]]]]
-          (return x)
+    (matchv ::M/objects [output]
+      [["lux;Cons" [x ["lux;Nil" _]]]]
+      (return x)
 
-          [_]
-          (fail "[Analyser Error] Can't expand to other than 1 element.")))))
+      [_]
+      (fail "[Analyser Error] Can't expand to other than 1 element."))))
 
 (defn resolved-ident [ident]
   (|let [[?module ?name] ident]
-    (|do [module* (if (= "" ?module)
+    (|do [module* (if (.equals "" ?module)
                     &/get-module-name
                     (return ?module))]
       (return (&/ident->text (&/T module* ?name))))))
-
-(defn resolved-ident* [ident]
-  (|let [[?module ?name] ident]
-    (|do [module* (if (= "" ?module)
-                    &/get-module-name
-                    (return ?module))]
-      (return (&/T module* ?name)))))