From 99dd3b322777d5abdaa976aa9445c168c234e139 Mon Sep 17 00:00:00 2001
From: Eduardo Julian
Date: Sun, 3 May 2015 16:48:54 -0400
Subject: - Fixed escaping in chars - Added 2 custom pattern-matchers (\ & \or)
 & gensym - Added signatures & structures ^_^

---
 src/lux/analyser/lux.clj | 6 +++---
 src/lux/lexer.clj        | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/lux/analyser/lux.clj b/src/lux/analyser/lux.clj
index 62b99a5b7..b52b816a7 100644
--- a/src/lux/analyser/lux.clj
+++ b/src/lux/analyser/lux.clj
@@ -264,9 +264,9 @@
               (matchv ::M/objects [$def]
                 [["lux;MacroD" macro]]
                 (|do [macro-expansion #(-> macro (.apply ?args) (.apply %))]
-                  (do (when (or (= "type`" ?name)
-                                (= "deftype" ?name))
-                        (prn 'macro-expansion (str ?module ";" ?name) (->> macro-expansion (&/|map &/show-ast) (&/|interpose " ") (&/fold str ""))))
+                  (do ;; (when (or (= "type`" ?name)
+                      ;;           (= "deftype" ?name))
+                      ;;   (prn 'macro-expansion (str ?module ";" ?name) (->> macro-expansion (&/|map &/show-ast) (&/|interpose " ") (&/fold str ""))))
                     (&/flat-map% (partial analyse exo-type) macro-expansion)))
 
                 [_]
diff --git a/src/lux/lexer.clj b/src/lux/lexer.clj
index 983d94dc9..f0a8ba91a 100644
--- a/src/lux/lexer.clj
+++ b/src/lux/lexer.clj
@@ -70,7 +70,7 @@
 
 (def ^:private lex-char
   (|do [[_ [meta _]] (&reader/read-text "#\"")
-         token (&/try-all% (&/|list (|do [escaped (&reader/read-regex #"^(\\.)")]
+         token (&/try-all% (&/|list (|do [[_ [_ escaped]] (&reader/read-regex #"^(\\.)")]
                                       (escape-char escaped))
                                     (|do [[_ [_ char]] (&reader/read-regex #"^(.)")]
                                       (return char))))
-- 
cgit v1.2.3