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

Author: weynhamz

PHPCtags.class.php

@@ -48,6 +48,32 @@ private function getNodeAccess($node)
         return 'public';
     }
 
+    /**
+     * stringSortByLine
+     *
+     * Sort a string based on its line delimiter
+     *
+     * @author Techlive Zheng
+     *
+     * @access public
+     * @static
+     *
+     * @param string  $str     string to be sorted
+     * @param boolean $foldcse case-insensitive sorting
+     *
+     * @return string sorted string
+     **/
+    public static function stringSortByLine($str, $foldcase=FALSE)
+    {
+        $arr = explode("\n", $str);
+        if (!$foldcase)
+            sort($arr, SORT_STRING);
+        else
+            sort($arr, SORT_STRING | SORT_FLAG_CASE);
+        $str = implode("\n", $arr);
+        return $str;
+    }
+
     private static function helperSortByLine($a, $b) {
         return $a['line'] > $b['line'] ? 1 : 0;
     }
@@ -163,7 +189,10 @@ private function struct($node, $reset=FALSE, $parent=array())
 
         if(!empty($parent)) array_pop($scope);
 
-        usort($structs, 'self::helperSortByLine');
+        // if no --sort is given, sort by occurrence
+        if (!isset($options['sort']) || $options['sort'] == 'no') {
+            usort($structs, 'self::helperSortByLine');
+        }
 
         return $structs;
     }
@@ -243,6 +272,12 @@ private function render($structs, $options)
 
             $str .= "\n";
         }
+
+        // sort the result as instructed
+        if (isset($options['sort']) && ($options['sort'] == 'yes' || $options['sort'] == 'foldcase')) {
+            $str = self::stringSortByLine($str, $options['sort'] == 'foldcase');
+        }
+
         return $str;
     }
 

phpctags

@@ -12,18 +12,24 @@ if (file_exists($autoload = __DIR__ . '/vendor/autoload.php')) {
     );
 }
 
-$options = getopt('af:R',array(
+$options = getopt('af:Nno:RuV',array(
     'append::',
     'debug',
     'exclude:',
     'excmd::',
     'fields::',
     'format::',
     'recurse::',
+    'sort::',
     'version',
     'memory::',
 ));
 
+// option -V is an alternative to --version
+if (isset($options['V'])) {
+    $options['version'] = FALSE;
+}
+
 if(!isset($options['debug'])) {
     error_reporting(0);
 }
@@ -43,6 +49,30 @@ array_shift($argv);
 
 $file = array_pop($argv);
 
+// option -o is an alternative to -f
+if (isset($options['o']) && !isset($options['f'])) {
+    $options['f'] = $options['o'];
+}
+
+// if both -n and -N options are given, use the last specified one
+if (isset($options['n']) && isset($options['N'])) {
+    if (array_search('n', array_keys($options)) < array_search('N', array_keys($options))) {
+        unset($options['n']);
+    } else {
+        unset($options['N']);
+    }
+}
+
+// option -n is equivalent to --excmd=number
+if (isset($options['n']) && !isset($options['N'])) {
+    $options['excmd'] = 'number';
+}
+
+// option -N is equivalent to --excmd=pattern
+if (isset($options['N']) && !isset($options['n'])) {
+    $options['excmd'] = 'pattern';
+}
+
 if(!isset($options['excmd']))
     $options['excmd'] = 'pattern';
 if(!isset($options['format']))
@@ -55,6 +85,28 @@ if(!isset($options['fields'])) {
     $options['fields'] = str_split($options['fields']);
 }
 
+// handle -u or --sort options
+if (isset($options['sort'])) {
+    // --sort or --sort=[Y,y,YES,Yes,yes]
+    if ($options['sort'] === FALSE || yes_or_no($options['sort']) == 'yes') {
+        $options['sort'] = 'yes';
+    // --sort=[N,n,NO,No,no]
+    } else if (yes_or_no($options['sort']) == 'no') {
+        $options['sort'] = 'no';
+    // --sort=foldcase, case insensitive sorting
+    } else if ($options['sort'] == 'foldcase') {
+        $options['sort'] = 'foldcase';
+    } else {
+        die('phpctags: Invalid value for "sort" option');
+    }
+// option -n is equivalent to --sort=no
+} else if (isset($options['u'])) {
+    $options['sort'] = 'no';
+// sort the result by default
+} else {
+    $options['sort'] = 'yes';
+}
+
 // if the memory limit option is set and is valid, adjust memory
 if (isset($options['memory'])) {
     $memory_limit = trim($options['memory']);
@@ -86,10 +138,15 @@ try {
     die("phpctags: {$e->getMessage()}");
 }
 
+// write to a specified file
 if (isset($options['f']) && $options['f'] !== '-') {
     $tagfile = fopen($options['f'], isset($options['a']) ? 'a' : 'w');
-} else {
+// write to stdout only when instructed
+} else if (isset($options['f']) && $options['f'] === '-') {
     $tagfile = fopen('php://stdout', 'w');
+// write to file 'tags' by default
+} else {
+    $tagfile = fopen('tags', isset($options['a']) ? 'a' : 'w');
 }
 fwrite($tagfile, $result);
 fclose($tagfile);