[elpa] externals/parser-generator 83298fe 099/434: Passing test for function that generates possible look-ahead permutations

[ELPA Syncer]

branch: externals/parser-generator
commit 83298fe6a9cb3feaadbea395ddfd67f07e2e877f
Author: Christian Johansson <christian@cvj.se>
Commit: Christian Johansson <christian@cvj.se>

    Passing test for function that generates possible look-ahead permutations
---
 parser.el           | 31 +++++++------------------------
 test/parser-test.el |  4 ++--
 2 files changed, 9 insertions(+), 26 deletions(-)

diff --git a/parser.el b/parser.el
index dc962f6..35c8362 100644
--- a/parser.el
+++ b/parser.el
@@ -118,42 +118,27 @@
           (look-ahead-length)
           (look-ahead))
       (while stack
-        (message "stack 1: %s" stack)
         (let ((item (pop stack)))
           (setq terminal-index (nth 0 item))
           (setq look-ahead-length (nth 1 item))
           (setq look-ahead (nth 2 item))
 
-          (message "Popped")
-          (message "item: %s" item)
-          (message "look-ahead-length: %s" look-ahead-length)
-          (message "look-ahead: %s" look-ahead)
-
           (while (and
                   (< look-ahead-length k)
                   (<= terminal-index terminals-max-index))
-            (message "stack 2: %s" stack)
             (let ((potential-look-ahead look-ahead)
                   (next-terminal (nth terminal-index terminals)))
               (push next-terminal potential-look-ahead)
-              (unless (gethash (format "%s" potential-look-ahead) marked-paths)
-                (message "potential-look-ahead: %s gethash: %s" 
potential-look-ahead (gethash potential-look-ahead marked-paths))
-                (puthash (format "%s" potential-look-ahead) t marked-paths)
+              (if (gethash potential-look-ahead marked-paths)
+                  (setq terminal-index (1+ terminal-index))
+                (puthash potential-look-ahead t marked-paths)
 
-                (let ((stack-item (list terminal-index look-ahead-length 
look-ahead)))
-                  (push stack-item stack)
-                  (message "Added old path to stack: %s %s" stack-item stack))
+                (push `(,terminal-index ,look-ahead-length,look-ahead) stack)
 
                 (setq look-ahead-length (1+ look-ahead-length))
                 (setq look-ahead potential-look-ahead)
+                (setq terminal-index 0))))
 
-                (message "Added-terminal: %s" next-terminal)
-                (message "look-ahead-length: %s" look-ahead-length)
-                (message "look-ahead: %s" look-ahead)
-                (message "Stack 3: %s" stack)))
-            (setq terminal-index (1+ terminal-index)))
-
-          (message "Stack 5: %s" stack)
           (let ((look-ahead-to-add))
             (if look-ahead
                 (progn
@@ -164,7 +149,7 @@
                   (when (and
                          include-e
                          (= look-ahead-length (1- k)))
-                    (push parser--e-identifier look-aheads)
+                    (push parser--e-identifier look-ahead)
                     (setq look-ahead-to-add (reverse look-ahead))))
 
               (when (and
@@ -172,12 +157,10 @@
                      (= k 1))
                 (setq look-ahead-to-add `(,parser--e-identifier))))
 
-            (message "look-ahead-to-add: %s" look-ahead-to-add)
             (when (and look-ahead-to-add
                        (not (gethash look-ahead-to-add added-look-aheads)))
               (puthash look-ahead-to-add t added-look-aheads)
-              (push look-ahead-to-add look-aheads))))
-        (message "Stack 4: %s" stack)))
+              (push look-ahead-to-add look-aheads))))))
 
     (sort look-aheads 'parser--sort-list)))
 
diff --git a/test/parser-test.el b/test/parser-test.el
index ef4d41c..fa76cc1 100644
--- a/test/parser-test.el
+++ b/test/parser-test.el
@@ -32,13 +32,13 @@
 
   (should
    (equal
-    '((a a) (a b) (b a) (b b))
+    '(("a" "a") ("a" "b") ("b" "a") ("b" "b"))
     (parser--get-possible-look-aheads)))
   (message "Passed ((a a) (a b) (b a) (b b))")
 
   (should
    (equal
-    '((a a) (a b) (a e) (b a) (b b) (b e))
+    '(("a" "a") ("a" "b") ("a" e) ("b" "a") ("b" "b") ("b" e))
     (parser--get-possible-look-aheads t)))
 
   (message "Passed tests for (parser--get-possible-look-aheads)"))