branch: externals/parser-generator
commit 7a175a889fef151be112b083d5f971be4da0b8bc
Author: Christian Johansson <christ...@cvj.se>
Commit: Christian Johansson <christ...@cvj.se>
Passed first unit test for grammar prefixes
---
parser-generator.el | 83 ++++++++++++++++++++++++++-----------------
test/parser-generator-test.el | 2 +-
2 files changed, 52 insertions(+), 33 deletions(-)
diff --git a/parser-generator.el b/parser-generator.el
index 2b26858..3361101 100644
--- a/parser-generator.el
+++ b/parser-generator.el
@@ -167,46 +167,65 @@
(parser-generator--get-grammar-terminals)
(parser-generator--get-grammar-non-terminals)))
(prefixes)
- (added-prefixes (make-hash-table :test 'equal))
(k parser-generator--look-ahead-number)
- (indexes)
+ (indexes (make-hash-table :test 'equal))
(index)
(prefix)
- (prefix-indexes))
+ (stack)
+ (increment-index 0))
(let ((symbols-length (length symbols))
- (i 0)
- (found-new t))
+ (i 0))
- ;; Initialize indexes
+ ;; Reset all indexes
(while (< i k)
- (push 0 indexes)
+ (puthash i 0 indexes)
+ (push 0 index)
(setq i (1+ i)))
+ (setq stack (list index))
+
+ ;; Build stack of all indexes that needs to be processed
+ (let ((index-remains t))
+ (while index-remains
+
+ (setq i 0)
+ (setq prefix nil)
+ (while (< i k)
+ (setq index (gethash i indexes))
+
+ (when (= i increment-index)
+ (if (and
+ (= index (1- symbols-length))
+ (= increment-index (1- k)))
+ (setq index-remains nil)
+ (if (= index (1- symbols-length))
+ (progn
+ (setq index 0)
+ (setq increment-index (1+ increment-index)))
+ (setq index (1+ index)))
+ (puthash i index indexes)))
+
+ (when index-remains
+ (push index prefix))
+ (setq i (1+ i)))
+
+ (when index-remains
+ (push prefix stack))
+ ))
- (while found-new
- ;; Reset variables
- (setq found-new nil)
- (setq i 0)
- (setq prefix nil)
- (setq prefix-indexes nil)
-
- ;; Build prefix and prefix-indexes from actual state
- (while (< i k)
- (setq index (nth i indexes))
- (push (nth index symbols) prefix)
- (push index prefix-indexes)
- (setq i (1+ i)))
-
- (message "prefix: %s" prefix)
-
- ;; If prefix is new add to list
- (unless (gethash prefix-indexes added-prefixes)
- (push prefix prefixes)
- (puthash prefix-indexes t added-prefixes))
-
- ;; TODO Try to find a new index here
-
- ))
- (sort prefixes 'parser-generator--sort-list)))
+ (while stack
+ (let ((index-list (pop stack)))
+ ;; Reset variables
+ (setq i 0)
+ (setq prefix nil)
+
+ ;; Build prefix and prefix-indexes from actual state
+ (while (< i k)
+ (setq index (nth i index-list))
+ (push (nth index symbols) prefix)
+ (setq i (1+ i)))
+
+ (push prefix prefixes))))
+ (sort prefixes 'parser-generator--sort-list)))
(defun parser-generator--get-grammar-production-number (production)
"If PRODUCTION exist, return it's number."
diff --git a/test/parser-generator-test.el b/test/parser-generator-test.el
index 5d74105..fb59ec9 100644
--- a/test/parser-generator-test.el
+++ b/test/parser-generator-test.el
@@ -704,7 +704,7 @@
(should
(equal
- '(("a") (A) ("b") (B) (S))
+ '((A) (B) (S) ("a") ("b"))
(parser-generator--get-grammar-prefixes)))
(message "Passed tests for (parser-generator--get-grammar-prefixes)"))
