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
t: test result of "remove regex"
[perl/file-rewrite.git]
/
lib
/
File
/
Rewrite.pm
diff --git
a/lib/File/Rewrite.pm
b/lib/File/Rewrite.pm
index 2b05ded11175fc09025378089fa0fb67e8f64d6e..731925929d9536a09ed1e2a998850f648b7ef47e 100644
(file)
--- a/
lib/File/Rewrite.pm
+++ b/
lib/File/Rewrite.pm
@@
-6,24
+6,26
@@
use warnings;
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
) = @_;
+ my ($filename, $
search, $replace
) = @_;
my $tmpname = "$filename.$$.tmp";
my $changes = 0;
my $tmpname = "$filename.$$.tmp";
my $changes = 0;
- $
search = $replace if not defined $search
;
+ $
replace = $search if @_ < 3
;
# generate a single regex to emulate smart match
$search = [$search] unless ref $search eq 'ARRAY';
# generate a single regex to emulate smart match
$search = [$search] unless ref $search eq 'ARRAY';
- $search = join('|', map { ref $_ ? $_ : "^\Q$_\E\$" } @$search);
+ @$search = grep { defined } @$search;
+ $search = @$search ? join('|', map { ref $_ ? $_ : "^\Q$_\E\$" } @$search) : undef;
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 ($_ =~ /$search/s) {
+ if (
defined $search and
$_ =~ /$search/s) {
if (ref $replace eq 'ARRAY') {
if (@$replace and $_ eq $replace->[0]) {
shift @$replace;
if (ref $replace eq 'ARRAY') {
if (@$replace and $_ eq $replace->[0]) {
shift @$replace;
@@
-65,12
+67,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