[elpa] externals/phps-mode e3bf9e8fed 059/212: SDT rules for some more infix operations

[Christian Johansson]

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

    SDT rules for some more infix operations
---
 phps-mode-ast-bookkeeping.el | 18 +++++++++-
 phps-mode-parser-sdt.el      | 85 ++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 102 insertions(+), 1 deletion(-)

diff --git a/phps-mode-ast-bookkeeping.el b/phps-mode-ast-bookkeeping.el
index 14042c6a54..ab798591aa 100644
--- a/phps-mode-ast-bookkeeping.el
+++ b/phps-mode-ast-bookkeeping.el
@@ -446,7 +446,14 @@
                defined
                bookkeeping)))
 
-           ((equal type 'addition-expression)
+           ;; Infix operations
+           ((or
+             (equal type 'addition-expression)
+             (equal type 'boolean-and-expression)
+             (equal type 'boolean-or-expression)
+             (equal type 'logical-and-expression)
+             (equal type 'logical-or-expression)
+             (equal type 'logical-xor-expression))
             (when-let ((bs (reverse (plist-get item 'b))))
               (dolist (b bs)
                 (push `(,scope ,b) bookkeeping-stack)))
@@ -560,6 +567,15 @@
            ((equal type 'increment-variable)
             (push `(,scope ,(plist-get item 'variable)) bookkeeping-stack))
 
+           ((equal type 'negated-expression)
+            (let ((expression (plist-get item 'expression)))
+              ;; TODO Define sub-scope here
+              (when (equal (plist-get expression 'ast-type) 'empty-expression)
+                (let ((not-empty-variables (reverse (plist-get expression 
'variables))))
+                  ;; TODO Define variable here
+                  ))
+              (push `(,scope ,expression) bookkeeping-stack)))
+
            ((equal type 'try)
             (when-let ((children (reverse (plist-get item 
'inner-statement-list))))
               (dolist (child children)
diff --git a/phps-mode-parser-sdt.el b/phps-mode-parser-sdt.el
index 0ab528de7d..c1f022d112 100644
--- a/phps-mode-parser-sdt.el
+++ b/phps-mode-parser-sdt.el
@@ -684,6 +684,71 @@
      ast-object))
  phps-mode-parser--table-translations)
 
+;; expr -> (expr T_BOOLEAN_OR expr)
+(puthash
+ 357
+ (lambda(args _terminals)
+   `(
+     ast-type
+     boolean-or-expression
+     a
+     ,(phps-mode-parser-sdt--get-list-of-object (nth 0 args))
+     b
+     ,(phps-mode-parser-sdt--get-list-of-object (nth 2 args))))
+ phps-mode-parser--table-translations)
+
+;; expr -> (expr T_BOOLEAN_AND expr)
+(puthash
+ 358
+ (lambda(args _terminals)
+   `(
+     ast-type
+     boolean-and-expression
+     a
+     ,(phps-mode-parser-sdt--get-list-of-object (nth 0 args))
+     b
+     ,(phps-mode-parser-sdt--get-list-of-object (nth 2 args))))
+ phps-mode-parser--table-translations)
+
+;; expr -> (expr T_LOGICAL_OR expr)
+(puthash
+ 359
+ (lambda(args _terminals)
+   `(
+     ast-type
+     logical-or-expression
+     a
+     ,(phps-mode-parser-sdt--get-list-of-object (nth 0 args))
+     b
+     ,(phps-mode-parser-sdt--get-list-of-object (nth 2 args))))
+ phps-mode-parser--table-translations)
+
+;; expr -> (expr T_LOGICAL_AND expr)
+(puthash
+ 360
+ (lambda(args _terminals)
+   `(
+     ast-type
+     logical-and-expression
+     a
+     ,(phps-mode-parser-sdt--get-list-of-object (nth 0 args))
+     b
+     ,(phps-mode-parser-sdt--get-list-of-object (nth 2 args))))
+ phps-mode-parser--table-translations)
+
+;; expr -> (expr T_LOGICAL_XOR expr)
+(puthash
+ 361
+ (lambda(args _terminals)
+   `(
+     ast-type
+     logical-xor-expression
+     a
+     (phps-mode-parser-sdt--get-list-of-object ,(nth 0 args))
+     b
+     ,(phps-mode-parser-sdt--get-list-of-object (nth 2 args))))
+ phps-mode-parser--table-translations)
+
 ;; expr -> (expr "+" expr)
 (puthash
  366
@@ -699,6 +764,19 @@
      ast-object))
  phps-mode-parser--table-translations)
 
+;; expr -> ("!" expr)
+(puthash
+ 376
+ (lambda(args _terminals)
+   (let ((ast-object
+          (list
+           'ast-type
+           'negated-expression
+           'expression
+           (nth 1 args))))
+     ast-object))
+ phps-mode-parser--table-translations)
+
 ;; expr -> (T_STATIC inline_function)
 (puthash
  413
@@ -836,6 +914,13 @@
    (string-to-number args))
  phps-mode-parser--table-translations)
 
+;; scalar -> (T_T_DNUMBER)
+(puthash
+ 452
+ (lambda(args _terminals)
+   (string-to-number args))
+ phps-mode-parser--table-translations)
+
 ;; callable_variable -> (array_object_dereferencable "[" optional_expr "]")
 (puthash
  483