[elpa] externals/phps-mode 945571c 65/96: Fixed byte-compilation issues with parser

[Christian Johansson]

branch: externals/phps-mode
commit 945571cfe892351ad9044a0ecbfe5bc8e36f7150
Author: Christian Johansson <christian@cvj.se>
Commit: Christian Johansson <christian@cvj.se>

    Fixed byte-compilation issues with parser
---
 phps-mode-parser.el | 169 +++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 167 insertions(+), 2 deletions(-)

diff --git a/phps-mode-parser.el b/phps-mode-parser.el
index 8881fcf..bbf3ca4 100644
--- a/phps-mode-parser.el
+++ b/phps-mode-parser.el
@@ -102,12 +102,177 @@
 
 (defvar
   phps-mode-parser-lex-analyzer--function
-  (lambda (buffer-index) (if (get-buffer "*PHPs Lexer*") nil 
(generate-new-buffer "*PHPs Lexer*") (let ((old-buffer 
(buffer-substring-no-properties (point-min) (point-max)))) (save-current-buffer 
(set-buffer "*PHPs Lexer*") (insert old-buffer)))))
+  (lambda (buffer-index)
+
+    ;; Create lexer buffer if none exists
+    (unless (get-buffer "*PHPs Lexer*")
+      (generate-new-buffer "*PHPs Lexer*")
+      (let ((old-buffer
+             (buffer-substring-no-properties
+              (point-min)
+              (point-max))))
+        (with-current-buffer "*PHPs Lexer*"
+          (insert old-buffer))))
+    
+    (with-current-buffer "*PHPs Lexer*"
+      (let ((token-list-index))
+        (if (and
+             phps-mode-parser-position
+             (= (car (car phps-mode-parser-position)) buffer-index))
+            (progn
+              (setq
+               token-list-index
+               (car (cdr (car phps-mode-parser-position)))))
+
+          ;; Search from last requested index and forward until
+          ;; we find a token starting at or after buffer-index and
+          ;; use this as buffer-index, save buffer-index to
+          ;; token-list-index connection
+          (let ((previous-token-list-index 0))
+            (when (and
+                   phps-mode-parser-position
+                   (< (car (car phps-mode-parser-position)) buffer-index))
+              (setq
+               previous-token-list-index
+               (car (cdr (car phps-mode-parser-position)))))
+
+            (let ((temp-token-list-index
+                   previous-token-list-index)
+                  (token-list-size
+                   (length
+                    phps-mode-parser-tokens))
+                  (continue t))
+              (while (and
+                      continue
+                      (<
+                       temp-token-list-index
+                       token-list-size))
+                (let ((token
+                       (nth
+                        temp-token-list-index
+                        phps-mode-parser-tokens)))
+
+                  ;; When token starts at cursor we found correct index
+                  ;; Save it
+                  (when (= (car (cdr token)) buffer-index)
+                    (let ((token-type (car token)))
+                      (push
+                       (list
+                        buffer-index
+                        temp-token-list-index)
+                       phps-mode-parser-position)
+                      (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
+                         token-list-index
+                         temp-token-list-index)
+                        (setq
+                         continue
+                         nil))))
+
+                  ;; When token starts after cursor, flag move of cursor
+                  ;; Save it
+                  (when (> (car (cdr token)) buffer-index)
+                    (let ((token-type (car token)))
+                      (push
+                       (list
+                        (car (cdr token))
+                        temp-token-list-index)
+                       phps-mode-parser-position)
+                      (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
+                         phps-mode-parser-lex-analyzer--move-to-index-flag
+                         (car (cdr token)))
+                        (setq
+                         continue
+                         nil))))
+
+                  (setq
+                   temp-token-list-index
+                   (1+ temp-token-list-index))
+                  )))))
+
+        (when
+            token-list-index
+          (let ((token
+                 (nth
+                  token-list-index
+                  phps-mode-parser-tokens)))
+            (when (equal (car token) 'T_OPEN_TAG_WITH_ECHO)
+              (setf
+               (car token)
+               'T_ECHO))
+            token)))))
   "The lex-analyzer function.")
 
 (defvar
   phps-mode-parser-lex-analyzer--reset-function
-  (lambda nil (if (get-buffer "*PHPs Lexer*") nil (generate-new-buffer "*PHPs 
Lexer*") (let ((old-buffer (buffer-substring-no-properties (point-min) 
(point-max)))) (save-current-buffer (set-buffer "*PHPs Lexer*") (insert 
old-buffer)))))
+  (lambda()
+    ;; Create lexer buffer if none exists
+    (unless (get-buffer "*PHPs Lexer*")
+      (generate-new-buffer "*PHPs Lexer*")
+      (let ((old-buffer
+             (buffer-substring-no-properties
+              (point-min)
+              (point-max))))
+        (with-current-buffer "*PHPs Lexer*"
+          (insert old-buffer))))
+
+    (with-current-buffer "*PHPs Lexer*"
+      ;; Unless we have lexed the buffer
+      (unless phps-mode-parser-tokens
+        (unless phps-mode-lexer--generated-tokens
+          ;; Reset lexer
+          (setq-local
+           phps-mode-lexer--generated-tokens
+           nil)
+          (setq-local
+           phps-mode-lexer--state
+           'ST_INITIAL)
+          (setq-local
+           phps-mode-lexer--states
+           nil)
+          (setq-local
+           phps-mode-lexer--state-stack
+           nil)
+          (setq-local
+           phps-mode-lexer--heredoc-label
+           nil)
+          (setq-local
+           phps-mode-lexer--heredoc-label-stack
+           nil)
+          (setq-local
+           phps-mode-lexer--nest-location-stack
+           nil)
+          (goto-char (point-min))
+
+          ;; Run lexer on entire buffer here
+          (let ((index (point))
+                (max-index (point-max)))
+            (while (< index max-index)
+              (phps-mode-lexer--re2c)
+              (setq
+               index
+               semantic-lex-end-point)
+              (goto-char index))))
+        (setq-local
+         phps-mode-parser-tokens
+         (reverse
+          phps-mode-lexer--generated-tokens))
+
+        ;; Reset buffer-index to token-list-index connections
+        (setq-local
+         phps-mode-parser-position
+         nil)))
+
+    )
   "The lex-analyzer reset function.")