[elpa] externals/phps-mode 8ec76e8 5/7: Improved parser to pass more meta-data about tokens for SDT

[Christian Johansson]

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

    Improved parser to pass more meta-data about tokens for SDT
---
 phps-mode-parser.el | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/phps-mode-parser.el b/phps-mode-parser.el
index 5e4dc21..76cfe98 100644
--- a/phps-mode-parser.el
+++ b/phps-mode-parser.el
@@ -615,10 +615,10 @@
                                           (let ((symbol-translation
                                                  (pop symbol-translations)))
                                             (push
-                                             symbol-translation
+                                             (car symbol-translation)
                                              popped-items-meta-contents)
                                             (push
-                                             nil
+                                             (car (cdr symbol-translation))
                                              popped-items-terminals)
                                             (puthash
                                              temp-hash-key
@@ -659,7 +659,9 @@
                                               temp-hash-key
                                               translation-symbol-table)))
                                         (push
-                                         partial-translation
+                                         (list
+                                          partial-translation
+                                          (if (= (length 
popped-items-terminals) 1) popped-items-terminals nil))
                                          symbol-translations)
                                         (puthash
                                          temp-hash-key
@@ -671,7 +673,9 @@
 
                                 ;; When no translation is specified just use 
popped contents as translation
                                 (let ((partial-translation
-                                       popped-items-meta-contents))
+                                       (list
+                                        popped-items-meta-contents
+                                        popped-items-terminals)))
                                   (let ((temp-hash-key
                                          (format
                                           "%S"
@@ -689,7 +693,7 @@
                                        translation-symbol-table)
                                       (setq
                                        translation
-                                       partial-translation)))))))
+                                       (car partial-translation))))))))
 
                           (let ((new-table-index (car pushdown-list)))
                             (let ((goto-table-distinct-index