branch: externals/parser-generator
commit 2227cae461e714c1cf16984d7c303afc27fea0fc
Author: Christian Johansson <[email protected]>
Commit: Christian Johansson <[email protected]>
Moved validation of valid lr-item set to generation of goto-tables
---
parser-generator-lr.el | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)
diff --git a/parser-generator-lr.el b/parser-generator-lr.el
index b66c64f..1311125 100644
--- a/parser-generator-lr.el
+++ b/parser-generator-lr.el
@@ -389,6 +389,10 @@
(parser-generator-lr--items-for-prefix
parser-generator--e-identifier)))
+ (parser-generator-lr--items-valid-p
+ (list e-set)
+ t)
+
;;(1) Place V(e) in S. The set V(e) is initially unmarked.
(push
`(,lr-item-set-new-index ,e-set)
@@ -524,6 +528,10 @@
"Set is new: %s"
prefix-lr-items))
+ (parser-generator-lr--items-valid-p
+ (list prefix-lr-items)
+ t)
+
;; Note that GOTO(a, X) will always be empty if all
items in a
;; have the dot at the right end of the production
@@ -618,13 +626,6 @@
goto-table-index
parser-generator-lr--goto-tables))))
(setq table-index (1+ table-index))))
-
- ;; (parser-generator-lr--items-valid-p
- ;; (parser-generator--hash-values-to-list
- ;; table-lr-items
- ;; t)
- ;; t)
-
(message "\nCompleted generation of goto-tables.\n")
table-lr-items))