Improve regexes in rename.pl

This commit is contained in:
Manuel Pégourié-Gonnard 2015-04-08 20:10:16 +02:00
parent f2c8711088
commit c559f0476d

View file

@ -38,10 +38,10 @@ for my $name (@names) {
$subst{$old} = $new; $subst{$old} = $new;
} }
my $string = qr/".*?(?<!\\)"/; my $string = qr/"(?:\\.|[^\\"])*"/;
my $space = qr/\s+/; my $space = qr/\s+/;
my $idnum = qr/[a-zA-Z0-9_]+/; my $idnum = qr/[a-zA-Z0-9_]+/;
my $symbols = qr/[!#%&'()*+,-.:;<=>?@^_`{|}~\$\/\[\\\]]+|"/; my $symbols = qr/[-!#$%&'()*+,.\/:;<=>?@[\\\]^_`{|}~]+|"/;
# if we replace inside strings, we don't consider them a token # if we replace inside strings, we don't consider them a token
my $token = $do_strings ? qr/$space|$idnum|$symbols/ my $token = $do_strings ? qr/$space|$idnum|$symbols/
@ -86,7 +86,7 @@ while( my $filename = shift )
} }
if( %warnings ) { if( %warnings ) {
print "\nWarning: lines skipped due to unexpected charaacters:\n"; print "\nWarning: lines skipped due to unexpected characters:\n";
for my $filename (sort keys %warnings) { for my $filename (sort keys %warnings) {
print "in $filename:\n"; print "in $filename:\n";
print for @{ $warnings{$filename} }; print for @{ $warnings{$filename} };