Merge branch 'master' of github.com:rtwo/phpctags into issue/31

Author: tomphp

PHPCtags.class.php

@@ -256,6 +256,10 @@ private function render()
         foreach ($this->mStructs as $struct) {
             $file = $struct['file'];
 
+            if (!in_array($struct['kind'], $this->mOptions['kinds'])) {
+                continue;
+            }
+
             if (!isset($files[$file]))
                 $files[$file] = file($file);
 

bootstrap.php

@@ -24,6 +24,7 @@
     'exclude:',
     'excmd::',
     'fields::',
+    'kinds::',
     'format::',
     'help',
     'recurse::',
@@ -57,7 +58,9 @@
   --excmd=number|pattern|mix
        Uses the specified type of EX command to locate tags [mix].
   --fields=[+|-]flags
-      Include selected extension fields (flags: "afmikKlnsStz") [fks].
+       Include selected extension fields (flags: "afmikKlnsStz") [fks].
+  --kinds=[+|-]flags
+       Enable/disable tag kinds [cmfpvdi]
   --format=level
        Force output of specified tag file format [2].
   --help
@@ -141,12 +144,20 @@
     $options['format'] = 2;
 if (!isset($options['memory']))
     $options['memory'] = '128M';
+
 if (!isset($options['fields'])) {
     $options['fields'] = array('n', 'k', 's', 'a','i');
 } else {
     $options['fields'] = str_split($options['fields']);
 }
 
+if (!isset($options['kinds'])) {
+    $options['kinds'] = array('c', 'm', 'f', 'p', 'd', 'v', 'i');
+} else {
+    $options['kinds'] = str_split($options['kinds']);
+}
+
+
 // handle -u or --sort options
 if (isset($options['sort'])) {
     // --sort or --sort=[Y,y,YES,Yes,yes]
@@ -218,6 +229,8 @@
 }
 
 $mode = ($options['sort'] == 'yes' ? 1 : ($options['sort'] == 'foldcase' ? 2 : 0));
+
+if (!isset($options['a'])) {
 $tagline = <<<EOF
 !_TAG_FILE_FORMAT\t2\t/extended format; --format=1 will not append ;" to lines/
 !_TAG_FILE_SORTED\t{$mode}\t/0=unsorted, 1=sorted, 2=foldcase/
@@ -226,6 +239,7 @@
 !_TAG_PROGRAM_URL\thttps://github.com/techlivezheng/phpctags\t/official site/
 !_TAG_PROGRAM_VERSION\t${version}\t//\n
 EOF;
+}
 
 fwrite($tagfile, $tagline.$result);
 fclose($tagfile);