From 817d244adff361104ae0aa6ce53efe6c2bc07552 Mon Sep 17 00:00:00 2001
From: Eduardo Julian
Date: Sun, 30 Aug 2015 18:36:17 -0400
Subject: - Added unit-tests for lexer. - Fixed a bug when lexing multi-line
 comments.

---
 src/lux/lexer.clj  | 20 ++++++--------------
 src/lux/reader.clj | 27 +++++++++------------------
 2 files changed, 15 insertions(+), 32 deletions(-)

(limited to 'src')

diff --git a/src/lux/lexer.clj b/src/lux/lexer.clj
index 4c7741769..b3a47f3e0 100644
--- a/src/lux/lexer.clj
+++ b/src/lux/lexer.clj
@@ -64,20 +64,12 @@
 
 (defn ^:private lex-multi-line-comment [_]
   (|do [_ (&reader/read-text "#(")
-        [meta comment] (&/try-all% (&/|list (|do [[meta comment] (&reader/read-regex #"(?is)^(?!#\()(.*?(?=\)#))")
-                                                  ;; :let [_ (prn 'immediate comment)]
-                                                  _ (&reader/read-text ")#")]
+        [meta comment] (&/try-all% (&/|list (|do [[meta comment] (&reader/read-regex+ #"(?is)^(?!#\()((?!\)#).)*")]
                                               (return (&/T meta comment)))
-                                            (|do [;; :let [_ (prn 'pre/_0)]
-                                                  [meta pre] (&reader/read-regex+ #"(?is)^(.*?)(#\(|$)")
-                                                  ;; :let [_ (prn 'pre pre)]
-                                                  [_ inner] (lex-multi-line-comment nil)
-                                                  ;; :let [_ (prn 'inner inner)]
-                                                  [_ post] (&reader/read-regex #"(?is)^(.+?(?=\)#))")
-                                                  ;; :let [_ (prn 'post post (str pre "#(" inner ")#" post))]
-                                                  ]
+                                            (|do [[meta pre] (&reader/read-regex+ #"(?is)^((?!#\().)*")
+                                                  [_ ($Comment inner)] (lex-multi-line-comment nil)
+                                                  [_ post] (&reader/read-regex+ #"(?is)^((?!\)#).)*")]
                                               (return (&/T meta (str pre "#(" inner ")#" post))))))
-        ;; :let [_ (prn 'lex-multi-line-comment (str comment ")#"))]
         _ (&reader/read-text ")#")]
     (return (&/T meta (&/V $Comment comment)))))
 
@@ -91,8 +83,8 @@
       (return (&/T meta (&/V <tag> token)))))
 
   ^:private lex-bool  $Bool  #"^(true|false)"
-  ^:private lex-int   $Int   #"^(-?0|-?[1-9][0-9]*)"
-  ^:private lex-real  $Real  #"^-?(-?0\.[0-9]+|-?[1-9][0-9]*\.[0-9]+)"
+  ^:private lex-int   $Int   #"^-?(0|[1-9][0-9]*)"
+  ^:private lex-real  $Real  #"^-?(0\.[0-9]+|[1-9][0-9]*\.[0-9]+)"
   )
 
 (def ^:private lex-char
diff --git a/src/lux/reader.clj b/src/lux/reader.clj
index af6c1ecc3..7b1559f07 100644
--- a/src/lux/reader.clj
+++ b/src/lux/reader.clj
@@ -55,13 +55,6 @@
     (when (.find matcher)
       (.group matcher 0))))
 
-(defn ^:private re-find1! [^java.util.regex.Pattern regex column ^String line]
-  (let [matcher (doto (.matcher regex line)
-                  (.region column (.length line))
-                  (.useAnchoringBounds true))]
-    (when (.find matcher)
-      (.group matcher 1))))
-
 (defn ^:private re-find3! [^java.util.regex.Pattern regex column ^String line]
   (let [matcher (doto (.matcher regex line)
                   (.region column (.length line))
@@ -75,11 +68,8 @@
 (defn read-regex [regex]
   (with-line
     (fn [file-name line-num column-num ^String line]
-      ;; (prn 'read-regex [file-name line-num column-num regex line])
-      (if-let [^String match (do ;; (prn '[regex line] [regex line])
-                                 (re-find! regex column-num line))]
-        (let [;; _ (prn 'match match)
-              match-length (.length match)
+      (if-let [^String match (re-find! regex column-num line)]
+        (let [match-length (.length match)
               column-num* (+ column-num match-length)]
           (if (= column-num* (.length line))
             (&/V $Done (&/T (&/T file-name line-num column-num) match))
@@ -90,7 +80,6 @@
 (defn read-regex2 [regex]
   (with-line
     (fn [file-name line-num column-num ^String line]
-      ;; (prn 'read-regex2 [file-name line-num column-num regex line])
       (if-let [[^String match tok1 tok2] (re-find3! regex column-num line)]
         (let [match-length (.length match)
               column-num* (+ column-num match-length)]
@@ -111,15 +100,17 @@
 
           (&/$Cons [[file-name line-num column-num] ^String line]
                    reader**)
-          (if-let [^String match (do ;; (prn 'read-regex+ regex line)
-                                     (re-find1! regex column-num line))]
+          (if-let [^String match (re-find! regex column-num line)]
             (let [match-length (.length match)
-                  column-num* (+ column-num match-length)]
+                  column-num* (+ column-num match-length)
+                  prefix* (if (= 0 column-num)
+                            (str prefix "\n" match)
+                            (str prefix match))]
               (if (= column-num* (.length line))
-                (recur (str prefix match "\n") reader**)
+                (recur prefix* reader**)
                 (&/V &/$Right (&/T (&/Cons$ (&/T (&/T file-name line-num column-num*) line)
                                             reader**)
-                                   (&/T (&/T file-name line-num column-num) (str prefix match))))))
+                                   (&/T (&/T file-name line-num column-num) prefix*)))))
             (&/V &/$Left (str "[Reader Error] Pattern failed: " regex))))))))
 
 (defn read-text [^String text]
-- 
cgit v1.2.3