The -g option can now use any of the boolean options, --and, --or or --not. The --not option can be used with either --and or --or.

Author: petdance

Changes

@@ -1,5 +1,12 @@
 History file for ack 3.  https://beyondgrep.com/
 
+NEXT
+========================================
+The --not option can be used with either --and or --or.
+
+The -g option can now use any of the boolean options, --and, --or or --not.
+
+
 v3.8.2      Sun Apr  6 10:45:04 CDT 2025
 ========================================
 ack now needs YAML::PP to run its tests. Many of ack's tests are stored in

MANIFEST

@@ -112,6 +112,7 @@ t/lowercase.t
 t/match-filter.t
 t/multiple-captures.t
 t/mutex-options.t
+t/mutex.yaml
 t/named-pipes.t
 t/needs-line-scan.t
 t/noackrc.t

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 {
@@ -1320,8 +1325,7 @@ Note that the options that affect "dogs" also affect "cats", so if you have
 then the search for both "dogs" and "cats" will be case-insensitive and be
 word-limited.
 
-See also the other two boolean options C<--or> and C<--not>, neither of
-which can be used with C<--and>.
+C<--and> cannot be used with C<--or>.
 
 =item B<-A I<NUM>>, B<--after-context=I<NUM>>
 
@@ -1580,9 +1584,6 @@ if you have
 then the search for both "dogs" and "cats" will be case-insensitive and be
 word-limited.
 
-See also the other two boolean options C<--and> and C<--or>, neither of
-which can be used with C<--not>.
-
 =item B<-o>
 
 Show only the part of each line matching PATTERN (turns off text
@@ -1604,8 +1605,7 @@ Note that the options that affect "dogs" also affect "cats", so if you have
 then the search for both "dogs" and "cats" will be case-insensitive and be
 word-limited.
 
-See also the other two boolean options C<--and> and C<--not>, neither of
-which can be used with C<--or>.
+C<--or> cannot be used with C<--and>.
 
 =item B<--output=I<expr>>
 

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(--and)]      => [qw( --or --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,23 +875,21 @@ sub build_all_regexes {
         $re_hilite = $re_match;
         $re_scan   = join( '|', @scan_parts );
     }
-    # NOT: alpha NOT beta
-    elsif ( @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);
 }

lib/App/Ack/ConfigLoader.pm

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

t/Util.pm

@@ -59,7 +59,7 @@ our @EXPORT = qw(
     sets_match
     ack_lists_match
     ack_sets_match
-    ack_error_matches
+    ack_stderr_matches
 
     untaint
 
@@ -653,21 +653,24 @@ sub ack_sets_match {
 }
 
 
-sub ack_error_matches {
+sub ack_stderr_matches {
     local $Test::Builder::Level = $Test::Builder::Level + 1;
 
     my $args     = shift;
     my $expected = shift;
     my $msg      = shift;
 
     return subtest subtest_name( $msg, $args, $expected ) => sub {
-        plan tests => 4;
+        plan tests => 2;
 
         my ( $stdout, $stderr ) = run_ack_with_stderr( @{$args} );
-        isnt( get_rc(), 0, 'Nonzero error' );
         is_empty_array( $stdout, 'No normal output' );
-        is( scalar @{$stderr}, 1, 'Just one error' );
-        like( $stderr->[0], $expected, 'Error matches' );
+
+        # Sometimes we run as ack, sometimes as ack-standalone.
+        for ( @{$stderr} ) {
+            s/^ack-standalone/ack/g;
+        }
+        return lists_match( $stderr, $expected, 'stderr matches' );
     };
 }
 
@@ -1286,7 +1289,11 @@ sub read_tests {
     my @tests = $ypp->load_file( $filename );
 
     for my $test ( @tests ) {
-        $test->{stdout} = _lineify( $test->{stdout} );
+        for my $i ( qw( stdout stderr ) ) {
+            if ( exists $test->{$i} ) {
+                $test->{$i} = _lineify( $test->{$i} );
+            }
+        }
 
         if ( my $n = $test->{'indent-stdout'} ) {
             my $indent = ' ' x $n;
@@ -1352,6 +1359,9 @@ sub _validate_test {
     for my $key ( keys %{$test} ) {
         die "Invalid key $key" unless _in( $key, \@valid_keys );
     }
+    if ( not exists $test->{stdout} ) {
+        die "stdout must always be specified.";
+    }
 
     return;
 }

t/ack-g.yaml

@@ -119,3 +119,32 @@ 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 ample t/
+stdout: |
+  t/etc/shebang.foobar.xxx
+  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-options.t

@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 
-use Test::More tests => 196;
+use Test::More tests => 178;
 use lib 't';
 use Util;
 
@@ -13,20 +13,6 @@ my $file = 't/text/raven.txt';
 my $word = 'nevermore';
 
 
-# Order doesn't matter.  They are reported in alphabetical order.
-for my $opt ( qw( -p --proximate ) ) {
-    are_mutually_exclusive( '-f', $opt, ['-f', $opt] );
-    are_mutually_exclusive( '-f', $opt, [$opt, '-f'] );
-}
-
-# Check for abbreviations. https://github.com/beyondgrep/ack3/issues/57
-for my $opt ( qw( --pro --prox --proxima --proximat --proximate ) ) {
-    are_mutually_exclusive( '-f', '--proximate',
-        ['-f', $opt, '4'],
-        ['-f', "$opt=4"],
-    );
-}
-
 # XXX Should also handle --files-with-matches and --files-without-matches.  See https://github.com/beyondgrep/ack3/issues/57
 are_mutually_exclusive('-l', '-L', ['-l', '-L', $word, $file]);
 for my $opt ( qw( -l -L ) ) {
@@ -115,14 +101,6 @@ are_mutually_exclusive('--output', '--after-context', ['--output=$&', '--after-c
 are_mutually_exclusive('--output', '--before-context', ['--output=$&', '--before-context=2', $word, $file]);
 are_mutually_exclusive('--output', '--context', ['--output=$&', '--context=2', $word, $file]);
 
-# --match
-for my $opt ( qw( -f -g ) ) {
-    are_mutually_exclusive('--match', $opt,
-        ['--match', $word, $opt, $file],
-        ['--match=science', $opt, $file],
-    );
-}
-
 # --max-count
 for my $opt ( qw( -1 -c -f -g ) ) {
     are_mutually_exclusive( '-m', $opt, ['-m', 1, $opt, $word, $file] );
@@ -182,6 +160,7 @@ for my $opt ( qw( -f -g ) ) {
     are_mutually_exclusive( $opt, '--files-from', [$opt, '--files-from', $word, $file] );
 }
 
+
 subtest q{Verify that "options" that follow -- aren't factored into the mutual exclusivity} => sub {
     my ( $stdout, $stderr ) = run_ack_with_stderr('-A', 5, $word, $file, '--', '-l');
     ok(@{$stdout} > 0, 'Some lines should appear on standard output');

t/mutex.yaml

@@ -0,0 +1,73 @@
+---
+# Order doesn't matter.  They are reported in alphabetical order.
+name: -f and -g
+args:
+  - -f -g WORD
+  - -g WORD -f
+exitcode: 255
+stdout:
+stderr: |
+  ack: Options '-f' and '-g' can't be used together.
+
+---
+name: -f and -p
+args:
+  - -f -p
+  - -f -p 2
+exitcode: 255
+stdout:
+stderr: |
+  ack: Options '-f' and '-p' can't be used together.
+
+---
+name: -f and --proximate
+args:
+  - -f --proximate
+  - -f --proximate 2
+exitcode: 255
+stdout:
+stderr: |
+  ack: Options '-f' and '--proximate' can't be used together.
+
+---
+# Check for abbreviations. https://github.com/beyondgrep/ack3/issues/57
+name: -f and --proximate abbreviations
+args:
+  - -f --pro
+  - -f --prox
+  - -f --proxi
+  - -f --proxim
+  - -f --proxima
+  - -f --proximat
+  - -f --proximate
+exitcode: 255
+stdout:
+stderr: |
+  ack: Options '-f' and '--proximate' can't be used together.
+
+---
+name: -f and --match
+args:
+  - -f --match WORD
+exitcode: 255
+stdout:
+stderr: |
+  ack: Options '-f' and '--match' can't be used together.
+
+---
+name: -g and --match
+args:
+  - -g WORD --match WORD
+exitcode: 255
+stdout:
+stderr: |
+  ack: Options '-g' and '--match' can't be used together.
+
+---
+name: --or and --and
+args:
+  - this --or that --and other
+exitcode: 255
+stdout:
+stderr: |
+  ack: Options '--and' and '--or' can't be used together.