X-Git-Url: http://git.shiar.net/perl/file-rewrite.git/blobdiff_plain/612e12475adbffa874c33d7e1db2955cf5fd41b5..d72f22ff8c2dd2d763a83aeb19eeca6c2162cacc:/lib/File/Rewrite.pm

diff --git a/lib/File/Rewrite.pm b/lib/File/Rewrite.pm
index bb41513..2b05ded 100644
--- a/lib/File/Rewrite.pm
+++ b/lib/File/Rewrite.pm
@@ -10,20 +10,46 @@ our @EXPORT_OK = qw(fileset);
 
 sub fileset {
 	my ($filename, $replace, $search) = @_;
-	die if defined $replace;
 	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) {
-		if ($_ =~ (ref $search ? $search : qr/^\Q$search\E$/)) {
+		chomp;
+		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 {
 				$changes++;
 				next;
+			}
 		}
 		print {$dest} $_, $/;
 	}
 	close $src;
+	if (defined $replace) {
+		for (ref $replace eq 'ARRAY' ? @$replace : $replace) {
+			$changes++;
+			print {$dest} $_, $/;
+		}
+	}
 	close $dest;
 
 	if ($changes) {