[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/parser-generator ba8e501 194/434: Added failing first t
|
From: |
ELPA Syncer |
|
Subject: |
[elpa] externals/parser-generator ba8e501 194/434: Added failing first test with complex case |
|
Date: |
Mon, 29 Nov 2021 15:59:39 -0500 (EST) |
branch: externals/parser-generator
commit ba8e5018ae5894c1040426cd7a694d470fd522fb
Author: Christian Johansson <christian@cvj.se>
Commit: Christian Johansson <christian@cvj.se>
Added failing first test with complex case
---
parser-generator.el | 207 +++++++++++++++++++++------------------
test/parser-generator-lr-test.el | 3 +-
test/parser-generator-test.el | 20 ++++
3 files changed, 136 insertions(+), 94 deletions(-)
diff --git a/parser-generator.el b/parser-generator.el
index 295995e..25c0e4d 100644
--- a/parser-generator.el
+++ b/parser-generator.el
@@ -627,7 +627,7 @@
,f-sets
,disallow-e-first
,production-lhs)
- '(("" t 0)))))
+ '((nil t 0)))))
(parser-generator--debug
(message
@@ -738,19 +738,19 @@
(message "Stack-symbol: %s" stack-symbol))
(let ((leading-terminals (nth 0 stack-symbol))
(all-leading-terminals-p (nth 1 stack-symbol))
- (input-tape-index (nth 2 stack-symbol))
- (e-first-p))
+ (input-tape-index (nth 2 stack-symbol)))
(parser-generator--debug
(message "leading-terminals: %s" leading-terminals)
(message "all-leading-terminals-p: %s" all-leading-terminals-p)
(message "input-tape-index: %s" input-tape-index))
- ;; Flag whether leading-terminal is the e-identifier or not
- (when (parser-generator--valid-e-p leading-terminals)
- (setq e-first-p t))
-
- (parser-generator--debug
- (message "e-first-p: %s" e-first-p))
+ (when (and
+ all-leading-terminals-p
+ leading-terminals
+ (parser-generator--valid-e-p
+ (nth (1- (length leading-terminals)) leading-terminals)))
+ (message "Not leading terminals: %s" leading-terminals)
+ (setq all-leading-terminals-p nil))
(let ((leading-terminals-count (length leading-terminals)))
(parser-generator--debug
@@ -831,62 +831,74 @@
(message
"Sub-terminal-alternative-set: %s" sub-terminal-alternative-set))
;; When sub-set only contains the e
identifier
- (when (parser-generator--valid-e-p
- (car
sub-terminal-alternative-set))
- (parser-generator--debug
- (message "alternative-set is the
e identifier"))
-
- ;; Branch off here in two separate
tracks, one with the e-identifier appended and one without
- (if disallow-e-first
- (progn
- (when (and
-
all-leading-terminals-p
- (>
leading-terminals-count 0))
- (parser-generator--debug
(message "branched off 2"))
- ;; Branch off here with a
separate track where this e-identifier is ignored
- (push `(
- ,leading-terminals
-
,all-leading-terminals-p
- ,(1+
input-tape-index))
- stack))
-
- (setq
alternative-all-leading-terminals-p nil))
-
- ;; Add e-identifier to leading
terminals when
- ;; we have not found any leading
terminals
- ;; and we are at the last symbol
in input-tape
-
- (when all-leading-terminals-p
- (parser-generator--debug
(message "branched off 1"))
- ;; Branch off here with a
separate track where this e-identifier is ignored
- (push `(
- ,leading-terminals
-
,all-leading-terminals-p
- ,(1+ input-tape-index))
- stack))
-
- (setq
alternative-all-leading-terminals-p nil)))
-
- (let ((sub-rhs-leading-terminals
- (append
- leading-terminals
-
sub-terminal-alternative-set)))
- (parser-generator--debug
- (message
- "sub-rhs-leading-terminals: %s"
- sub-rhs-leading-terminals))
- (when (> (length
sub-rhs-leading-terminals) k)
- (setq
- sub-rhs-leading-terminals
- (butlast
- sub-rhs-leading-terminals
- (- (length
sub-rhs-leading-terminals) k))))
- (parser-generator--debug (message
"branched off 3"))
- (push `(
- ,sub-rhs-leading-terminals
-
,alternative-all-leading-terminals-p
- ,(1+ input-tape-index))
- stack))))
+ (if (parser-generator--valid-e-p
+ (car
sub-terminal-alternative-set))
+ (progn
+ (parser-generator--debug
+ (message "alternative-set is
the e identifier"))
+
+ ;; Branch off here in two
separate tracks, one with the e-identifier appended and one without
+ (if disallow-e-first
+ (progn
+ (when (and
+
all-leading-terminals-p
+ (>
leading-terminals-count 0))
+ (let ((branch `(
+
,leading-terminals
+
,all-leading-terminals-p
+ ,(1+
input-tape-index))))
+
(parser-generator--debug (message "branched off 2: %s" branch))
+ ;; Branch off here
with a separate track where this e-identifier is ignored
+ (push branch
stack))))
+
+ (when all-leading-terminals-p
+ (let ((branch
+ `(
+ ,leading-terminals
+
,all-leading-terminals-p
+ ,(1+
input-tape-index))))
+ (parser-generator--debug
(message "branched off 1: %s" branch))
+ ;; Branch off here with
a separate track where this e-identifier is ignored
+ (push branch stack))))
+
+ (when all-leading-terminals-p
+ (let
((alternative-leading-terminals
+ (append
+ leading-terminals
+ (list
parser-generator--e-identifier)))
+
(alternative-all-leading-terminals-p nil))
+ (let ((branch
+ `(
+
,alternative-leading-terminals
+
,alternative-all-leading-terminals-p
+ ,(1+
input-tape-index))))
+ (parser-generator--debug
(message "branched off01: %s" branch))
+ ;; Branch off here with
a separate track where this e-identifier is ignored
+ (push branch stack)))))
+
+ (let ((sub-terminal-index 0)
+ (sub-terminal-length (length
sub-terminal-alternative-set))
+ (sub-terminal-leading-p
alternative-all-leading-terminals-p)
+ (sub-terminal)
+ (sub-terminals (reverse
leading-terminals)))
+ (while (and
+ sub-terminal-leading-p
+ (< sub-terminal-index
sub-terminal-length)
+ (< (length
sub-terminals) k))
+ (setq sub-terminal (nth
sub-terminal-index sub-terminal-alternative-set))
+ (when
(parser-generator--valid-e-p sub-terminal)
+ (setq sub-terminal-leading-p
nil))
+ (push sub-terminal
sub-terminals)
+ (setq sub-terminal-index (1+
sub-terminal-index)))
+ (setq sub-terminals (reverse
sub-terminals))
+ ;; (message "sub-terminals: %s
from %s (%s) + %s (%s)" sub-terminals leading-terminals (length
leading-terminals) sub-terminal-alternative-set (length
sub-terminal-alternative-set))
+ (let ((branch
+ `(
+ ,sub-terminals
+ ,sub-terminal-leading-p
+ ,(1+
input-tape-index))))
+ (parser-generator--debug
(message "branched off 3: %s" branch))
+ (push branch stack))))))
(setq sub-terminal-index (1+
sub-terminal-index)))))
(parser-generator--debug
@@ -905,13 +917,14 @@
(when (and
all-leading-terminals-p
(> leading-terminals-count
0))
- ;; Branch off here with a
separate track where this e-identifier is ignored
- (parser-generator--debug
(message "branched off 4"))
- (push `(
- ,leading-terminals
- ,all-leading-terminals-p
- ,(1+ input-tape-index))
- stack))
+ (let ((branch
+ `(
+ ,leading-terminals
+ ,all-leading-terminals-p
+ ,(1+
input-tape-index))))
+ ;; Branch off here with a
separate track where this e-identifier is ignored
+ (parser-generator--debug
(message "branched off 4: %s" branch))
+ (push branch stack)))
(setq all-leading-terminals-p nil))
@@ -920,13 +933,14 @@
;; and we are at the last symbol in
input-tape
(when all-leading-terminals-p
- ;; Branch off here with a separate
track where this e-identifier is ignored
- (parser-generator--debug (message
"branched off 5"))
- (push `(
- ,leading-terminals
- ,all-leading-terminals-p
- ,(1+ input-tape-index))
- stack))
+ (let ((branch
+ `(
+ ,leading-terminals
+ ,all-leading-terminals-p
+ ,(1+ input-tape-index))))
+ ;; Branch off here with a separate
track where this e-identifier is ignored
+ (parser-generator--debug (message
"branched off 5: %s" branch))
+ (push branch stack)))
(setq leading-terminals (append
leading-terminals sub-terminal-set))
(setq leading-terminals-count (+
leading-terminals-count (length sub-terminal-set)))
@@ -958,12 +972,13 @@
all-leading-terminals-p
(> leading-terminals-count 0))
;; Branch off here with a separate track where this
e-identifier is ignored
- (parser-generator--debug (message "branched off 6"))
- (push `(
- ,leading-terminals
- ,all-leading-terminals-p
- ,(1+ input-tape-index))
- stack))
+ (let ((branch
+ `(
+ ,leading-terminals
+ ,all-leading-terminals-p
+ ,(1+ input-tape-index))))
+ (parser-generator--debug (message "branched off 6:
%s" branch))
+ (push branch stack)))
(setq all-leading-terminals-p nil))
;; Add e-identifier to leading terminals when
@@ -972,12 +987,13 @@
(when all-leading-terminals-p
;; Branch off here with a separate track where this
e-identifier is ignored
- (parser-generator--debug (message "branched off 7"))
- (push `(
- ,leading-terminals
- ,all-leading-terminals-p
- ,(1+ input-tape-index))
- stack))
+ (let ((branch
+ `(
+ ,leading-terminals
+ ,all-leading-terminals-p
+ ,(1+ input-tape-index))))
+ (parser-generator--debug (message "branched off 7: %s"
branch))
+ (push branch stack)))
(setq leading-terminals (append leading-terminals
rhs-element))
(setq leading-terminals-count (1+
leading-terminals-count))
@@ -985,7 +1001,9 @@
((equal rhs-type 'TERMINAL)
(setq leading-terminals (append leading-terminals (list
rhs-element)))
- (setq leading-terminals-count (1+
leading-terminals-count)))))
+ (setq leading-terminals-count (1+ leading-terminals-count)))
+
+ ))
(setq input-tape-index (1+ input-tape-index)))
(when (> leading-terminals-count 0)
(unless (listp leading-terminals)
@@ -1088,10 +1106,13 @@
;; fill up with e-identifiers
(when (and
(< (length first) k))
+ ;; (message "first-before-fill: %s" first)
(setq first (reverse first))
(while (< (length first) k)
(push parser-generator--e-identifier first))
- (setq first (reverse first)))
+ (setq first (reverse first))
+ ;; (message "first-after-fill: %s" first)
+ )
(parser-generator--debug
(message "push to first-list: %s to %s" first first-list))
(push first first-list))))))
diff --git a/test/parser-generator-lr-test.el b/test/parser-generator-lr-test.el
index 89fe758..554f801 100644
--- a/test/parser-generator-lr-test.el
+++ b/test/parser-generator-lr-test.el
@@ -369,7 +369,8 @@
;; (parser-generator-set-grammar '((Sp S) ("a" "b") ((Sp S) (S (S "a" S
"b")) (S e)) Sp))
;; (parser-generator-set-look-ahead-number 2)
;; (parser-generator-process-grammar)
- ;; (parser-generator-lr-generate-parser-tables)
+ ;; (let ((lr-items (parser-generator--hash-values-to-list
(parser-generator-lr-generate-parser-tables) t)))
+ ;; (message "lr-items: %s" lr-items))
;; (setq
;; parser-generator-lex-analyzer--function
;; (lambda (index)
diff --git a/test/parser-generator-test.el b/test/parser-generator-test.el
index cc37dfe..5446bb0 100644
--- a/test/parser-generator-test.el
+++ b/test/parser-generator-test.el
@@ -317,6 +317,26 @@
(parser-generator--first 'S)))
(message "Passed first 7 with complex grammar with starting e-identifier
variant 2")
+ (parser-generator-set-grammar '((Sp S) (a b) ((Sp S) (S (S a S b)) (S e))
Sp))
+ (parser-generator-set-look-ahead-number 3)
+ (parser-generator-process-grammar)
+ (message "First-3: %s" (parser-generator--first 'S))
+ (should
+ (equal
+ '((a a a a) (a a a b) (a a b b))
+ (parser-generator--first 'S)))
+ (message "Passed first 8 with complex grammar with starting e-identifier
variant 2")
+
+ (parser-generator-set-grammar '((Sp S) (a b) ((Sp S) (S (S a S b)) (S e))
Sp))
+ (parser-generator-set-look-ahead-number 4)
+ (parser-generator-process-grammar)
+ (message "First-4: %s" (parser-generator--first 'S))
+ (should
+ (equal
+ '((a a a a) (a a a b) (a a b b))
+ (parser-generator--first 'S)))
+ (message "Passed first 9 with complex grammar with starting e-identifier
variant 2")
+
(message "Passed tests for (parser-generator--first)"))
(defun parser-generator-test--e-free-first ()
- [elpa] externals/parser-generator d6afd0b 180/434: Added TODO items, (continued)
- [elpa] externals/parser-generator d6afd0b 180/434: Added TODO items, ELPA Syncer, 2021/11/29
- [elpa] externals/parser-generator bbcb22f 182/434: Optimized memory usage for f-sets, ELPA Syncer, 2021/11/29
- [elpa] externals/parser-generator e2f4347 183/434: More work on f-set generation with e-identifiers, ELPA Syncer, 2021/11/29
- [elpa] externals/parser-generator 046e239 187/434: Passing first 3 complex tests for first, ELPA Syncer, 2021/11/29
- [elpa] externals/parser-generator 4811521 185/434: Various tweakings, ELPA Syncer, 2021/11/29
- [elpa] externals/parser-generator 7b6c1dc 186/434: First function passing first complex grammar test, ELPA Syncer, 2021/11/29
- [elpa] externals/parser-generator 7e96f9d 188/434: Passing all unit tests for first function, ELPA Syncer, 2021/11/29
- [elpa] externals/parser-generator 7a90a75 190/434: Updated max interation count, ELPA Syncer, 2021/11/29
- [elpa] externals/parser-generator 796b41b 192/434: Passed unit tests for follow function, ELPA Syncer, 2021/11/29
- [elpa] externals/parser-generator 33634dd 193/434: Passing all tests after refactor, ELPA Syncer, 2021/11/29
- [elpa] externals/parser-generator ba8e501 194/434: Added failing first test with complex case,
ELPA Syncer <=
- [elpa] externals/parser-generator 71d213b 201/434: More work on Canonical LR(k) Parser, ELPA Syncer, 2021/11/29
- [elpa] externals/parser-generator d7ad86c 200/434: Added TODO item for LRk Canonical Parser, ELPA Syncer, 2021/11/29
- [elpa] externals/parser-generator 7a175a8 205/434: Passed first unit test for grammar prefixes, ELPA Syncer, 2021/11/29
- [elpa] externals/parser-generator 517ed12 212/434: Passing some more unit tests after refactor, ELPA Syncer, 2021/11/29
- [elpa] externals/parser-generator f4ba363 031/434: Improved README.md, ELPA Syncer, 2021/11/29
- [elpa] externals/parser-generator 744fdf6 174/434: Added TODO item, ELPA Syncer, 2021/11/29
- [elpa] externals/parser-generator d360e8a 176/434: Added failing unit test for FIRST function with starting e-identifier, ELPA Syncer, 2021/11/29
- [elpa] externals/parser-generator c1cdf20 197/434: Fixed issue with lex analyzer reached end of input, ELPA Syncer, 2021/11/29
- [elpa] externals/parser-generator 446cbe9 217/434: Refactored unit tests and separated k=2 case, ELPA Syncer, 2021/11/29
- [elpa] externals/parser-generator 1818b9d 199/434: Added error in action-tables generation if no accept action is found, ELPA Syncer, 2021/11/29