[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/phps-mode 7a0eecd 07/96: First test passing for parser
From: |
Christian Johansson |
Subject: |
[elpa] externals/phps-mode 7a0eecd 07/96: First test passing for parser |
Date: |
Fri, 29 Oct 2021 11:14:28 -0400 (EDT) |
branch: externals/phps-mode
commit 7a0eecdbfba7e5412cefa08b40d21adf1f179be2
Author: Christian Johansson <christian@cvj.se>
Commit: Christian Johansson <christian@cvj.se>
First test passing for parser
---
phps-mode-parser.el | 32 +++++++++++++++++++++++++++++++-
test/phps-mode-test-parser.el | 18 +++++++++---------
2 files changed, 40 insertions(+), 10 deletions(-)
diff --git a/phps-mode-parser.el b/phps-mode-parser.el
index f059b10..2471a8c 100644
--- a/phps-mode-parser.el
+++ b/phps-mode-parser.el
@@ -62,7 +62,37 @@
(defconst
phps-mode-parser-lex-analyzer--function
- (lambda (index) (save-current-buffer (set-buffer "*phps-mode-lex-analyzer*")
(if (= (point) index) nil (goto-char index)) (message "Index: %S" index)
(phps-mode-lexer--re2c) (if (boundp 'phps-mode-lexer--generated-new-tokens)
(let ((first (car (nreverse phps-mode-lexer--generated-new-tokens)))) (when (or
(equal (car first) 'T_OPEN_TAG) (equal (car first)
'T_OPEN_TAG_WITH_ECHO))(message "Skipping token: %S.. Going to %S" first (cdr
(cdr first)))(goto-char (cdr (cdr first)))(setq phps-mo [...]
+ (lambda (index)
+ (save-current-buffer
+ (set-buffer "*phps-mode-lex-analyzer*")
+ (unless (= (point) index)
+ (goto-char index))
+
+ (when (< index (point-max))
+ (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)))
+ (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))
+ (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)))
+
+ first))))
"The lex-analyzer function.")
(defconst
diff --git a/test/phps-mode-test-parser.el b/test/phps-mode-test-parser.el
index f3ce29a..dc3f65a 100644
--- a/test/phps-mode-test-parser.el
+++ b/test/phps-mode-test-parser.el
@@ -38,25 +38,25 @@
(message "Testing buffer '%S' with buffer-contents:\n%S\n" name
(buffer-substring-no-properties (point-min) (point-max)))
;; Reset lexer
- (setq
+ (setq-local
phps-mode-lexer--generated-tokens
nil)
- (setq
+ (setq-local
phps-mode-lexer--state
'ST_INITIAL)
- (setq
+ (setq-local
phps-mode-lexer--states
nil)
- (setq
+ (setq-local
phps-mode-lexer--state-stack
nil)
- (setq
+ (setq-local
phps-mode-lexer--heredoc-label
nil)
- (setq
+ (setq-local
phps-mode-lexer--heredoc-label-stack
nil)
- (setq
+ (setq-local
phps-mode-lexer--nest-location-stack
nil)
@@ -68,14 +68,14 @@
"Run test for lexer."
(message "-- Running all tests for parser... --\n")
+ ;; TODO Verify parse below
(phps-mode-test-parser--buffer-contentes
"<?php echo 'hello';"
"Basic echo test"
(lambda()
- (message "was here")
(should
(equal
- t
+ '(80 459 466 411 333 332 154 102 79)
(phps-mode-parser-parse)))))
(message "\n-- Ran all tests for parser. --"))
- [elpa] externals/phps-mode updated (b7b4706 -> efeaadd), Christian Johansson, 2021/10/29
- [elpa] externals/phps-mode 8120895 03/96: Fixed parser generation and automatically cleans bytecode when generating parser, Christian Johansson, 2021/10/29
- [elpa] externals/phps-mode 3421b6a 01/96: Improved parser generator location, Christian Johansson, 2021/10/29
- [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 <=
- [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, 2021/10/29
- [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