Emit include tags and improve grammar actions

Parser should perform slightly better and make better apply the
mixed-style bison/iterative parsing mechanism.

Author: jorissteyn

semantic-php-test.el

@@ -114,13 +114,16 @@ buffer."
 (defmacro with-semantic-tag (tag &rest body)
   "Analyze given TAG and execute BODY"
   `(let ((tag ,tag)
-         tag-name tag-class tag-type tag-attribs tag-props tag-overlay)
+         tag-name tag-class tag-type tag-attribs tag-props
+         tag-members tag-overlay tag-reparse-symbol)
      (setq tag-name (semantic-tag-name tag)
            tag-class (semantic-tag-class tag)
            tag-type (semantic-tag-type tag)
            tag-attribs (semantic-tag-attributes tag)
            tag-props (semantic-tag-properties tag)
-           tag-overlay (semantic-tag-overlay tag))
+           tag-members (semantic-tag-components tag)
+           tag-overlay (semantic-tag-overlay tag)
+           tag-reparse-symbol (plist-get tag-props 'reparse-symbol))
      ,@body))
 
 (require 'test/context)

semantic-php-util.el

@@ -49,31 +49,32 @@ parser can parse source files of common frameworks and libraries."
     (require 'semantic-php)
     (require 'test/php-faux-mode)
 
-    (dolist (file files)
-      ;; Open the file in a buffer
-      (find-file file)
+    (semantic-php-util-measure
+     (dolist (file files)
+       ;; Open the file in a buffer
+       (find-file file)
 
-      (message "Parsing %s" file)
+       (message "Parsing %s" file)
 
-      ;; Load fake php-mode
-      (php-mode)
+       ;; Load fake php-mode
+       (php-mode)
 
-      ;; Enable semantic-php
-      (semantic-php-default-setup)
-      (semantic-lex-init)
+       ;; Enable semantic-php
+       (semantic-php-default-setup)
+       (semantic-lex-init)
 
-      ;; Parse the file
-      (setq tagcount (+ tagcount (length
-                                  (wisent-parse-region (point-min) (point-max)))))
+       ;; Parse the file
+       (setq tagcount (+ tagcount (length
+                                   (wisent-parse-region (point-min) (point-max)))))
 
-      ;; Clean up and report progress
-      (kill-buffer)
+       ;; Clean up and report progress
+       (kill-buffer)
 
-      (progress-reporter-update progress-reporter
-                                (setq progress (1+ progress))))
+       (progress-reporter-update progress-reporter
+                                 (setq progress (1+ progress))))
 
-    (progress-reporter-done progress-reporter)
-    (message "Found total of %d tags" tagcount)))
+     (progress-reporter-done progress-reporter)
+     (message "Found total of %d tags" tagcount))))
 
 (defun semantic-php-util-files-in-directory (directory)
   "Scan DIRECTORY recursively for source files.
@@ -95,6 +96,12 @@ Returns a list of absolute file names."
              ;; Collect found source file
              (setq files (nconc files (list fullpath))))))))
 
+(defmacro semantic-php-util-measure (&rest body)
+  "Measure time while evaluating BODY."
+  `(let ((time (current-time)))
+     ,@body
+     (message "Total parsing time: %.04f seconds" (float-time (time-since time)))))
+
 (defun semantic-php-util-compile-grammar ()
   "Generate the wisent parser semantic-php-wy.el."
   (let* ((grammar-path (concat (or (getenv "PACKAGE_PATH")

semantic-php-wy-macro.el

@@ -26,20 +26,29 @@
 ;; TODO: create cleverer expand* macro's to accomodate cases like
 ;; inline_use_statements, parenthesized expressions, etc.
 
-(defun semantic-php-wy-macro-EXPANDFULL (symb nonterm &optional depth)
-  "Expand call to EXPANDFULL grammar macro.
-Return the form to recursively parse an area.
-SYMB is a $I placeholder symbol that gives the bounds of the area.
-NONTERM is the nonterminal symbol to start with.
-DEPTH is the maximum parsing depth (defaults to 1)."
-  (unless (member nonterm (semantic-grammar-start))
-    (error "EXPANDFULL macro called with %s, but not used with %%start"
-           nonterm))
-  (let (($ri (wisent-grammar-region-placeholder symb)))
-    (if $ri
-        `(semantic-parse-region
-          (car ,$ri) (cdr ,$ri) ',nonterm (or ,depth 1))
-      (error "Invalid form (EXPANDFULL %s %s)" symb nonterm))))
+(defun semantic-php-wy-macro-INCLUDE-TAG (name system-flag &rest attributes)
+  "Expand call to INCLUDE-TAG grammar macro.
+
+Same as grammar-macros.el INCLUDE-TAG but allows NAME to be the
+result of the expr rule. An include tag is emitted only when NAME
+is a string, or NAME is list of one 'code tag with name
+\"scalar\" and contains the include name in the :detail
+attribute.
+
+Return the form to create a semantic tag of class include.
+See the function `semantic-tag-new-include' for the meaning of
+arguments NAME, SYSTEM-FLAG and ATTRIBUTES."
+  `(let (incname)
+     (if (stringp ,name)
+         (setq incname ,name)
+       (when (and (equal 1 (length ,name))
+                  (semantic-tag-of-class-p (car ,name) 'scalar))
+         (setq incname (semantic-tag-name (car ,name)))))
+
+     (when incname
+       (wisent-cook-tag
+        (wisent-raw-tag
+         (semantic-tag-new-include (substring incname 1 -1) ,system-flag ,@attributes))))))
 
 (defun semantic-php-wy-macro-EXPANDLIST (tags)
   "Expand a list of raw tags TAGS."

semantic-php.el

@@ -131,7 +131,7 @@
 
 If the name of the tag is a cons cell, assume (name . (start . end))
 and set bounds accordingly."
-  ;; TODO: restore expansion of use_declarations, compount class
+  ;; TODO: restore expansion of use_declarations, compound class
   ;; properties and constant definitions, trait usages and global and
   ;; static variables.
   nil)