[Templates-cvs] cvs commit: TT3/lib/Template/Directive Process.pm
cvs@template-toolkit.org
cvs@template-toolkit.org
Fri, 03 Dec 2004 15:52:18 +0000
cvs 04/12/03 15:52:18
Modified: lib/Template/Directive Process.pm
Log:
* changed parse_path() to parse_paths()
Revision Changes Path
1.6 +9 -11 TT3/lib/Template/Directive/Process.pm
Index: Process.pm
===================================================================
RCS file: /template-toolkit/TT3/lib/Template/Directive/Process.pm,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Process.pm 2004/12/03 14:32:39 1.5
+++ Process.pm 2004/12/03 15:52:18 1.6
@@ -15,7 +15,7 @@
# modify it under the same terms as Perl itself.
#
# REVISION
-# $Id: Process.pm,v 1.5 2004/12/03 14:32:39 abw Exp $
+# $Id: Process.pm,v 1.6 2004/12/03 15:52:18 abw Exp $
#
#========================================================================
@@ -26,7 +26,7 @@
use Template::Directive;
use base qw( Template::Directive );
-our $VERSION = sprintf("%d.%02d", q$Revision: 1.5 $ =~ /(\d+)\.(\d+)/);
+our $VERSION = sprintf("%d.%02d", q$Revision: 1.6 $ =~ /(\d+)\.(\d+)/);
our $DEBUG = 0 unless defined $DEBUG;
our $ERROR = '';
our $KEYWORD = 'PROCESS';
@@ -38,15 +38,13 @@
my $parser = $match->{ parser }
|| return $self->error('no parser defined');
- my $template = $parser->parse_path($textref)
- || return $self->error('missing template name in ',
- $self->keyword($match), ' directive');
-
- my $args = $parser->parse_params($textref)
- || return $self->error('missing parameters in ',
- $self->keyword($match), ' directive');
+ my $paths = $parser->parse_paths($textref)
+ || return $self->error_msg( no_paths => $self->keyword($match) );
- return $handler->expr([ process => $template, $args ])
+ my $params = $parser->parse_params($textref)
+ || return $self->error_msg( no_params => $self->keyword($match) );
+
+ return $handler->expr([ process => $paths, $params ])
|| $self->error($handler->error());
}
@@ -79,7 +77,7 @@
=head1 VERSION
-$Revision: 1.5 $
+$Revision: 1.6 $
=head1 COPYRIGHT