[elpa] externals/phps-mode ad3e37b 28/62: Passed lexer and integration unit tests

[Christian Johansson]

branch: externals/phps-mode
commit ad3e37b049244c3e221a04a40d3c85ccd5e67533
Author: Christian Johansson <christian@mediastrategi.se>
Commit: Christian Johansson <christian@mediastrategi.se>

    Passed lexer and integration unit tests
---
 phps-mode-lexer.el           | 15 ++++++++-------
 phps-mode-test.el            |  4 ++++
 test/phps-mode-test-lexer.el |  1 +
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/phps-mode-lexer.el b/phps-mode-lexer.el
index 86c18f9..6d4fd71 100644
--- a/phps-mode-lexer.el
+++ b/phps-mode-lexer.el
@@ -1582,7 +1582,7 @@
            (phps-mode-lexer--begin 'ST_END_HEREDOC))
 
          (push
-          phps-mode-lexer--heredoc-label
+          `(,phps-mode-lexer--heredoc-label ,start ,end)
           phps-mode-lexer--heredoc-label-stack)
          ;; (message "Found heredoc or nowdoc at %s with label %s" data 
phps-mode-lexer--heredoc-label)
 
@@ -1691,7 +1691,8 @@
       (phps-mode-lexer--match-macro
        (and ST_HEREDOC (looking-at phps-mode-lexer--any-char))
        ;; Check for $, ${ and {$ forward
-       (let ((old-start (car (cdr (car phps-mode-lexer--generated-tokens)))))
+       (let ((old-start (car (cdr (car phps-mode-lexer--heredoc-label-stack))))
+             (old-end (point)))
          (let ((string-start
                 (search-forward-regexp
                  (concat
@@ -1722,18 +1723,18 @@
                      )
                     data)
                    ;; (message "Found heredoc end at %s-%s" start end)
-                   (phps-mode-lexer--begin
-                    'ST_END_HEREDOC)
                    (phps-mode-lexer--return-token-with-val
                     'T_ENCAPSED_AND_WHITESPACE
-                    old-start
-                    start))
+                    old-end
+                    start)
+                   (phps-mode-lexer--begin
+                    'ST_END_HEREDOC))
 
                   (t
                    ;; (message "Found variable at '%s'.. Skipping forward to 
%s" data start)
                    (phps-mode-lexer--return-token-with-val
                     'T_ENCAPSED_AND_WHITESPACE
-                    old-start
+                    old-end
                     start))
 
                   ))
diff --git a/phps-mode-test.el b/phps-mode-test.el
index d8ab8d9..9b5fba9 100644
--- a/phps-mode-test.el
+++ b/phps-mode-test.el
@@ -53,6 +53,10 @@
      (phps-mode-debug-message
        (message "\nTesting incremental buffer '%s':\n'%s'\n" ,title ,source))
      (phps-mode)
+
+     (phps-mode-debug-message
+      (message "\nPerforming changes\n"))
+     
      ,@change
      (phps-mode-lex-analyzer--process-changes test-buffer-incremental)
      (setq incremental-states phps-mode-lex-analyzer--states)
diff --git a/test/phps-mode-test-lexer.el b/test/phps-mode-test-lexer.el
index 5e1ed4e..012ec2c 100644
--- a/test/phps-mode-test-lexer.el
+++ b/test/phps-mode-test-lexer.el
@@ -357,6 +357,7 @@
   (phps-mode-test--with-buffer
    "<?php\nclass foo {\n    public $bar = <<<EOT\nbar\nEOT;\n}\n?>\n"
    "Example #2 Valid example (HEREDOC)"
+   ;; (message "tokens: %s" phps-mode-lex-analyzer--tokens)
    (should
     (equal
      phps-mode-lex-analyzer--tokens