From: Simon Ruderich Date: Thu, 15 Mar 2012 23:51:58 +0000 (+0100) Subject: Use non-capturing groups where possible. X-Git-Tag: 0.01~116 X-Git-Url: https://ruderich.org/simon/gitweb/?a=commitdiff_plain;h=3dfbabb47c0de83cdce89c835d9c6d19e25dfbb9;p=blhc%2Fblhc.git Use non-capturing groups where possible. --- diff --git a/bin/blhc b/bin/blhc index 8139368..20ccb5c 100755 --- a/bin/blhc +++ b/bin/blhc @@ -67,7 +67,7 @@ sub any_flags_used { my ($line, @flags) = @_; foreach my $flag (@flags) { - return 1 if $line =~ /\s$flag(\s|\\|$)/; + return 1 if $line =~ /\s$flag(?:\s|\\|$)/; } return 0; @@ -77,7 +77,7 @@ sub all_flags_used { my @missing_flags = (); foreach my $flag (@flags) { - if ($line !~ /\s$flag(\s|\\|$)/) { + if ($line !~ /\s$flag(?:\s|\\|$)/) { push @missing_flags, $flag; } } @@ -115,10 +115,10 @@ sub pic_pie_conflict { sub is_non_verbose_build { my ($line, $next_line, $cc_regex, $skip_ref) = @_; - my $cmake_non_verbose = qr/^\s*\[[\d ]+%\] Building (C|CXX) object (.+?)$/; + my $cmake_non_verbose = qr/^\s*\[[\d ]+%\] Building (?:C|CXX) object (.+?)$/; if (not ($line =~ /^checking if you want to see long compiling messages\.\.\. no/ - or $line =~ /^\s*(CC|CCLD)\s+/ - or $line =~ /^\s*(C|c)ompiling\s+/ + or $line =~ /^\s*(?:CC|CCLD)\s+/ + or $line =~ /^\s*(?:C|c)ompiling\s+/ or $line =~ /$cmake_non_verbose/)) { return 0; } @@ -135,7 +135,7 @@ sub is_non_verbose_build { if ($line =~ /$cmake_non_verbose/) { # Get filename, we can't use the complete path as only parts of it are # used in the real compiler command ... - $2 =~ m{/([a-zA-Z0-9._-]+)$}; + $1 =~ m{/([a-zA-Z0-9._-]+)$}; my $file = $1; if ($next_line =~ /\Q$file\E/ and $next_line =~ /$cc_regex/) { @@ -153,7 +153,7 @@ sub is_non_verbose_build { # CONSTANTS/VARIABLES # Regex to catch compiler commands. -my $cc_regex = qr/((?) { } else { # Ignore lines with no compiler commands. - next if $line !~ /\b$cc_regex(\s|\\)/ and not $non_verbose; + next if $line !~ /\b$cc_regex(?:\s|\\)/ and not $non_verbose; # Ignore false positives. # @@ -327,9 +327,9 @@ for (my $i = 0; $i < scalar @input; $i++) { # Ignore false positives. # # ./configure summary. - next if $line =~ /^\s*(C|c)ompiler[\s.]*:\s+$cc_regex(\s-std=[a-z0-9:+]+)?\s*$/ - or $line =~ /^\s*- (CC|CXX)\s*=\s*$cc_regex\s*$/ - or $line =~ /^\s*-- Check for working (C|CXX) compiler: /; + next if $line =~ /^\s*(?:C|c)ompiler[\s.]*:\s+$cc_regex(?:\s-std=[a-z0-9:+]+)?\s*$/ + or $line =~ /^\s*- (?:CC|CXX)\s*=\s*$cc_regex\s*$/ + or $line =~ /^\s*-- Check for working (?:C|CXX) compiler: /; # Is this a compiler or linker command? my $compiler = 1; @@ -338,11 +338,11 @@ for (my $i = 0; $i < scalar @input; $i++) { # Linker commands. if ($line =~ m{\s-o # -o [\s\\]*\s+ # possible line continuation - ([A-Za-z0-9_/.-]+/)? # path to file + (?:[A-Za-z0-9_/.-]+/)? # path to file [A-Za-z0-9_-]+ # binary name (no dots!) - ([0-9.]*\.so[0-9.]*[a-z]? # library (including version) + (?:[0-9.]*\.so[0-9.]*[a-z]? # library (including version) |\.la)? - (\s|\\|\$) # end of file name + (?:\s|\\|\$) # end of file name }x or $line =~ /^libtool: link: / or $line =~ m{\s*/bin/bash .+?libtool\s+(.+?\s+)?--mode=(re)?link}) { @@ -352,7 +352,7 @@ for (my $i = 0; $i < scalar @input; $i++) { # If there are source files then it's compiling/linking in one step and we # must check both. - if ($line =~ /\.(c|cc|cpp)\b/) { + if ($line =~ /\.(?:c|cc|cpp)\b/) { $compiler = 1; }