[Templates-cvs] cvs commit: TT3/lib/Template/Generator Debug.pm

[cvs@template-toolkit.org]

cvs         04/11/17 14:50:36

  Modified:    lib/Template/Generator Debug.pm
  Log:
  * minor tweaks to improve output
  
  Revision  Changes    Path
  1.2       +28 -12    TT3/lib/Template/Generator/Debug.pm
  
  Index: Debug.pm
  ===================================================================
  RCS file: /template-toolkit/TT3/lib/Template/Generator/Debug.pm,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- Debug.pm	2004/11/15 19:38:38	1.1
  +++ Debug.pm	2004/11/17 14:50:36	1.2
  @@ -17,7 +17,7 @@
   #   modify it under the same terms as Perl itself.
   #
   # REVISION
  -#   $Id: Debug.pm,v 1.1 2004/11/15 19:38:38 abw Exp $
  +#   $Id: Debug.pm,v 1.2 2004/11/17 14:50:36 abw Exp $
   #
   #========================================================================
   
  @@ -28,11 +28,15 @@
   use Template::Generator;
   use base qw( Template::Generator );
   
  -our $VERSION = sprintf("%d.%02d", q$Revision: 1.1 $ =~ /(\d+)\.(\d+)/);
  +our $VERSION = sprintf("%d.%02d", q$Revision: 1.2 $ =~ /(\d+)\.(\d+)/);
   our $DEBUG   = 0 unless defined $DEBUG;
   our $ERROR   = '';
   our $DEFAULT = '_default';
   
  +sub line {
  +    my ($self, $line) = @_;
  +    return "<line:$line>";
  +}
   
   sub integer {
       my ($self, $value) = @_;
  @@ -260,23 +264,35 @@
       my ($self, $file, $args) = @_;
       $file = $self->generate($file) || return;
       $file =~ s/\n/\n  /g;
  -    $args = $self->args($args);
  -    return "<include:\n  $file\n$args>";
  +    $args = $self->params($args);
  +    return "<include:\n  $file\n  $args>";
   }
   
   sub process {
       my ($self, $file, $args) = @_;
       $file = $self->generate($file) || return;
       $file =~ s/\n/\n  /g;
  -    $args = $self->args($args);
  +    $args = $self->params($args);
       return "<process:\n  $file\n$args>";
   }
   
  +sub params {
  +    my ($self, $params) = @_;
  +
  +    my $args = $self->args($params);
  +    if ($args) {
  +        $args =~ s/\n/\n  /g;
  +        $args = "<args:\n  $args>\n";
  +    }
  +    else {
  +        $args = "<no args>\n";
  +    }
  +}
  +
   sub wrapper {
       my ($self, $file, $args, $content) = @_;
       $file = $self->generate($file) || return;
  -    $file =~ s/\n/\n  /g;
  -    $args = $self->args($args);
  +    $args = $self->params($args);
       $content = $self->generate($content);
       $content =~ s/\n/\n  /g;
       return "<wrapper:\n  $file\n  $args  $content\n>";
  @@ -348,11 +364,11 @@
   
   
   sub set {
  -    my ($self, $list) = @_;
  +    my ($self, @list) = @_;
       my $items = '';
       my $out;
   
  -    foreach my $item (@$list) {
  +    foreach my $item (@list) {
           $out = $self->generate($item) || return;
           $out =~ s/\n/\n  /g;
           $items .= "  $out\n";
  @@ -382,11 +398,11 @@
   }
   
   sub block {
  -    my ($self, $list) = @_;
  +    my ($self, @list) = @_;
       my $items = '';
       my $out;
   
  -    foreach my $item (@$list) {
  +    foreach my $item (@list) {
           $out = $self->generate($item) || return;
           $out =~ s/\n/\n  /g;
           $items .= "  $out\n";
  @@ -479,7 +495,7 @@
   
   =head1 VERSION
   
  -$Revision: 1.1 $
  +$Revision: 1.2 $
   
   =head1 COPYRIGHT