mirror/autoconf
2
0
Fork 0
mirror of git://git.sv.gnu.org/autoconf synced 2025-01-18 10:45:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

Make help-extract.pl work with Perl 5.10.x.

Browse Source 
The main issue was use of s///r; the /r modifier was added in 5.14.
Since the baseline is now 5.10.0 instead of 5.6.0, a couple places
can be tidied up using slightly newer constructs.

* help-extract.pl: Use File::Spec::Functions instead of File::Spec
  for reduced clunkiness.
  (eval_qq_no_interpolation): Don’t use s///r.  Do use \K and (?=...)
  to match the empty string (but only in just the right locations),
  so we don’t need to use $& in the replacement.
  (main): Don’t use s///r.
This commit is contained in:
Zack Weinberg 2022-07-10 11:47:45 -04:00
parent f580247d46
commit db7205a864
No known key found for this signature in database
GPG Key ID: 384F8E68AC65B0D5
1 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
build-aux/help-extract.pl
View File

@ -19,10 +19,7 @@
use 5.010;
use strict;
use warnings;
# File::Spec itself was added in 5.005.
# File::Spec::Functions was added in 5.6.1 which is just barely too new.
use File::Spec;
use File::Spec::Functions qw(catfile);
# This script is not intended to be used directly. It's run by
# help2man via wrappers in man/, e.g. man/autoconf.w, as if it were
@ -51,11 +48,17 @@ sub eval_qq_no_interpolation ($)
# The argument is expected to be a "double quoted string" including the
# leading and trailing delimiters. Returns the text of this string after
# processing backslash escapes but NOT interpolation.
# / (?<!\\) (?>\\\\)* blah /x means match blah preceded by an
# *even* number of backslashes. It would be nice if we could use \K
# to exclude the backslashes from the matched text, but that was only
# added in Perl 5.10 and we still support back to 5.006.
return eval $_[0] =~ s/ (?<!\\) (?>\\\\)* [\$\@] /\\$&/xrg;
my $s = $_[0];
# Escape $ and @ inside the string, if they are not already escaped.
# The regex matches the empty string, but only if it is preceded by an
# even number of backslashes (including zero) and followed by either a
# literal $ or a literal @. Then we insert a backslash at the position
# of the match.
$s =~ s/ (?:\A|[^\\]) (?:\\\\)* \K (?=[\$\@]) /\\/xg;
# It is now safe to feed the string to 'eval'.
return eval $s;
}
sub extract_channeldefs_usage ($)
@ -198,9 +201,10 @@ The script-source argument should also be relative to top_srcdir.
die $usage;
}
my $cmd_name = $source =~ s{^.*/([^./]+)\.in$}{$1}r;
$source = File::Spec->catfile($top_srcdir, $source);
$channeldefs_pm = File::Spec->catfile($top_srcdir, $channeldefs_pm);
my $cmd_name = $source;
$cmd_name =~ s{^.*/([^./]+)\.in$}{$1};
$source = catfile($top_srcdir, $source);
$channeldefs_pm = catfile($top_srcdir, $channeldefs_pm);
my $text = extract_assignment ($source, $channeldefs_pm, $what);
$text =~ s/\$0\b/$cmd_name/g;