[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/phps-mode 2b167f3 08/96: Fixes for parsing start and en
From: |
Christian Johansson |
Subject: |
[elpa] externals/phps-mode 2b167f3 08/96: Fixes for parsing start and end |
Date: |
Fri, 29 Oct 2021 11:14:29 -0400 (EDT) |
branch: externals/phps-mode
commit 2b167f3393e6e694f284e493b5df9721edc19b8a
Author: Christian Johansson <christian@cvj.se>
Commit: Christian Johansson <christian@cvj.se>
Fixes for parsing start and end
---
phps-mode-parser.el | 39 ++++++++++++++++++++++++++++++---------
test/phps-mode-test-parser.el | 19 +++++++++++++++++++
2 files changed, 49 insertions(+), 9 deletions(-)
diff --git a/phps-mode-parser.el b/phps-mode-parser.el
index 2471a8c..19f2430 100644
--- a/phps-mode-parser.el
+++ b/phps-mode-parser.el
@@ -72,25 +72,46 @@
(phps-mode-lexer--re2c)
(let ((first (car (nreverse phps-mode-lexer--generated-new-tokens))))
- (when (and
- (not first)
- (not (equal index semantic-lex-end-point)))
+ (message "first: %S" first)
+
+ (cond
+
+ ;; Lexer has moved forward - lex again
+ ((and
+ (not first)
+ (not (equal index semantic-lex-end-point)))
(setq
phps-mode-parser-lex-analyzer--index
semantic-lex-end-point)
(setq
first
- (funcall phps-mode-parser-lex-analyzer--function
phps-mode-parser-lex-analyzer--index)))
-
- (when (or
- (equal (car first) 'T_OPEN_TAG)
- (equal (car first) 'T_OPEN_TAG_WITH_ECHO))
+ (funcall
+ phps-mode-parser-lex-analyzer--function
+ phps-mode-parser-lex-analyzer--index)))
+
+ ;; Skip open and close tag
+ ((or
+ (equal (car first) 'T_OPEN_TAG)
+ (equal (car first) 'T_CLOSE_TAG))
(setq
phps-mode-parser-lex-analyzer--index
(cdr (cdr first)))
(setq
first
- (funcall phps-mode-parser-lex-analyzer--function
phps-mode-parser-lex-analyzer--index)))
+ (funcall
+ phps-mode-parser-lex-analyzer--function
+ phps-mode-parser-lex-analyzer--index)))
+
+ ;; Open tag with echo is replaced with echo
+ ((equal (car first) 'T_OPEN_TAG_WITH_ECHO)
+ (setf
+ (car first)
+ 'T_ECHO)
+ (setq
+ phps-mode-parser-lex-analyzer--index
+ (cdr (cdr first))))
+
+ )
first))))
"The lex-analyzer function.")
diff --git a/test/phps-mode-test-parser.el b/test/phps-mode-test-parser.el
index dc3f65a..f219182 100644
--- a/test/phps-mode-test-parser.el
+++ b/test/phps-mode-test-parser.el
@@ -78,6 +78,25 @@
'(80 459 466 411 333 332 154 102 79)
(phps-mode-parser-parse)))))
+(phps-mode-test-parser--buffer-contentes
+ "<? echo 'hello'; ?>"
+ "Basic echo test 2 with short open tag"
+ (lambda()
+ (should
+ (equal
+ '(80 459 466 411 333 332 154 102 79)
+ (phps-mode-parser-parse)))))
+
+ (phps-mode-test-parser--buffer-contentes
+ "<?= 'hello';"
+ "Basic echo test 3 with open tag with echo"
+ (lambda()
+ (should
+ (equal
+ '(80 459 466 411 156 102 79)
+ (phps-mode-parser-parse)))))
+
+
(message "\n-- Ran all tests for parser. --"))
(phps-mode-test-parser)
- [elpa] externals/phps-mode 60344ea 02/96: Improved recovery in automation by dumping generated data, (continued)
- [elpa] externals/phps-mode 60344ea 02/96: Improved recovery in automation by dumping generated data, Christian Johansson, 2021/10/29
- [elpa] externals/phps-mode f4c9f8b 04/96: Added generated parser, Christian Johansson, 2021/10/29
- [elpa] externals/phps-mode d2872f7 05/96: Started on parser test, Christian Johansson, 2021/10/29
- [elpa] externals/phps-mode 7a0eecd 07/96: First test passing for parser, Christian Johansson, 2021/10/29
- [elpa] externals/phps-mode 2189d31 11/96: Fixes for lexer in parser to handle T_CLOSE_TAG, Christian Johansson, 2021/10/29
- [elpa] externals/phps-mode 50ed917 12/96: Using non-parser mode for lexer, Christian Johansson, 2021/10/29
- [elpa] externals/phps-mode c15fa0c 10/96: Using parser-mode for lexer, Christian Johansson, 2021/10/29
- [elpa] externals/phps-mode ab56c99 13/96: More work on debugging parser-lexer, Christian Johansson, 2021/10/29
- [elpa] externals/phps-mode 1dd3bd3 06/96: More working on trying to get parser test working, Christian Johansson, 2021/10/29
- [elpa] externals/phps-mode 3f5c008 09/96: Optimization for lexer to only need to execute once per index, Christian Johansson, 2021/10/29
- [elpa] externals/phps-mode 2b167f3 08/96: Fixes for parsing start and end,
Christian Johansson <=
- [elpa] externals/phps-mode 376e690 15/96: Verified parse, Christian Johansson, 2021/10/29
- [elpa] externals/phps-mode 2a9fb96 16/96: Added more tests for parser, Christian Johansson, 2021/10/29
- [elpa] externals/phps-mode 5c7c6f4 14/96: Parser passes basic lexing test, Christian Johansson, 2021/10/29
- [elpa] externals/phps-mode 569505e 17/96: Added parser header and fixed byte-compilation for parser, Christian Johansson, 2021/10/29
- [elpa] externals/phps-mode 0d1843f 20/96: Started on parser integration, Christian Johansson, 2021/10/29
- [elpa] externals/phps-mode b714471 21/96: Added parse function in lex-analyzer and a test for it, Christian Johansson, 2021/10/29
- [elpa] externals/phps-mode 50a014a 18/96: Using same lexer buffer for parser as the lex-analyzer is using, Christian Johansson, 2021/10/29
- [elpa] externals/phps-mode fb9905f 19/96: Added basic translation test, Christian Johansson, 2021/10/29
- [elpa] externals/phps-mode ec18c1e 22/96: Using parser to be able to implement incremental parser, Christian Johansson, 2021/10/29
- [elpa] externals/phps-mode 1ee3094 28/96: More refactoring of the parsers lex-analyzer, Christian Johansson, 2021/10/29