4093 - in trunk/Template: src src/parsers/source_to_tst/implementations tests/regression_tests/blocks/incorrect [eZComponents: Trunk]

Author: Raymond Bosman
Date: 2006-11-28 09:35:41 +0100 (Tue, 28 Nov 2006)
New Revision: 4093

Log:
- Changed a wrong Exception message.
- Added test output.

Added:
   
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0065.out
   
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0066.out
   
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0067.out
   
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0068.out
   
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0069.out
   
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0070.out
   
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0071.out
   
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0072.out
   
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0073.out
   
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0074.out
   
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0075.out
   
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0076.out
   
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0077.out
   
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0078.out
   
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0079.out
Modified:
   trunk/Template/src/error_messages.php
   trunk/Template/src/parsers/source_to_tst/implementations/switch_condition.php

Modified: trunk/Template/src/error_messages.php
===================================================================
--- trunk/Template/src/error_messages.php       2006-11-27 20:49:30 UTC (rev 
4092)
+++ trunk/Template/src/error_messages.php       2006-11-28 08:35:41 UTC (rev 
4093)
@@ -24,7 +24,7 @@
     const MSG_EXPECT_EXPRESSION                 = "Expecting an expression.";
     const MSG_EXPECT_EXPRESSION_NOT_IDENTIFIER  = "Expecting an expression, 
not an identifier. (Braces missing?)";
     const MSG_EXPECT_OPERAND                    = "Expecting an operand.";
-    const MSG_EXPECT_LITERAL                    = "Expecting a literal";
+    const MSG_EXPECT_LITERAL                    = "Expecting a literal value.";
     const MSG_EXPECT_MODULO                     = "Expecting a modulo";
     const MSG_EXPECT_NON_MODIFYING_OPERAND      = "Expecting an operand 
without a pre- or post operator.";
     const MSG_EXPECT_VARIABLE                   = "Expecting a variable";

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 20:49:30 UTC (rev 4092)
+++ 
trunk/Template/src/parsers/source_to_tst/implementations/switch_condition.php   
    2006-11-28 08:35:41 UTC (rev 4093)
@@ -96,7 +96,7 @@
 
                 if ( !$this->parseRequiredType( 'Literal', null, false ) )
                 {
-                    throw new ezcTemplateParserException( 
$this->parser->source, $this->startCursor, $this->currentCursor, 
ezcTemplateSourceToTstErrorMessages::MSG_EXPECT_EXPRESSION );
+                    throw new ezcTemplateParserException( 
$this->parser->source, $this->startCursor, $this->currentCursor, 
ezcTemplateSourceToTstErrorMessages::MSG_EXPECT_LITERAL );
                 }
 
                 $case->conditions[] = $this->lastParser->element;

Added: 
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0065.out
===================================================================
--- 
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0065.out
  2006-11-27 20:49:30 UTC (rev 4092)
+++ 
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0065.out
  2006-11-28 08:35:41 UTC (rev 4093)
@@ -0,0 +1,4 @@
+mock:3:7: Expecting a literal value.
+
+{case $foo}
+      ^


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

Added: 
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0066.out
===================================================================
--- 
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0066.out
  2006-11-27 20:49:30 UTC (rev 4092)
+++ 
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0066.out
  2006-11-28 08:35:41 UTC (rev 4093)
@@ -0,0 +1,4 @@
+mock:3:7: Expecting a literal value.
+
+{case $foo}
+      ^


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

Added: 
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0067.out
===================================================================
--- 
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0067.out
  2006-11-27 20:49:30 UTC (rev 4092)
+++ 
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0067.out
  2006-11-28 08:35:41 UTC (rev 4093)
@@ -0,0 +1,4 @@
+mock:3:7: Expecting a literal value.
+
+{case $foo}
+      ^


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

Added: 
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0068.out
===================================================================
--- 
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0068.out
  2006-11-27 20:49:30 UTC (rev 4092)
+++ 
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0068.out
  2006-11-28 08:35:41 UTC (rev 4093)
@@ -0,0 +1,4 @@
+mock:3:7: Expecting a literal value.
+
+{case $foo}
+      ^


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

