Merge branch 'feature/improved-tokens-support' into develop

Author: weynhamz

PHPCtags.class.php

@@ -121,6 +121,10 @@ private function struct($node, $reset=FALSE, $parent=array())
             foreach ($node as $subNode) {
                 $this->struct($subNode, FALSE, array('method' => $name));
             }
+        } elseif ($node instanceof PHPParser_Node_Stmt_If) {
+            foreach ($node as $subNode) {
+                $this->struct($subNode);
+            }
         } elseif ($node instanceof PHPParser_Node_Stmt_Const) {
             $kind = 'd';
             $cons = $node->consts[0];
@@ -135,15 +139,17 @@ private function struct($node, $reset=FALSE, $parent=array())
             //@todo
         } elseif ($node instanceof PHPParser_Node_Stmt_Declare) {
             //@todo
+        } elseif ($node instanceof PHPParser_Node_Stmt_TryCatch) {
+            foreach ($node as $subNode) {
+                $this->struct($subNode);
+            }
         } elseif ($node instanceof PHPParser_Node_Stmt_Function) {
             $kind = 'f';
             $name = $node->name;
             $line = $node->getLine();
             foreach ($node as $subNode) {
                 $this->struct($subNode, FALSE, array('function' => $name));
             }
-        } elseif ($node instanceof PHPParser_Node_Stmt_Trait) {
-            //@todo
         } elseif ($node instanceof PHPParser_Node_Stmt_Interface) {
             $kind = 'i';
             $name = $node->name;

tests/examples/0003.example.define.php

@@ -0,0 +1,20 @@
+<?php
+function e_0003_define()
+{
+    return array(
+        array(
+            'name'=>'$ctags',
+            'kind'=>'v',
+            'line'=>'3',
+            'scope'=>'',
+            'access'=>'',
+        ),
+        array(
+            'name'=>'$result',
+            'kind'=>'v',
+            'line'=>'4',
+            'scope'=>'',
+            'access'=>'',
+        ),
+    );
+}

tests/examples/0003.example.php

@@ -0,0 +1,7 @@
+<?php
+try {
+    $ctags = new PHPCtags();
+    $result = $ctags->export($file, $options);
+} catch (Exception $e) {
+    die("phpctags: {$e->getMessage()}");
+}

tests/examples/bugfix_0007.example.define.php

@@ -0,0 +1,13 @@
+<?php
+function e_bugfix_0007_define()
+{
+    return array(
+        array(
+            'name'=>'MyClass',
+            'kind'=>'c',
+            'line'=>'3',
+            'scope'=>'',
+            'access'=>'',
+        ),
+    );
+}

tests/examples/bugfix_0007.example.php

@@ -0,0 +1,5 @@
+<?php
+if (!class_exists('MyClass')) {
+    class MyClass {
+    }
+}

tests/testcases/0003.testcase.php

@@ -0,0 +1,10 @@
+<?php
+class t_0003 extends PHPCtagsTestCase {
+
+    public function __construct()
+    {
+        parent::__construct();
+        $this->mExample = '0003';
+    }
+
+}

tests/testcases/bugfix_0007.testcase.php

@@ -0,0 +1,10 @@
+<?php
+class t_bugfix_0007 extends PHPCtagsTestCase {
+
+    public function __construct()
+    {
+        parent::__construct();
+        $this->mExample = 'bugfix_0007';
+    }
+
+}