Boolean -g is working again

Author: petdance

lib/App/Ack.pm

@@ -875,24 +875,21 @@ sub build_all_regexes {
         $re_hilite = $re_match;
         $re_scan   = join( '|', @scan_parts );
     }
-
-    # NOT: alpha NOT beta
-    if ( @parts = @{$opt->{not}} ) {
+    else {
         ($re_match, $re_scan) = build_regex( $opt_regex, $opt );
         $re_hilite = $re_match;
+    }
 
+    # The --not does not affect the main regex. It is checked separately.
+    # NOT: alpha NOT beta
+    if ( @parts = @{$opt->{not}} ) {
         my @not_parts;
         for my $part ( @parts ) {
             (my $re, undef) = build_regex( $part, $opt );
             push @not_parts, $re;
         }
         $re_not = join( '|', @not_parts );
     }
-    # No booleans.
-    else {
-        ($re_match, $re_scan) = build_regex( $opt_regex, $opt );
-        $re_hilite = $re_match;
-    }
 
     return ($re_match, $re_not, $re_hilite, $re_scan);
 }

t/ack-g.yaml

@@ -123,23 +123,28 @@ stdout: |
 ---
 name: -g and --and
 args: -g foo --and test t/
-stdout:
+stdout: |
   t/swamp/foo_test.py
   t/swamp/test_foo.py
 
 ---
 name: -g and --not
 args: -g foo --not test t/
-stdout:
+stdout: |
   t/etc/shebang.foobar.xxx
   t/swamp/file.foo
 
 ---
 name: -g and --or
-args: -g foo --or test t/
-stdout:
+args: -g foo --or ample t/
+stdout: |
   t/etc/shebang.foobar.xxx
-  t/swamp/file.bar
+  t/swamp/example.R
   t/swamp/file.foo
   t/swamp/foo_test.py
+  t/swamp/Sample.ascx
+  t/swamp/Sample.asmx
+  t/swamp/sample.asp
+  t/swamp/sample.aspx
+  t/swamp/sample.rake
   t/swamp/test_foo.py

t/mutex.yaml

@@ -71,12 +71,3 @@ exitcode: 255
 stdout:
 stderr: |
   ack: Options '--and' and '--or' can't be used together.
-
----
-name: --or and --not
-args:
-  - this --or that --not other
-exitcode: 255
-stdout:
-stderr: |
-  ack: Options '--not' and '--or' can't be used together.

t/yaml.t

@@ -34,7 +34,7 @@ MAIN: {
                     if ( $tempfilename ) {
                         $args = [ @{$args}, $tempfilename ];
                     }
-                    subtest $test->{name} . ' ' . join( ', ', @{$args} ) => sub {
+                    subtest $test->{name} . ': ack ' . join( ' ', @{$args} ) => sub {
                         if ( exists $test->{stderr} ) {
                             ack_stderr_matches( $args, $test->{stderr}, $test->{name} );
                             is( get_rc(), $test->{exitcode}, 'Exit code matches' );