git.shiar.nl
/
perl
/
file-rewrite.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fileset: array search
[perl/file-rewrite.git]
/
lib
/
File
/
Rewrite.pm
diff --git
a/lib/File/Rewrite.pm
b/lib/File/Rewrite.pm
index 5a30a32989c80df3b8e91dca1ed9596333bef71e..2b05ded11175fc09025378089fa0fb67e8f64d6e 100644
(file)
--- a/
lib/File/Rewrite.pm
+++ b/
lib/File/Rewrite.pm
@@
-10,16
+10,30
@@
our @EXPORT_OK = qw(fileset);
sub fileset {
my ($filename, $replace, $search) = @_;
sub fileset {
my ($filename, $replace, $search) = @_;
- $search = $replace if not defined $search;
my $tmpname = "$filename.$$.tmp";
my $changes = 0;
my $tmpname = "$filename.$$.tmp";
my $changes = 0;
+ $search = $replace if not defined $search;
+
+ # generate a single regex to emulate smart match
+ $search = [$search] unless ref $search eq 'ARRAY';
+ $search = join('|', map { ref $_ ? $_ : "^\Q$_\E\$" } @$search);
+
open my $src, '<', $filename;
open my $dest, '>', $tmpname;
while (readline $src) {
chomp;
open my $src, '<', $filename;
open my $dest, '>', $tmpname;
while (readline $src) {
chomp;
- if ($_ =~ (ref $search ? $search : qr/^\Q$search\E$/)) {
- if (defined $replace and $_ eq $replace) {
+ if ($_ =~ /$search/s) {
+ if (ref $replace eq 'ARRAY') {
+ if (@$replace and $_ eq $replace->[0]) {
+ shift @$replace;
+ }
+ else {
+ $changes++;
+ next;
+ }
+ }
+ elsif (defined $replace and $_ eq $replace) {
undef $replace;
}
else {
undef $replace;
}
else {
@@
-31,8
+45,10
@@
sub fileset {
}
close $src;
if (defined $replace) {
}
close $src;
if (defined $replace) {
- $changes++;
- print {$dest} $replace, $/;
+ for (ref $replace eq 'ARRAY' ? @$replace : $replace) {
+ $changes++;
+ print {$dest} $_, $/;
+ }
}
close $dest;
}
close $dest;