4092 - in trunk/Template: src src/parsers/source_to_tst/implementations src/parsers/tst_to_tst/implementations src/syntax_trees/tst/nodes tests/regression_tests/blocks/incorrect tests/regression_tests/custom_blocks/incorrect tests/regression_tests/foreach/incorrect tests/regression_tests/if/incorrect [eZComponents: Trunk]

Author: Raymond Bosman
Date: 2006-11-27 21:49:30 +0100 (Mon, 27 Nov 2006)
New Revision: 4092

Log:
- Added test output.
- Throw a better exception for non matching open and close blocks in a custom 
blocks.
- Default where temporarily broken in switch statements.
- Fixed a bug that {elseif} crashes when used outside an {if}..{/if}.

Added:
   
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0041.out
   
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0042.out
   
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0043.out
   
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0044.out
   
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0045.out
   
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0046.out
   
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0047.out
   
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0048.out
   
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0049.out
   
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0050.out
   
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0051.out
   
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0052.out
   
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0053.out
   
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0054.out
   
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0055.out
   
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0056.out
   
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0057.out
   
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0058.out
   
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0059.out
   
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0060.out
   
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0061.out
   
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0062.out
   
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0063.out
   
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0064.out
Modified:
   trunk/Template/src/error_messages.php
   trunk/Template/src/parsers/source_to_tst/implementations/if_condition.php
   trunk/Template/src/parsers/source_to_tst/implementations/program.php
   trunk/Template/src/parsers/source_to_tst/implementations/switch_condition.php
   trunk/Template/src/parsers/tst_to_tst/implementations/tst_walker.php
   trunk/Template/src/syntax_trees/tst/nodes/block.php
   
trunk/Template/tests/regression_tests/custom_blocks/incorrect/empty_non_nesting_used_as_nesting.out
   
trunk/Template/tests/regression_tests/foreach/incorrect/no_closing_foreach.out
   trunk/Template/tests/regression_tests/if/incorrect/missing_close_tag.out

Modified: trunk/Template/src/error_messages.php
===================================================================
--- trunk/Template/src/error_messages.php       2006-11-27 15:34:42 UTC (rev 
4091)
+++ trunk/Template/src/error_messages.php       2006-11-27 20:49:30 UTC (rev 
4092)
@@ -78,6 +78,8 @@
     const MSG_EXPECT_PARAMETER                  = "Function call: '%s' has not 
enough parameters. Need an additional '%s' parameter.";
     const MSG_TOO_MANY_PARAMETERS               = "Function call: '%s' has too 
many parameters.";
 
+    const MSG_UNEXPECTED_BLOCK                   = "Unexpected block {%s} at 
this position. Some blocks can only be used inside other blocks.";
+
     const MSG_OBJECT_FUNCTION_CALL_NOT_ALLOWED  = "Calling a method from an 
imported object is not allowed.";
 
     const MSG_MISSING_CUSTOM_BLOCK_PARAMETER     = "Missing the required 
custom block parameter <%s>."; 

Modified: 
trunk/Template/src/parsers/source_to_tst/implementations/if_condition.php
===================================================================
--- trunk/Template/src/parsers/source_to_tst/implementations/if_condition.php   
2006-11-27 15:34:42 UTC (rev 4091)
+++ trunk/Template/src/parsers/source_to_tst/implementations/if_condition.php   
2006-11-27 20:49:30 UTC (rev 4092)
@@ -76,6 +76,7 @@
 
         $cb = new ezcTemplateConditionBodyTstNode( $this->parser->source, 
$this->startCursor, $cursor );
         $cb->condition = $condition;
