Merge branch 'feature/github-pull-17' into develop

Author: weynhamz

PHPCtags.class.php

@@ -15,6 +15,7 @@ class PHPCtags
         'd' => 'constant',
         'v' => 'variable',
         'i' => 'interface',
+        'n' => 'namespace',
     );
 
     private $mParser;
@@ -182,9 +183,11 @@ private function struct($node, $reset=FALSE, $parent=array())
                 $this->struct($subNode, FALSE, array('interface' => $name));
             }
         } elseif ($node instanceof PHPParser_Node_Stmt_Namespace) {
-            //@todo
+            $kind = 'n';
+            $name = $node->name;
+            $line = $node->getLine();
             foreach ($node as $subNode) {
-                $this->struct($subNode);
+                $this->struct($subNode, FALSE, array('namespace' => $name));
             }
         } elseif ($node instanceof PHPParser_Node_Expr_Assign) {
             if (is_string($node->var->name)) {
@@ -283,19 +286,39 @@ private function render()
 
             #field=s
             if (in_array('s', $this->mOptions['fields']) && !empty($struct['scope'])) {
+                // $scope, $type, $name are current scope variables
                 $scope = array_pop($struct['scope']);
                 list($type, $name) = each($scope);
                 switch ($type) {
+                    case 'class':
+                        // n_* stuffs are namespace related scope variables
+                        // current > class > namespace
+                        $n_scope = array_pop($struct['scope']);
+                        if(!empty($n_scope)) {
+                            list($n_type, $n_name) = each($n_scope);
+                            $s_str = 'class:' . $n_name . '\\' . $name;
+                        } else {
+                            $s_str = 'class:' . $name;
+                        }
+                        break;
                     case 'method':
-                        $scope = array_pop($struct['scope']);
-                        list($p_type, $p_name) = each($scope);
-                        $scope = 'method:' . $p_name . '::' . $name;
+                        // c_* stuffs are class related scope variables
+                        // current > method > class > namespace
+                        $c_scope = array_pop($struct['scope']);
+                        list($c_type, $c_name) = each($c_scope);
+                        $n_scope = array_pop($struct['scope']);
+                        if(!empty($n_scope)) {
+                            list($n_type, $n_name) = each($n_scope);
+                            $s_str = 'method:' . $n_name . '\\' . $c_name . '::' . $name;
+                        } else {
+                            $s_str = 'method:' . $c_name . '::' . $name;
+                        }
                         break;
                     default:
-                        $scope = $type . ':' . $name;
+                        $s_str = $type . ':' . $name;
                         break;
                 }
-                $str .= "\t" . $scope;
+                $str .= "\t" . $s_str;
             }
 
             #field=a