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: replace concatenated regex by smart match
[perl/file-rewrite.git]
/
lib
/
File
/
Rewrite.pm
diff --git
a/lib/File/Rewrite.pm
b/lib/File/Rewrite.pm
index 5a30a32989c80df3b8e91dca1ed9596333bef71e..5e26404bfbc928c33e898dcf5afcda8c60a04436 100644
(file)
--- a/
lib/File/Rewrite.pm
+++ b/
lib/File/Rewrite.pm
@@
-2,24
+2,36
@@
package File::Rewrite;
use strict;
use warnings;
use strict;
use warnings;
+use 5.010; # smart match
use autodie ':all';
use Exporter 'import';
use autodie ':all';
use Exporter 'import';
+our $VERSION = '1.00';
our @EXPORT_OK = qw(fileset);
sub fileset {
our @EXPORT_OK = qw(fileset);
sub fileset {
- my ($filename, $replace, $search) = @_;
- $search = $replace if not defined $search;
+ my ($filename, $search, $replace) = @_;
my $tmpname = "$filename.$$.tmp";
my $changes = 0;
my $tmpname = "$filename.$$.tmp";
my $changes = 0;
+ $replace = $search if @_ < 3;
+
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) {
+ 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
+43,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;
@@
-49,12
+63,12
@@
sub fileset {
=head1 NAME
=head1 NAME
-File::Rewrite
+File::Rewrite
- Append and/or strip lines from text files
=head1 SYNOPSIS
use File::Rewrite 'fileset';
=head1 SYNOPSIS
use File::Rewrite 'fileset';
- fileset('/tmp/somefile',
undef, qr/match/
);
+ fileset('/tmp/somefile',
qr/match/ => undef
);
=head1 DESCRIPTION
=head1 DESCRIPTION