[Jifty-commit] r6312 - in Template-Declare/trunk: .

[Jifty commits]

Author: alexmv
Date: Thu Feb  5 16:04:36 2009
New Revision: 6312

Modified:
   Template-Declare/trunk/   (props changed)
   Template-Declare/trunk/lib/Template/Declare/Tags.pm

Log:
 r41876 at kohr-ah:  chmrr | 2009-02-05 16:00:47 -0500
  *Include "from" notations in buffers in stacks


Modified: Template-Declare/trunk/lib/Template/Declare/Tags.pm
==============================================================================
--- Template-Declare/trunk/lib/Template/Declare/Tags.pm	(original)
+++ Template-Declare/trunk/lib/Template/Declare/Tags.pm	Thu Feb  5 16:04:36 2009
@@ -431,7 +431,7 @@
     my $raw     = shift;
     my @phrases = (@_);
 
-    Template::Declare->buffer->push( private => (defined wantarray and not wantarray) );
+    Template::Declare->buffer->push( private => (defined wantarray and not wantarray), from => "T::D outs" );
 
     foreach my $item ( grep {defined} @phrases ) {
         my $returned = ref($item) eq 'CODE'
@@ -584,7 +584,7 @@
     my $coderef = shift;
 
     Template::Declare->buffer->append("\n");
-    Template::Declare->buffer->push;
+    Template::Declare->buffer->push( from => "T::D tag wrapper");
 
     my %attr = %ATTRIBUTES;
     %ATTRIBUTES = ();                              # prevent leakage
@@ -654,7 +654,7 @@
 
         local $TAG_NEST_DEPTH = $TAG_NEST_DEPTH + 1;
         %ATTRIBUTES = ();
-        Template::Declare->buffer->push( private => 1 );
+        Template::Declare->buffer->push( private => 1, from => "T::D tag $tag" );
         my $last = join '', map { ref($_) && $_->isa('Template::Declare::Tag') ? $_ : _postprocess($_) } $code->();
         Template::Declare->buffer->append("$last") if not Template::Declare->buffer->length and length $last;
     }
@@ -716,13 +716,15 @@
     my $args = \@_;
 
     if (defined wantarray) {
-        Template::Declare->buffer->push( private => 1 );
+        Template::Declare->buffer->push( private => 1, from => "T::D path $template" );
         _show_template( $template, 0, $args );
         %ELEMENT_ID_CACHE = ();
         return Template::Declare->buffer->pop;
     } else {
+        Template::Declare->buffer->push( from => "T::D path $template" );
         _show_template( $template, 0, $args );
         %ELEMENT_ID_CACHE = ();
+        Template::Declare->buffer->pop;
         return undef;
     }
 }
@@ -909,7 +911,7 @@
     my $self = shift;
 
     if ( defined wantarray ) {
-        Template::Declare->buffer->push( private => 1 );
+        Template::Declare->buffer->push( private => 1, from => "T::D stringify" );
         my $returned = $self->();
         return Template::Declare->buffer->pop . $returned;
     } else {