branch: externals/phps-mode
commit 50a014a5e497242f91f3e244bac054222ba5e70a
Author: Christian Johansson <[email protected]>
Commit: Christian Johansson <[email protected]>
Using same lexer buffer for parser as the lex-analyzer is using
---
phps-mode-automation-grammar.el | 4 ++--
phps-mode-parser.el | 4 ++--
test/phps-mode-test-parser.el | 7 ++++---
3 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/phps-mode-automation-grammar.el b/phps-mode-automation-grammar.el
index 2e595ec..b2a0a4a 100644
--- a/phps-mode-automation-grammar.el
+++ b/phps-mode-automation-grammar.el
@@ -1462,7 +1462,7 @@
phps-mode-automation-grammar--lex-analyzer-function
(lambda (index)
(save-current-buffer
- (set-buffer "*phps-mode-lex-analyzer*")
+ (set-buffer "*PHPs Lexer*")
(if (= (point) index) nil (goto-char index))
(if (< index (point-max))
(progn
@@ -1549,7 +1549,7 @@
(defconst
phps-mode-automation-grammar--lex-analyzer-get-function
(lambda (token)
- (with-current-buffer "*phps-mode-lex-analyzer*"
+ (with-current-buffer "*PHPs Lexer*"
(let ((start (car (cdr token)))
(end (cdr (cdr token))))
(when (<= end (point-max))
diff --git a/phps-mode-parser.el b/phps-mode-parser.el
index b8a9192..6521d1a 100644
--- a/phps-mode-parser.el
+++ b/phps-mode-parser.el
@@ -60,12 +60,12 @@
(defconst
phps-mode-parser-lex-analyzer--get-function
- (lambda (token) (save-current-buffer (set-buffer "*phps-mode-lex-analyzer*")
(let ((start (car (cdr token))) (end (cdr (cdr token)))) (if (<= end
(point-max)) (progn (buffer-substring-no-properties start end))))))
+ (lambda (token) (save-current-buffer (set-buffer "*PHPs Lexer*") (let
((start (car (cdr token))) (end (cdr (cdr token)))) (if (<= end (point-max))
(progn (buffer-substring-no-properties start end))))))
"The lex-analyzer get function.")
(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)) (if (< index (point-max)) (progn
(if (and phps-mode-lexer--generated-new-tokens-index (=
phps-mode-lexer--generated-new-tokens-index index)) nil
(phps-mode-lexer--re2c)) (let ((first (car (reverse
phps-mode-lexer--generated-new-tokens)))) (cond ((and (not first) (not (equal
index semantic-lex-end-point))) (set (make-local-variable
'phps-mode-parser-lex-analyzer--ind [...]
+ (lambda (index) (save-current-buffer (set-buffer "*PHPs Lexer*") (if (=
(point) index) nil (goto-char index)) (if (< index (point-max)) (progn (if (and
phps-mode-lexer--generated-new-tokens-index (=
phps-mode-lexer--generated-new-tokens-index index)) nil
(phps-mode-lexer--re2c)) (let ((first (car (reverse
phps-mode-lexer--generated-new-tokens)))) (cond ((and (not first) (not (equal
index semantic-lex-end-point))) (set (make-local-variable
'phps-mode-parser-lex-analyzer--index) semantic [...]
"The lex-analyzer function.")
(defconst
diff --git a/test/phps-mode-test-parser.el b/test/phps-mode-test-parser.el
index 57b853d..08d8a86 100644
--- a/test/phps-mode-test-parser.el
+++ b/test/phps-mode-test-parser.el
@@ -31,8 +31,8 @@
(require 'phps-mode-parser)
(defun phps-mode-test-parser--buffer-contents (buffer-contents name logic)
- (generate-new-buffer "*phps-mode-lex-analyzer*")
- (with-current-buffer "*phps-mode-lex-analyzer*"
+ (generate-new-buffer "*PHPs Lexer*")
+ (with-current-buffer "*PHPs Lexer*"
(kill-region (point-min) (point-max))
(insert buffer-contents)
(message
@@ -65,7 +65,8 @@
(funcall logic)
- (message "Passed %s" name)))
+ (message "Passed %s" name)
+ (kill-buffer)))
(defun phps-mode-test-parser-boundaries ()
"Run test for lexer."
