branch: externals/parser-generator commit 58190dcd6945e7dda3bbb88c2179398820233014 Author: Christian Johansson <christ...@cvj.se> Commit: Christian Johansson <christ...@cvj.se>
LR Parser k=0 building correct LR items --- parser-generator.el | 2 +- test/parser-generator-lr-test.el | 17 ++++++++--------- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/parser-generator.el b/parser-generator.el index 9cde3a5..b001d80 100644 --- a/parser-generator.el +++ b/parser-generator.el @@ -11,7 +11,7 @@ (defvar parser-generator--debug - t + nil "Whether to print debug messages or not.") (defvar parser-generator--e-identifier diff --git a/test/parser-generator-lr-test.el b/test/parser-generator-lr-test.el index cb37024..e664dea 100644 --- a/test/parser-generator-lr-test.el +++ b/test/parser-generator-lr-test.el @@ -792,12 +792,12 @@ )) (1 (((B) ("0") nil))) (2 (((B) ("1") nil))) - (3 ( - ((E) (E) ("+" B)) + (3 (((E) (B) nil))) + (4 ( ((E) (E) ("*" B)) + ((E) (E) ("+" B)) ((S) (E) ($)) )) - (4 (((E) (B) nil))) (5 ( ((B) nil ("0")) ((B) nil ("1")) @@ -808,8 +808,9 @@ ((B) nil ("1")) ((E) (E "+") (B)) )) - (7 (((E) (E "*" B) nil))) - (8 (((E) (E "+" B) nil)))) + (7 (((E) (E "+" B) nil))) + (8 (((E) (E "*" B) nil))) + ) (parser-generator--hash-to-list lr-items))) (message "Passed LR-items k = 0") @@ -817,7 +818,7 @@ ;; TODO Replace all below (parser-generator--debug - (message "GOTO-tables k = 2: %s" + (message "GOTO-tables k = 0: %s" (parser-generator--hash-to-list parser-generator-lr--goto-tables t))) @@ -842,7 +843,6 @@ ;; -------+-----+-----+-----+-----+-----+-----+----- ;; 9 | | | | | | | ;; -------+-----+-----+-----+-----+-----+-----+----- - ;; 10 | | | | | | | (should (equal @@ -854,8 +854,7 @@ (5 nil) (6 ((T 8) (a 6) (c 7))) (7 nil) - (8 nil) - (9 nil)) + (8 nil)) (parser-generator--hash-to-list parser-generator-lr--goto-tables))) (message "Passed GOTO-tables k = 2")