branch: externals/parser-generator
commit af5a8b0c6890ff82fcf3004ce4ed99ebcf7dac37
Author: Christian Johansson <[email protected]>
Commit: Christian Johansson <[email protected]>
Improvements in testing and exporting
---
parser-generator-ll-export.el | 2 +-
parser-generator-lr-export.el | 2 +-
test/parser-generator-lr-test.el | 12 ++++++++----
3 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/parser-generator-ll-export.el b/parser-generator-ll-export.el
index 80fef9cac2..9ac5d78534 100644
--- a/parser-generator-ll-export.el
+++ b/parser-generator-ll-export.el
@@ -174,7 +174,7 @@
(insert "\n;;; Functions:\n\n")
- (insert "\n;;; Functions for Lex-Analyzer:\n\n")
+ (insert "\n;;; Functions for Lex-Analyzer:\n\n\n")
;; Lex-Analyzer Get Function
(insert
diff --git a/parser-generator-lr-export.el b/parser-generator-lr-export.el
index 600b68ecb3..aa4a03ec0a 100644
--- a/parser-generator-lr-export.el
+++ b/parser-generator-lr-export.el
@@ -195,7 +195,7 @@
(insert "\n;;; Functions:\n\n")
- (insert "\n;;; Functions for Lex-Analyzer:\n\n")
+ (insert "\n;;; Functions for Lex-Analyzer:\n\n\n")
;; Lex-Analyzer Get Function
(insert
diff --git a/test/parser-generator-lr-test.el b/test/parser-generator-lr-test.el
index 56578d0b28..60b71a0a13 100644
--- a/test/parser-generator-lr-test.el
+++ b/test/parser-generator-lr-test.el
@@ -320,9 +320,10 @@
;; Test grammar that can be only solved by using global and
context-sensitive attributes
(setq
parser-generator-lex-analyzer--function
- (lambda (index)
+ (lambda (index _state)
(with-current-buffer "*buffer*"
- (let ((token))
+ (let ((token)
+ (new-index))
(when
(<
index
@@ -346,11 +347,14 @@
(buffer-substring-no-properties
(match-beginning 0)
(match-end 0))))
+ (setq
+ new-index
+ (match-end 0))
(setq
token
`(,symbol ,(match-beginning 0) . ,(match-end 0)))))
(t (error "Unexpected input at %d!" index))))
- token))))
+ (list token nil new-index nil)))))
(setq
parser-generator-lex-analyzer--get-function
@@ -419,7 +423,7 @@
parser-generator-lr--context-sensitive-precedence-attribute
'%prec)
(parser-generator-lr-generate-parser-tables)
- (message "Grammar not conflict anymore")
+ (message "Grammar not conflicting anymore")
;; Parse: 1+1*2\n
;;