Added: 
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0069.out
===================================================================
--- 
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0069.out
  2006-11-27 20:49:30 UTC (rev 4092)
+++ 
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0069.out
  2006-11-28 08:35:41 UTC (rev 4093)
@@ -0,0 +1,4 @@
+mock:3:7: Expecting a literal value.
+
+{case $foo}
+      ^


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

Added: 
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0070.out
===================================================================
--- 
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0070.out
  2006-11-27 20:49:30 UTC (rev 4092)
+++ 
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0070.out
  2006-11-28 08:35:41 UTC (rev 4093)
@@ -0,0 +1,4 @@
+mock:3:7: Expecting a literal value.
+
+{case $foo}
+      ^


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

Added: 
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0071.out
===================================================================
--- 
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0071.out
  2006-11-27 20:49:30 UTC (rev 4092)
+++ 
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0071.out
  2006-11-28 08:35:41 UTC (rev 4093)
@@ -0,0 +1,4 @@
+mock:3:7: Expecting a literal value.
+
+{case $foo}
+      ^


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

Added: 
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0072.out
===================================================================
--- 
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0072.out
  2006-11-27 20:49:30 UTC (rev 4092)
+++ 
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0072.out
  2006-11-28 08:35:41 UTC (rev 4093)
@@ -0,0 +1,4 @@
+mock:3:7: Expecting a literal value.
+
+{case $foo}
+      ^


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

Added: 
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0073.out
===================================================================
--- 
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0073.out
  2006-11-27 20:49:30 UTC (rev 4092)
+++ 
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0073.out
  2006-11-28 08:35:41 UTC (rev 4093)
@@ -0,0 +1,7 @@
+mock:7:1: Incorrect nesting in code, close block {/default} expected.
+
+    {$foo}
+
+
+
+^


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

Added: 
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0074.out
===================================================================
--- 
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0074.out
  2006-11-27 20:49:30 UTC (rev 4092)
+++ 
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0074.out
  2006-11-28 08:35:41 UTC (rev 4093)
@@ -0,0 +1,4 @@
+mock:5:11: Open and close block do not match: {default} and {/foreach}
+
+{/foreach}
+          ^


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

Added: 
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0075.out
===================================================================
--- 
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0075.out
  2006-11-27 20:49:30 UTC (rev 4092)
+++ 
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0075.out
  2006-11-28 08:35:41 UTC (rev 4093)
@@ -0,0 +1,4 @@
+mock:5:9: Open and close block do not match: {default} and {/while}
+
+{/while}
+        ^


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

Added: 
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0076.out
===================================================================
--- 
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0076.out
  2006-11-27 20:49:30 UTC (rev 4092)
+++ 
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0076.out
  2006-11-28 08:35:41 UTC (rev 4093)
@@ -0,0 +1,4 @@
+mock:5:13: Open and close block do not match: {default} and {/delimiter}
+
+{/delimiter}
+            ^


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

Added: 
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0077.out
===================================================================
--- 
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0077.out
  2006-11-27 20:49:30 UTC (rev 4092)
+++ 
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0077.out
  2006-11-28 08:35:41 UTC (rev 4093)
@@ -0,0 +1,4 @@
+mock:5:6: Open and close block do not match: {default} and {/if}
+
+{/if}
+     ^


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

Added: 
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0078.out
===================================================================
--- 
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0078.out
  2006-11-27 20:49:30 UTC (rev 4092)
+++ 
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0078.out
  2006-11-28 08:35:41 UTC (rev 4093)
@@ -0,0 +1,4 @@
+mock:5:10: Open and close block do not match: {default} and {/switch}
+
+{/switch}
+         ^


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

Added: 
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0079.out
===================================================================
--- 
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0079.out
  2006-11-27 20:49:30 UTC (rev 4092)
+++ 
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0079.out
  2006-11-28 08:35:41 UTC (rev 4093)
@@ -0,0 +1,4 @@
+mock:5:8: Open and close block do not match: {default} and {/case}
+
+{/case}
+       ^


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