starting on fixing booleans for -g

Author: petdance

ack

@@ -440,7 +440,12 @@ sub _compile_file_filter {
 
     return sub {
         if ( $opt_g ) {
-            if ( $File::Next::name =~ /$re_match/o ) {
+            my $match = ($File::Next::name =~ /$re_match/o);
+            if ( $match && $re_not ) {
+                $match = ($File::Next::name !~ /$re_not/o);
+            }
+
+            if ( $match ) {
                 return 0 if $opt_v;
             }
             else {

dev/crank-mutex

@@ -15,10 +15,9 @@ sub invalid_combinations {
     my @output     = qw( -o --output );
     my @fg         = qw( -f -g );
     my @case       = qw( -i -I --smart-case );
-    my @booleans   = qw( --and --or --not );
 
     return (
-        [qw(--or)]       => [qw( --and --not )],
+        [qw(--and)]      => [qw( --or )],
         [qw(-l)]         => [@context, @file_lists, @pretty, @filename, @output, qw(--passthru --column --show-types)],
         [qw(-L)]         => [@context, @file_lists, @pretty, @filename, @output, qw(--passthru --column --show-types -c -v)],
         [@output]        => [@context, @file_lists, @output, qw(-c --column --show-types)],
@@ -31,7 +30,6 @@ sub invalid_combinations {
         [qw(--column)]   => [@file_lists],
         [@context]       => [@file_lists],
         [qw(-f)]         => [qw(-v), @case],
-        [qw(-g)]         => [@booleans],
         [@fg]            => [@fg, @pretty, qw(-x -c -u --files-from)],
         [qw(-p)]         => [@context, @file_lists, qw(--passthru -c)],
         [qw(-v)]         => [qw(--column -o --output --passthru)],

lib/App/Ack.pm

@@ -841,7 +841,7 @@ sub build_all_regexes {
 
     my @parts;
 
-    # AND: alpha and beta
+    # AND: alpha AND beta
     if ( @parts = @{$opt->{and}} ) {
         my @match_parts;
         my @hilite_parts;
@@ -875,8 +875,9 @@ sub build_all_regexes {
         $re_hilite = $re_match;
         $re_scan   = join( '|', @scan_parts );
     }
+
     # NOT: alpha NOT beta
-    elsif ( @parts = @{$opt->{not}} ) {
+    if ( @parts = @{$opt->{not}} ) {
         ($re_match, $re_scan) = build_regex( $opt_regex, $opt );
         $re_hilite = $re_match;
 

lib/App/Ack/ConfigLoader.pm

@@ -933,7 +933,6 @@ sub mutex_options {
             'with-filename' => 1,
         },
         and => {
-            g => 1,
             or => 1,
         },
         break => {
@@ -1011,7 +1010,6 @@ sub mutex_options {
             C => 1,
             H => 1,
             L => 1,
-            and => 1,
             break => 1,
             c => 1,
             column => 1,
@@ -1024,9 +1022,7 @@ sub mutex_options {
             l => 1,
             m => 1,
             match => 1,
-            not => 1,
             o => 1,
-            or => 1,
             output => 1,
             p => 1,
             passthru => 1,
@@ -1093,10 +1089,6 @@ sub mutex_options {
             L => 1,
             l => 1,
         },
-        not => {
-            g => 1,
-            or => 1,
-        },
         o => {
             A => 1,
             B => 1,
@@ -1116,8 +1108,6 @@ sub mutex_options {
         },
         or => {
             and => 1,
-            g => 1,
-            not => 1,
         },
         output => {
             A => 1,

t/ack-g.yaml

@@ -119,3 +119,27 @@ stdout: |
   t/text/numbered-text.txt
   t/text/ozymandias.txt
   t/text/raven.txt
+
+---
+name: -g and --and
+args: -g foo --and test t/
+stdout:
+  t/swamp/foo_test.py
+  t/swamp/test_foo.py
+
+---
+name: -g and --not
+args: -g foo --not test t/
+stdout:
+  t/etc/shebang.foobar.xxx
+  t/swamp/file.foo
+
+---
+name: -g and --or
+args: -g foo --or test t/
+stdout:
+  t/etc/shebang.foobar.xxx
+  t/swamp/file.bar
+  t/swamp/file.foo
+  t/swamp/foo_test.py
+  t/swamp/test_foo.py