[Templates-cvs] cvs commit: Template2/t/vmethods replace.t
cvs@template-toolkit.org
cvs@template-toolkit.org
cvs 06/02/02 13:13:56
Modified: t/vmethods replace.t
Log:
* vmethod installed in stash now so delete from here.
Revision Changes Path
1.2 +1 -66 Template2/t/vmethods/replace.t
Index: replace.t
===================================================================
RCS file: /template-toolkit/Template2/t/vmethods/replace.t,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- replace.t 2006/02/02 11:35:07 1.1
+++ replace.t 2006/02/02 13:13:56 1.2
@@ -11,7 +11,7 @@
# This is free software; you can redistribute it and/or modify it
# under the same terms as Perl itself.
#
-# $Id: replace.t,v 1.1 2006/02/02 11:35:07 abw Exp $
+# $Id: replace.t,v 1.2 2006/02/02 13:13:56 abw Exp $
#
#========================================================================
@@ -24,71 +24,6 @@
# make sure we're using the Perl stash
$Template::Config::STASH = 'Template::Stash';
-
-$Template::Stash::SCALAR_OPS->{ new_replace } = \&vmethod_replace;
-
-sub vmethod_replace {
- my ($text, $pattern, $replace, $global) = @_;
- $text = '' unless defined $text;
- $pattern = '' unless defined $pattern;
- $replace = '' unless defined $replace;
- $global = 1 unless defined $global;
-
- my $expand = sub {
- my ($chunk, $start, $end) = @_;
- $chunk =~ s{ \\(\\|\$) | \$ (\d+) }{
- $1 ? $1
- : ($2 > $#$start || $2 == 0) ? ''
- : substr($text, $start->[$2], $end->[$2] - $start->[$2]);
- }exg;
- $chunk;
- };
-
- if ($global) {
- $text =~ s{$pattern}{ &$expand($replace, [@-], [@+]) }eg;
- }
- else {
- $text =~ s{$pattern}{ &$expand($replace, , [@-], [@+]) }e;
- }
- return $text;
-}
-
-
-
-sub vmethod_replace2 {
- my ($str, $pat, $replace, $global) = @_;
- $str = '' if ! defined $str;
- $pat = '' if ! defined $pat;
- $replace = '' if ! defined $replace;
- $global = 1 if ! defined $global;
-
- if ($global) {
- $str =~ s{$pat}{
- my @start = @-;
- my @end = @+;
- my $copy = $replace;
- $copy =~ s{ (?<!\\) \$ (\d+) }{
- ($1 > $#start || $1 == 0) ? ''
- : substr($str, $start[$1], $end[$1] - $start[$1]);
- }exg;
- $copy;
- }eg;
- }
- else {
- $str =~ s{$pat} {
- my @start = @-;
- my @end = @+;
- my $copy = $replace;
- $copy =~ s{ (?<!\\) \$ (\d+) }{
- ($1 > $#start || $1 == 0) ? ''
- : substr($str, $start[$1], $end[$1] - $start[$1]);
- }exg;
- $copy;
- }e;
- }
- return $str;
-}
-
test_expect(\*DATA);