branch: externals/phps-mode
commit aa691a82ee9c206e758c494b2e575d3e4e78e80f
Author: Christian Johansson <[email protected]>
Commit: Christian Johansson <[email protected]>
Added parser and lexer integraction-fix to automation
---
phps-mode-automation-grammar.el | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/phps-mode-automation-grammar.el b/phps-mode-automation-grammar.el
index 8f40aa4..4a390b0 100644
--- a/phps-mode-automation-grammar.el
+++ b/phps-mode-automation-grammar.el
@@ -139,7 +139,6 @@
;; Compatibility with parser
(unless (or
(equal token-type 'T_OPEN_TAG)
- (equal token-type 'T_CLOSE_TAG)
(equal token-type 'T_DOC_COMMENT)
(equal token-type 'T_COMMENT))
(setq-local
@@ -162,13 +161,13 @@
;; Compatibility with parser
(when (equal (car token) 'T_OPEN_TAG_WITH_ECHO)
- (setf
- (car token)
- 'T_ECHO))
+ (setq
+ token
+ `(T_ECHO ,(car (cdr token)) . ,(cdr (cdr token)))))
(when (equal (car token) 'T_CLOSE_TAG)
- (setf
- (car token)
- ";"))
+ (setq
+ token
+ `(";" ,(car (cdr token)) . ,(cdr (cdr token)))))
token))))
"The custom lex-analyzer.")