+        $cb->name = $name;
 
         if ( $name == 'if' )
         {

Modified: trunk/Template/src/parsers/source_to_tst/implementations/program.php
===================================================================
--- trunk/Template/src/parsers/source_to_tst/implementations/program.php        
2006-11-27 15:34:42 UTC (rev 4091)
+++ trunk/Template/src/parsers/source_to_tst/implementations/program.php        
2006-11-27 20:49:30 UTC (rev 4092)
@@ -198,6 +198,7 @@
 
                 if ( $element instanceof ezcTemplateBlockTstNode && 
$element->isNestingBlock)
                 {
+
                     // No special handling required so we check if the element
                     // is a nesting block and should start a new nesting level
 
@@ -224,8 +225,16 @@
         // Check for closing blocks that do not belong to an opening block.
         if ( $this->lastBlock->parentBlock === null && 
$element->isClosingBlock )
         {
-            throw new ezcTemplateParserException( $this->parser->source, 
$this->startCursor, $this->startCursor, 
-                "Found closing block {/". $element->name."} without an opening 
block." ); 
+            if( $element instanceof ezcTemplateCustomBlockTstNode )
+            {
+                throw new ezcTemplateParserException( $this->parser->source, 
$this->startCursor, $this->startCursor, 
+                    "The custom block: {".$element->name."} should not have a 
closing block. Check the custom block definition. " );
+             }
+            else
+            {
+                throw new ezcTemplateParserException( $this->parser->source, 
$this->startCursor, $this->startCursor, 
+                    "Found closing block {/". $element->name."} without an 
opening block." ); 
+            }
         }
          
         // The name of the previous element must match the closing block,

Modified: 
trunk/Template/src/parsers/source_to_tst/implementations/switch_condition.php
===================================================================
--- 
trunk/Template/src/parsers/source_to_tst/implementations/switch_condition.php   
    2006-11-27 15:34:42 UTC (rev 4091)
+++ 
trunk/Template/src/parsers/source_to_tst/implementations/switch_condition.php   
    2006-11-27 20:49:30 UTC (rev 4092)
@@ -80,7 +80,6 @@
             //$this->findNextElement();
 
             $sw = new ezcTemplateSwitchTstNode( $this->parser->source, 
$this->startCursor, $cursor );
-
             $sw->condition = $this->lastParser->rootOperator;
             $this->appendElement( $sw );
 
@@ -89,6 +88,7 @@
         elseif( $name == 'case' )
         {
             $case = new ezcTemplateCaseTstNode( $this->parser->source, 
$this->startCursor, $cursor );
+            $case->name = $name; // Set the name to 'case'
 
             do
             {
@@ -122,6 +122,7 @@
         elseif( $name == 'default' )
         {
             $case = new ezcTemplateCaseTstNode( $this->parser->source, 
$this->startCursor, $cursor );
+            $case->name = $name; // Set the name to 'default'
             $case->conditions = null;
             $this->findNextElement();
 

Modified: trunk/Template/src/parsers/tst_to_tst/implementations/tst_walker.php
===================================================================
--- trunk/Template/src/parsers/tst_to_tst/implementations/tst_walker.php        
2006-11-27 15:34:42 UTC (rev 4091)
+++ trunk/Template/src/parsers/tst_to_tst/implementations/tst_walker.php        
2006-11-27 20:49:30 UTC (rev 4092)
@@ -137,7 +137,6 @@
     {
     }
 
-
     public function visitLoopTstNode( ezcTemplateLoopTstNode $node )
     {
     }
@@ -351,8 +350,12 @@
     {
     }
 
+    public function visitConditionBodyTstNode( ezcTemplateConditionBodyTstNode 
$node )
+    {
+    }
 
 
+
     protected function acceptAndUpdate( ezcTemplateTstNode &$node )
     {
         $ret = $node->accept( $this );

Modified: trunk/Template/src/syntax_trees/tst/nodes/block.php
===================================================================
--- trunk/Template/src/syntax_trees/tst/nodes/block.php 2006-11-27 15:34:42 UTC 
(rev 4091)
+++ trunk/Template/src/syntax_trees/tst/nodes/block.php 2006-11-27 20:49:30 UTC 
(rev 4092)
@@ -244,6 +244,12 @@
             throw new ezcTemplateParserException( $element->source, 
$element->startCursor, $element->startCursor, 
ezcTemplateSourceToTstErrorMessages::MSG_UNEXPECTED_BREAK_OR_CONTINUE );
         }
 
+        if ( $element instanceof ezcTemplateConditionBodyTstNode )
+        {
+            throw new ezcTemplateParserException( $element->source, 
$element->startCursor, $element->startCursor, 
+                sprintf( 
ezcTemplateSourceToTstErrorMessages::MSG_UNEXPECTED_BLOCK, $element->name ) );
+        }
+
         $this->children[] = $element;
 
         // temporary compatability

Added: 
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0041.out
===================================================================
--- 
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0041.out
  2006-11-27 15:34:42 UTC (rev 4091)
+++ 
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0041.out
  2006-11-27 20:49:30 UTC (rev 4092)
@@ -0,0 +1,4 @@
+mock:3:8: Unexpected block {elseif} at this position. Some blocks can only be 
used inside other blocks.
+
+{elseif $foo}
+       ^


Property changes on: 
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0041.out
___________________________________________________________________
Name: svn:eol-style
   + native

Added: 
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0042.out
===================================================================
--- 
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0042.out
  2006-11-27 15:34:42 UTC (rev 4091)
+++ 
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0042.out
  2006-11-27 20:49:30 UTC (rev 4092)
@@ -0,0 +1,4 @@
+mock:3:8: Unexpected block {elseif} at this position. Some blocks can only be 
used inside other blocks.
+
+{elseif $foo}
+       ^


Property changes on: 
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0042.out
___________________________________________________________________
Name: svn:eol-style
   + native

Added: 
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0043.out
===================================================================
--- 
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0043.out
  2006-11-27 15:34:42 UTC (rev 4091)
+++ 
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0043.out
  2006-11-27 20:49:30 UTC (rev 4092)
@@ -0,0 +1,4 @@
+mock:3:8: Unexpected block {elseif} at this position. Some blocks can only be 
used inside other blocks.
+
+{elseif $foo}
+       ^


Property changes on: 
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0043.out
___________________________________________________________________
Name: svn:eol-style
   + native

Added: 
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0044.out
===================================================================
--- 
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0044.out
  2006-11-27 15:34:42 UTC (rev 4091)
+++ 
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0044.out
  2006-11-27 20:49:30 UTC (rev 4092)
@@ -0,0 +1,4 @@
+mock:3:8: Unexpected block {elseif} at this position. Some blocks can only be 
used inside other blocks.
+
+{elseif $foo}
+       ^


Property changes on: 
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0044.out
___________________________________________________________________
Name: svn:eol-style
   + native

Added: 
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0045.out
===================================================================
--- 
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0045.out
  2006-11-27 15:34:42 UTC (rev 4091)
+++ 
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0045.out
  2006-11-27 20:49:30 UTC (rev 4092)
@@ -0,0 +1,4 @@
+mock:3:8: Unexpected block {elseif} at this position. Some blocks can only be 
used inside other blocks.
+
+{elseif $foo}
+       ^


Property changes on: 
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0045.out
___________________________________________________________________
Name: svn:eol-style
   + native

Added: 
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0046.out
===================================================================
--- 
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0046.out
  2006-11-27 15:34:42 UTC (rev 4091)
+++ 
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0046.out
  2006-11-27 20:49:30 UTC (rev 4092)
@@ -0,0 +1,4 @@
+mock:3:8: Unexpected block {elseif} at this position. Some blocks can only be 
used inside other blocks.
+
+{elseif $foo}
+       ^


Property changes on: 
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0046.out
___________________________________________________________________
Name: svn:eol-style
   + native

Added: 
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0047.out
===================================================================
--- 
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0047.out
  2006-11-27 15:34:42 UTC (rev 4091)
+++ 
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0047.out
  2006-11-27 20:49:30 UTC (rev 4092)
@@ -0,0 +1,4 @@
+mock:3:8: Unexpected block {elseif} at this position. Some blocks can only be 
used inside other blocks.
+
+{elseif $foo}
+       ^


Property changes on: 
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0047.out
___________________________________________________________________
Name: svn:eol-style
   + native

Added: 
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0048.out
===================================================================
--- 
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0048.out
  2006-11-27 15:34:42 UTC (rev 4091)
+++ 
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0048.out
  2006-11-27 20:49:30 UTC (rev 4092)
@@ -0,0 +1,4 @@
+mock:3:8: Unexpected block {elseif} at this position. Some blocks can only be 
used inside other blocks.
+
+{elseif $foo}
+       ^


Property changes on: 
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0048.out
___________________________________________________________________
Name: svn:eol-style
   + native

Added: 
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0049.out
===================================================================
--- 
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0049.out
  2006-11-27 15:34:42 UTC (rev 4091)
+++ 
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0049.out
  2006-11-27 20:49:30 UTC (rev 4092)
@@ -0,0 +1,4 @@
+mock:3:6: Unexpected block {else} at this position. Some blocks can only be 
used inside other blocks.
+
+{else}
+     ^


Property changes on: 
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0049.out
___________________________________________________________________
Name: svn:eol-style
   + native

Added: 
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0050.out
===================================================================
--- 
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0050.out
  2006-11-27 15:34:42 UTC (rev 4091)
+++ 
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0050.out
  2006-11-27 20:49:30 UTC (rev 4092)
@@ -0,0 +1,4 @@
+mock:3:6: Unexpected block {else} at this position. Some blocks can only be 
used inside other blocks.
+
+{else}
+     ^


Property changes on: 
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0050.out
___________________________________________________________________
Name: svn:eol-style
   + native

Added: 
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0051.out
===================================================================
--- 
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0051.out
  2006-11-27 15:34:42 UTC (rev 4091)
+++ 
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0051.out
  2006-11-27 20:49:30 UTC (rev 4092)
@@ -0,0 +1,4 @@
+mock:3:6: Unexpected block {else} at this position. Some blocks can only be 
used inside other blocks.
+
+{else}
+     ^


Property changes on: 
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0051.out
___________________________________________________________________
Name: svn:eol-style
   + native

Added: 
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0052.out
===================================================================
--- 
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0052.out
  2006-11-27 15:34:42 UTC (rev 4091)
+++ 
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0052.out
  2006-11-27 20:49:30 UTC (rev 4092)
@@ -0,0 +1,4 @@
+mock:3:6: Unexpected block {else} at this position. Some blocks can only be 
used inside other blocks.
+
+{else}
+     ^


Property changes on: 
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0052.out
___________________________________________________________________
Name: svn:eol-style
   + native

Added: 
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0053.out
===================================================================
--- 
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0053.out
  2006-11-27 15:34:42 UTC (rev 4091)
+++ 
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0053.out
  2006-11-27 20:49:30 UTC (rev 4092)
@@ -0,0 +1,4 @@
+mock:3:6: Unexpected block {else} at this position. Some blocks can only be 
used inside other blocks.
+
+{else}
+     ^


Property changes on: 
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0053.out
___________________________________________________________________
Name: svn:eol-style
   + native

Added: 
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0054.out
===================================================================
--- 
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0054.out
  2006-11-27 15:34:42 UTC (rev 4091)
+++ 
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0054.out
  2006-11-27 20:49:30 UTC (rev 4092)
@@ -0,0 +1,4 @@
+mock:3:6: Unexpected block {else} at this position. Some blocks can only be 
used inside other blocks.
+
+{else}
+     ^


Property changes on: 
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0054.out
___________________________________________________________________
Name: svn:eol-style
   + native

Added: 
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0055.out
===================================================================
--- 
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0055.out
  2006-11-27 15:34:42 UTC (rev 4091)
+++ 
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0055.out
  2006-11-27 20:49:30 UTC (rev 4092)
@@ -0,0 +1,4 @@
+mock:3:6: Unexpected block {else} at this position. Some blocks can only be 
used inside other blocks.
+
+{else}
+     ^


Property changes on: 
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0055.out
___________________________________________________________________
Name: svn:eol-style
   + native

Added: 
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0056.out
===================================================================
--- 
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0056.out
  2006-11-27 15:34:42 UTC (rev 4091)
+++ 
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0056.out
  2006-11-27 20:49:30 UTC (rev 4092)
@@ -0,0 +1,4 @@
+mock:3:6: Unexpected block {else} at this position. Some blocks can only be 
used inside other blocks.
+
+{else}
+     ^


Property changes on: 
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0056.out
___________________________________________________________________
Name: svn:eol-style
   + native

Added: 
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0057.out
===================================================================
--- 
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0057.out
  2006-11-27 15:34:42 UTC (rev 4091)
+++ 
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0057.out
  2006-11-27 20:49:30 UTC (rev 4092)
@@ -0,0 +1,4 @@
+mock:4:5: Expecting an case block.
+
+    {$foo}
+    ^


Property changes on: 
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0057.out
___________________________________________________________________
Name: svn:eol-style
   + native

Added: 
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0058.out
===================================================================
--- 
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0058.out
  2006-11-27 15:34:42 UTC (rev 4091)
+++ 
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0058.out
  2006-11-27 20:49:30 UTC (rev 4092)
@@ -0,0 +1,4 @@
+mock:4:5: Expecting an case block.
+
+    {$foo}
+    ^


Property changes on: 
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0058.out
___________________________________________________________________
Name: svn:eol-style
   + native

Added: 
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0059.out
===================================================================
--- 
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0059.out
  2006-11-27 15:34:42 UTC (rev 4091)
+++ 
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0059.out
  2006-11-27 20:49:30 UTC (rev 4092)
@@ -0,0 +1,4 @@
+mock:4:5: Expecting an case block.
+
+    {$foo}
+    ^


Property changes on: 
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0059.out
___________________________________________________________________
Name: svn:eol-style
   + native

Added: 
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0060.out
===================================================================
--- 
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0060.out
  2006-11-27 15:34:42 UTC (rev 4091)
+++ 
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0060.out
  2006-11-27 20:49:30 UTC (rev 4092)
@@ -0,0 +1,4 @@
+mock:4:5: Expecting an case block.
+
+    {$foo}
+    ^


Property changes on: 
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0060.out
___________________________________________________________________
Name: svn:eol-style
   + native

Added: 
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0061.out
===================================================================
--- 
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0061.out
  2006-11-27 15:34:42 UTC (rev 4091)
+++ 
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0061.out
  2006-11-27 20:49:30 UTC (rev 4092)
@@ -0,0 +1,4 @@
+mock:4:5: Expecting an case block.
+
+    {$foo}
+    ^


Property changes on: 
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0061.out
___________________________________________________________________
Name: svn:eol-style
   + native

Added: 
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0062.out
===================================================================
--- 
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0062.out
  2006-11-27 15:34:42 UTC (rev 4091)
+++ 
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0062.out
  2006-11-27 20:49:30 UTC (rev 4092)
@@ -0,0 +1,4 @@
+mock:4:5: Expecting an case block.
+
+    {$foo}
+    ^


Property changes on: 
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0062.out
___________________________________________________________________
Name: svn:eol-style
   + native

Added: 
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0063.out
===================================================================
--- 
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0063.out
  2006-11-27 15:34:42 UTC (rev 4091)
+++ 
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0063.out
  2006-11-27 20:49:30 UTC (rev 4092)
@@ -0,0 +1,4 @@
+mock:4:5: Expecting an case block.
+
+    {$foo}
+    ^


Property changes on: 
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0063.out
___________________________________________________________________
Name: svn:eol-style
   + native

Added: 
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0064.out
===================================================================
--- 
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0064.out
  2006-11-27 15:34:42 UTC (rev 4091)
+++ 
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0064.out
  2006-11-27 20:49:30 UTC (rev 4092)
@@ -0,0 +1,4 @@
+mock:4:5: Expecting an case block.
+
+    {$foo}
+    ^


Property changes on: 
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0064.out
___________________________________________________________________
Name: svn:eol-style
   + native

Modified: 
trunk/Template/tests/regression_tests/custom_blocks/incorrect/empty_non_nesting_used_as_nesting.out
===================================================================
--- 
trunk/Template/tests/regression_tests/custom_blocks/incorrect/empty_non_nesting_used_as_nesting.out
 2006-11-27 15:34:42 UTC (rev 4091)
+++ 
trunk/Template/tests/regression_tests/custom_blocks/incorrect/empty_non_nesting_used_as_nesting.out
 2006-11-27 20:49:30 UTC (rev 4092)
@@ -1,4 +1,4 @@
-mock:2:24: Found the block pair: {inline_opt_parameter} .. 
{/inline_opt_parameter} that cannot have a open and close block.
+mock:2:24: The custom block: {inline_opt_parameter} should not have a closing 
block. Check the custom block definition. 
 
 {/inline_opt_parameter}
                        ^

Modified: 
trunk/Template/tests/regression_tests/foreach/incorrect/no_closing_foreach.out
===================================================================
--- 
trunk/Template/tests/regression_tests/foreach/incorrect/no_closing_foreach.out  
    2006-11-27 15:34:42 UTC (rev 4091)
+++ 
trunk/Template/tests/regression_tests/foreach/incorrect/no_closing_foreach.out  
    2006-11-27 20:49:30 UTC (rev 4092)
@@ -1,4 +1,4 @@
-mock:3:1: Incorrect nesting in code, the block {foreach} was not correctly 
terminated.
+mock:3:1: Incorrect nesting in code, close block {/foreach} expected.
 
 {$val}
 

Modified: 
trunk/Template/tests/regression_tests/if/incorrect/missing_close_tag.out
===================================================================
--- trunk/Template/tests/regression_tests/if/incorrect/missing_close_tag.out    
2006-11-27 15:34:42 UTC (rev 4091)
+++ trunk/Template/tests/regression_tests/if/incorrect/missing_close_tag.out    
2006-11-27 20:49:30 UTC (rev 4092)
@@ -1,4 +1,4 @@
-mock:4:1: Incorrect nesting in code, the block {if} was not correctly 
terminated.
+mock:4:1: Incorrect nesting in code, close block {/if} expected.
 
 {if true}