branch: externals/phps-mode
commit 3e1142c30c8fa07cdffbd99fbc16aecf3e0fef71
Author: Christian Johansson <christ...@cvj.se>
Commit: Christian Johansson <christ...@cvj.se>
Passing bookkeeping tests with PHP 8.1 parser and AST
---
phps-mode-ast.el | 4 ++--
phps-mode-parser-sdt.el | 2 +-
test/phps-mode-test-ast.el | 24 ++++++++++++------------
test/phps-mode-test-parser.el | 12 ++++++------
4 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/phps-mode-ast.el b/phps-mode-ast.el
index e395a23a12..eca2c86800 100644
--- a/phps-mode-ast.el
+++ b/phps-mode-ast.el
@@ -40,7 +40,7 @@
phps-mode-ast--parse-trail
parse-trail)
- (message "\nTranslation:\n%S\n\n" translation)
+ ;; (message "\nTranslation:\n%S\n\n" translation)
(when translation
(dolist (item translation)
@@ -90,7 +90,7 @@
ast
(reverse ast))
- (message "AST:\n%S\n\n" ast)
+ ;; (message "AST:\n%S\n\n" ast)
(setq
phps-mode-ast--tree
diff --git a/phps-mode-parser-sdt.el b/phps-mode-parser-sdt.el
index 2ee5cae23f..6748c729ca 100644
--- a/phps-mode-parser-sdt.el
+++ b/phps-mode-parser-sdt.el
@@ -1109,7 +1109,7 @@
;; static_var -> (T_VARIABLE)
(puthash
- 292
+ 294
(lambda(args terminals)
`(
ast-type
diff --git a/test/phps-mode-test-ast.el b/test/phps-mode-test-ast.el
index 431f4e8fb0..e03ddf8703 100644
--- a/test/phps-mode-test-ast.el
+++ b/test/phps-mode-test-ast.el
@@ -25,8 +25,8 @@
name
(lambda()
(let ((parse (phps-mode-parser-parse)))
- (message "Left-to-right with right-most derivation in reverse:\n%S\n"
parse)
- (dolist (production-number parse)
+ (message "Left-to-right with right-most derivation:\n%S\n" parse)
+ (dolist (production-number (reverse parse))
(let ((production
(phps-mode-parser--get-grammar-production-by-number
production-number)))
@@ -38,14 +38,14 @@
(message "\n")
(phps-mode-ast--generate)
(phps-mode-ast-bookkeeping--generate)
- (message
- "expected-bookkeeping:\n%S\n"
- bookkeeping)
- (message
- "actual-bookkeeping:\n%S\n"
- (phps-mode-test--hash-to-list
- phps-mode-ast-bookkeeping--index
- t))
+ ;; (message
+ ;; "expected-bookkeeping:\n%S\n"
+ ;; bookkeeping)
+ ;; (message
+ ;; "actual-bookkeeping:\n%S\n"
+ ;; (phps-mode-test--hash-to-list
+ ;; phps-mode-ast-bookkeeping--index
+ ;; t))
(should
(equal
(phps-mode-test--hash-to-list
@@ -59,8 +59,8 @@
name
(lambda()
(let ((parse (phps-mode-parser-parse)))
- (message "Left-to-right with right-most derivation in reverse:\n%S\n"
parse)
- (dolist (production-number parse)
+ (message "Left-to-right with right-most derivation:\n%S\n" parse)
+ (dolist (production-number (reverse parse))
(let ((production
(phps-mode-parser--get-grammar-production-by-number
production-number)))
diff --git a/test/phps-mode-test-parser.el b/test/phps-mode-test-parser.el
index 92f59c5aca..c12c38d2fe 100644
--- a/test/phps-mode-test-parser.el
+++ b/test/phps-mode-test-parser.el
@@ -75,7 +75,7 @@
(lambda()
(let ((parse (phps-mode-parser-parse)))
- (message "Left-to-right with right-most derivation in reverse:\n%S\n"
parse)
+ (message "Left-to-right with right-most derivation:\n%S\n" parse)
(dolist (production-number (reverse parse))
(let ((production
(phps-mode-parser--get-grammar-production-by-number
@@ -128,7 +128,7 @@
"Advanced echo test with 2 echo sections"
(lambda()
(let ((parse (phps-mode-parser-parse)))
- (message "Left-to-right with right-most derivation in reverse:\n%S\n"
parse)
+ (message "Left-to-right with right-most derivation:\n%S\n" parse)
(dolist (production-number (reverse parse))
(let ((production
(phps-mode-parser--get-grammar-production-by-number
@@ -149,7 +149,7 @@
"Simple function defintion"
(lambda()
(let ((parse (phps-mode-parser-parse)))
- (message "Left-to-right with right-most derivation in reverse:\n%S\n"
parse)
+ (message "Left-to-right with right-most derivation:\n%S\n" parse)
(dolist (production-number (reverse parse))
(let ((production
(phps-mode-parser--get-grammar-production-by-number
@@ -170,7 +170,7 @@
"Simple function defintion inside un-bracketed namespace"
(lambda()
(let ((parse (phps-mode-parser-parse)))
- (message "Left-to-right with right-most derivation in reverse:\n%S\n"
parse)
+ (message "Left-to-right with right-most derivation:\n%S\n" parse)
(dolist (production-number (reverse parse))
(let ((production
(phps-mode-parser--get-grammar-production-by-number
@@ -191,7 +191,7 @@
"Simple function defintion inside bracketed namespace"
(lambda()
(let ((parse (phps-mode-parser-parse)))
- (message "Left-to-right with right-most derivation in reverse:\n%S\n"
parse)
+ (message "Left-to-right with right-most derivation:\n%S\n" parse)
(dolist (production-number (reverse parse))
(let ((production
(phps-mode-parser--get-grammar-production-by-number
@@ -212,7 +212,7 @@
"Simple function defintion and property inside class inside non-bracketed
namespace"
(lambda()
(let ((parse (phps-mode-parser-parse)))
- (message "Left-to-right with right-most derivation in reverse:\n%S\n"
parse)
+ (message "Left-to-right with right-most derivation:\n%S\n" parse)
(dolist (production-number (reverse parse))
(let ((production
(phps-mode-parser--get-grammar-production-by-number
