logo       

4101 - in trunk/Template: src src/exceptions src/parsers/tst_to_ast/impleme: msg#00271

web.ezcomponents.cvs

Subject: 4101 - in trunk/Template: src src/exceptions src/parsers/tst_to_ast/implementations tests tests/regression_tests/blocks/incorrect tests/regression_tests/expressions/incorrect_array tests/regression_tests/literals [eZComponents: Trunk]

Author: Raymond Bosman
Date: 2006-11-28 12:18:46 +0100 (Tue, 28 Nov 2006)
New Revision: 4101

Log:
- Added an internal Exception.
- Added test output
- Changed an error message.
- The Switch is broken, and needs to be fixed.

Added:
trunk/Template/src/exceptions/internal_exception.php
Removed:

trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0121.in

trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0122.in

trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0123.in

trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0124.in

trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0125.in

trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0126.in

trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0127.in

trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0128.in

trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0129.in

trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0130.in

trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0131.in

trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0132.in

trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0133.in

trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0134.in

trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0135.in

trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0136.in
Modified:

trunk/Template/src/parsers/tst_to_ast/implementations/tst_to_ast_transformer.php
trunk/Template/src/template_autoload.php
trunk/Template/tests/regression_test.php

trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0137.out

trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0138.out

trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0139.out

trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0140.out

trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0141.out

trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0143.out

trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0144.out

trunk/Template/tests/regression_tests/expressions/incorrect_array/missing_brace2.out

trunk/Template/tests/regression_tests/expressions/incorrect_array/missing_brace3.out
trunk/Template/tests/regression_tests/literals/array_key_without_value.out
trunk/Template/tests/regression_tests/literals/array_key_without_value2.out
trunk/Template/tests/regression_tests/literals/array_non_end_brace2.out
trunk/Template/tests/regression_tests/literals/array_start_with_comma.out

Added: trunk/Template/src/exceptions/internal_exception.php
===================================================================
--- trunk/Template/src/exceptions/internal_exception.php 2006-11-28
10:22:05 UTC (rev 4100)
+++ trunk/Template/src/exceptions/internal_exception.php 2006-11-28
11:18:46 UTC (rev 4101)
@@ -0,0 +1,26 @@
+<?php
+/**
+ * File containing the ezcTemplateRuntimeException class
+ *
+ * @package Template
+ * @version //autogen//
+ * @copyright Copyright (C) 2005, 2006 eZ systems as. All rights reserved.
+ * @license http://ez.no/licenses/new_bsd New BSD License
+ */
+
+/**
+ *
+ * @package Template
+ * @version //autogen//
+ */
+class ezcTemplateInternalException extends Exception
+{
+ /**
+ */
+ public function __construct( $msg )
+ {
+ parent::__construct( "Internal error: $msg" );
+ }
+}
+
+?>


Property changes on: trunk/Template/src/exceptions/internal_exception.php
___________________________________________________________________
Name: svn:eol-style
+ native

Modified:
trunk/Template/src/parsers/tst_to_ast/implementations/tst_to_ast_transformer.php
===================================================================
---
trunk/Template/src/parsers/tst_to_ast/implementations/tst_to_ast_transformer.php
2006-11-28 10:22:05 UTC (rev 4100)
+++
trunk/Template/src/parsers/tst_to_ast/implementations/tst_to_ast_transformer.php
2006-11-28 11:18:46 UTC (rev 4101)
@@ -158,12 +158,27 @@
{
foreach ( $astNode as $ast )
{
- $body->appendStatement( $ast );
+ if( $ast instanceof ezcTemplateStatementAstNode )
+ {
+ $body->appendStatement( $ast );
+ }
+ else
+ {
+ throw new ezcTemplateInternalException ("Expected an
ezcTemplateStatementAstNode: " . __FILE__ . ":" . __LINE__ );
+ }
+
}
}
else
{
- $body->appendStatement( $astNode );
+ if( $astNode instanceof ezcTemplateStatementAstNode )
+ {
+ $body->appendStatement( $astNode );
+ }
+ else
+ {
+ throw new ezcTemplateInternalException ("Expected an
ezcTemplateStatementAstNode: " . __FILE__ . ":" . __LINE__ );
+ }
}
}

@@ -255,12 +270,27 @@
{
foreach ( $astNode as $ast )
{
- $this->programNode->appendStatement( $ast );
+ if( $ast instanceof ezcTemplateStatementAstNode )
+ {
+ $this->programNode->appendStatement( $ast );
+ }
+ else
+ {
+ throw new ezcTemplateInternalException ("Expected
an ezcTemplateStatementAstNode: ". __FILE__ . ":" . __LINE__ );
+
+ }
}
}
else
{
- $this->programNode->appendStatement( $astNode );
+ if( $astNode instanceof ezcTemplateStatementAstNode )
+ {
+ $this->programNode->appendStatement( $astNode );
+ }
+ else
+ {
+ throw new ezcTemplateInternalException ("Expected an
ezcTemplateStatementAstNode: ". __FILE__ . ":" . __LINE__ );
+ }
}
}


Modified: trunk/Template/src/template_autoload.php
===================================================================
--- trunk/Template/src/template_autoload.php 2006-11-28 10:22:05 UTC (rev
4100)
+++ trunk/Template/src/template_autoload.php 2006-11-28 11:18:46 UTC (rev
4101)
@@ -331,6 +331,7 @@
"ezcTemplateCustomBlockException" =>
"Template/exceptions/custom_block_exception.php",

"ezcTemplateRuntimeException" =>
"Template/exceptions/runtime_exception.php",
+ "ezcTemplateInternalException" =>
"Template/exceptions/internal_exception.php",




Modified: trunk/Template/tests/regression_test.php
===================================================================
--- trunk/Template/tests/regression_test.php 2006-11-28 10:22:05 UTC (rev
4100)
+++ trunk/Template/tests/regression_test.php 2006-11-28 11:18:46 UTC (rev
4101)
@@ -28,6 +28,8 @@

public $verboseErrors = false;

+ public $skipMissingTests = false;
+
public $directories = array();

public $regressionDir = '';
@@ -342,11 +344,30 @@
{
throw new PHPUnit_Framework_ExpectationFailedException( $help
);
}
+ elseif ( $reply == 'sm' )
+ {
+ $this->skipMissingTests = true;
+ throw new PHPUnit_Framework_ExpectationFailedException( $help
);
+ }
+ elseif ($reply == "ren" )
+ {
+ if( file_exists( $tplSource.".tmp" ) )
+ {
+ echo "Cannot rename the file to: {$tplSource}.tmp because
the file already exists\n";
+ continue;
+ }
+
+ echo ( "renaming: " . $tplSource . " to: " .
$tplSource.".tmp\n" );
+ rename ( $tplSource, $tplSource.".tmp" );
+
+ throw new PHPUnit_Framework_ExpectationFailedException( $help
);
+ }
elseif ( $reply == '?' )
{
echo "The actions are:\n",
"g - Generate output file (Implies success of test)\n",
"s - Skip this test (Implies failure of test)\n",
+ "sm - Skip all missing tests\n",
"r - Retry the test\n",
"o - Display the generated output\n",
"e - Display the expected output\n",
@@ -357,6 +378,7 @@
"d - Display difference between generated output and
expected output\n",
"a - Display all of the above (o,e,st,sp,at,tt,d)\n",
"v - Display verbose template information\n",
+ "ren- Rename a input test from *.in to *.in.tmp\n",
"q - Quit\n";
continue;
}
@@ -431,7 +453,7 @@
{
$help = "The out file: '$expected' could not be found.";

- if( $this->interactiveMode )
+ if( !$this->skipMissingTests && $this->interactiveMode )
{
echo "\n", $help, "\n";


Deleted:
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0121.in
===================================================================
---
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0121.in
2006-11-28 10:22:05 UTC (rev 4100)
+++
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0121.in
2006-11-28 11:18:46 UTC (rev 4101)
@@ -1,8 +0,0 @@
-{* file: non_matching_block_0121.in *}
-{var $foo = 1, $_false = false, $array = array( 1, 2 )}
-{foreach $array as $bar}
- {elseif $foo}
- {$foo}
-
-{/foreach}
-

Deleted:
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0122.in
===================================================================
---
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0122.in
2006-11-28 10:22:05 UTC (rev 4100)
+++
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0122.in
2006-11-28 11:18:46 UTC (rev 4101)
@@ -1,8 +0,0 @@
-{* file: non_matching_block_0122.in *}
-{var $foo = 1, $_false = false, $array = array( 1, 2 )}
-{foreach $array as $bar}
- {elseif $foo}
- {$foo}
- {/foreach}
-{/foreach}
-

Deleted:
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0123.in
===================================================================
---
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0123.in
2006-11-28 10:22:05 UTC (rev 4100)
+++
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0123.in
2006-11-28 11:18:46 UTC (rev 4101)
@@ -1,8 +0,0 @@
-{* file: non_matching_block_0123.in *}
-{var $foo = 1, $_false = false, $array = array( 1, 2 )}
-{foreach $array as $bar}
- {elseif $foo}
- {$foo}
- {/while}
-{/foreach}
-

Deleted:
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0124.in
===================================================================
---
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0124.in
2006-11-28 10:22:05 UTC (rev 4100)
+++
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0124.in
2006-11-28 11:18:46 UTC (rev 4101)
@@ -1,8 +0,0 @@
-{* file: non_matching_block_0124.in *}
-{var $foo = 1, $_false = false, $array = array( 1, 2 )}
-{foreach $array as $bar}
- {elseif $foo}
- {$foo}
- {/delimiter}
-{/foreach}
-

Deleted:
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0125.in
===================================================================
---
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0125.in
2006-11-28 10:22:05 UTC (rev 4100)
+++
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0125.in
2006-11-28 11:18:46 UTC (rev 4101)
@@ -1,8 +0,0 @@
-{* file: non_matching_block_0125.in *}
-{var $foo = 1, $_false = false, $array = array( 1, 2 )}
-{foreach $array as $bar}
- {elseif $foo}
- {$foo}
- {/if}
-{/foreach}
-

Deleted:
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0126.in
===================================================================
---
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0126.in
2006-11-28 10:22:05 UTC (rev 4100)
+++
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0126.in
2006-11-28 11:18:46 UTC (rev 4101)
@@ -1,8 +0,0 @@
-{* file: non_matching_block_0126.in *}
-{var $foo = 1, $_false = false, $array = array( 1, 2 )}
-{foreach $array as $bar}
- {elseif $foo}
- {$foo}
- {/switch}
-{/foreach}
-

Deleted:
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0127.in
===================================================================
---
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0127.in
2006-11-28 10:22:05 UTC (rev 4100)
+++
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0127.in
2006-11-28 11:18:46 UTC (rev 4101)
@@ -1,8 +0,0 @@
-{* file: non_matching_block_0127.in *}
-{var $foo = 1, $_false = false, $array = array( 1, 2 )}
-{foreach $array as $bar}
- {elseif $foo}
- {$foo}
- {/case}
-{/foreach}
-

Deleted:
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0128.in
===================================================================
---
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0128.in
2006-11-28 10:22:05 UTC (rev 4100)
+++
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0128.in
2006-11-28 11:18:46 UTC (rev 4101)
@@ -1,8 +0,0 @@
-{* file: non_matching_block_0128.in *}
-{var $foo = 1, $_false = false, $array = array( 1, 2 )}
-{foreach $array as $bar}
- {elseif $foo}
- {$foo}
- {/default}
-{/foreach}
-

Deleted:
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0129.in
===================================================================
---
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0129.in
2006-11-28 10:22:05 UTC (rev 4100)
+++
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0129.in
2006-11-28 11:18:46 UTC (rev 4101)
@@ -1,8 +0,0 @@
-{* file: non_matching_block_0129.in *}
-{var $foo = 1, $_false = false, $array = array( 1, 2 )}
-{foreach $array as $bar}
- {else}
- {$foo}
-
-{/foreach}
-

Deleted:
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0130.in
===================================================================
---
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0130.in
2006-11-28 10:22:05 UTC (rev 4100)
+++
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0130.in
2006-11-28 11:18:46 UTC (rev 4101)
@@ -1,8 +0,0 @@
-{* file: non_matching_block_0130.in *}
-{var $foo = 1, $_false = false, $array = array( 1, 2 )}
-{foreach $array as $bar}
- {else}
- {$foo}
- {/foreach}
-{/foreach}
-

Deleted:
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0131.in
===================================================================
---
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0131.in
2006-11-28 10:22:05 UTC (rev 4100)
+++
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0131.in
2006-11-28 11:18:46 UTC (rev 4101)
@@ -1,8 +0,0 @@
-{* file: non_matching_block_0131.in *}
-{var $foo = 1, $_false = false, $array = array( 1, 2 )}
-{foreach $array as $bar}
- {else}
- {$foo}
- {/while}
-{/foreach}
-

Deleted:
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0132.in
===================================================================
---
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0132.in
2006-11-28 10:22:05 UTC (rev 4100)
+++
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0132.in
2006-11-28 11:18:46 UTC (rev 4101)
@@ -1,8 +0,0 @@
-{* file: non_matching_block_0132.in *}
-{var $foo = 1, $_false = false, $array = array( 1, 2 )}
-{foreach $array as $bar}
- {else}
- {$foo}
- {/delimiter}
-{/foreach}
-

Deleted:
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0133.in
===================================================================
---
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0133.in
2006-11-28 10:22:05 UTC (rev 4100)
+++
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0133.in
2006-11-28 11:18:46 UTC (rev 4101)
@@ -1,8 +0,0 @@
-{* file: non_matching_block_0133.in *}
-{var $foo = 1, $_false = false, $array = array( 1, 2 )}
-{foreach $array as $bar}
- {else}
- {$foo}
- {/if}
-{/foreach}
-

Deleted:
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0134.in
===================================================================
---
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0134.in
2006-11-28 10:22:05 UTC (rev 4100)
+++
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0134.in
2006-11-28 11:18:46 UTC (rev 4101)
@@ -1,8 +0,0 @@
-{* file: non_matching_block_0134.in *}
-{var $foo = 1, $_false = false, $array = array( 1, 2 )}
-{foreach $array as $bar}
- {else}
- {$foo}
- {/switch}
-{/foreach}
-

Deleted:
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0135.in
===================================================================
---
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0135.in
2006-11-28 10:22:05 UTC (rev 4100)
+++
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0135.in
2006-11-28 11:18:46 UTC (rev 4101)
@@ -1,8 +0,0 @@
-{* file: non_matching_block_0135.in *}
-{var $foo = 1, $_false = false, $array = array( 1, 2 )}
-{foreach $array as $bar}
- {else}
- {$foo}
- {/case}
-{/foreach}
-

Deleted:
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0136.in
===================================================================
---
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0136.in
2006-11-28 10:22:05 UTC (rev 4100)
+++
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0136.in
2006-11-28 11:18:46 UTC (rev 4101)
@@ -1,8 +0,0 @@
-{* file: non_matching_block_0136.in *}
-{var $foo = 1, $_false = false, $array = array( 1, 2 )}
-{foreach $array as $bar}
- {else}
- {$foo}
- {/default}
-{/foreach}
-

Modified:
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0137.out
===================================================================
---
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0137.out
2006-11-28 10:22:05 UTC (rev 4100)
+++
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0137.out
2006-11-28 11:18:46 UTC (rev 4101)
@@ -1,4 +1,4 @@
-mock:7:11: Open and close block do not match: {switch} and {/foreach}
+mock:5:9: Expecting an case block.

-{/foreach}
- ^
+ {$foo}
+ ^

Modified:
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0138.out
===================================================================
---
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0138.out
2006-11-28 10:22:05 UTC (rev 4100)
+++
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0138.out
2006-11-28 11:18:46 UTC (rev 4101)
@@ -1,4 +1,4 @@
-mock:6:15: Open and close block do not match: {switch} and {/foreach}
+mock:5:9: Expecting an case block.

- {/foreach}
- ^
+ {$foo}
+ ^

Modified:
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0139.out
===================================================================
---
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0139.out
2006-11-28 10:22:05 UTC (rev 4100)
+++
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0139.out
2006-11-28 11:18:46 UTC (rev 4101)
@@ -1,4 +1,4 @@
-mock:6:13: Open and close block do not match: {switch} and {/while}
+mock:5:9: Expecting an case block.

- {/while}
- ^
+ {$foo}
+ ^

Modified:
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0140.out
===================================================================
---
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0140.out
2006-11-28 10:22:05 UTC (rev 4100)
+++
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0140.out
2006-11-28 11:18:46 UTC (rev 4101)
@@ -1,4 +1,4 @@
-mock:6:17: Open and close block do not match: {switch} and {/delimiter}
+mock:5:9: Expecting an case block.

- {/delimiter}
- ^
+ {$foo}
+ ^

Modified:
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0141.out
===================================================================
---
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0141.out
2006-11-28 10:22:05 UTC (rev 4100)
+++
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0141.out
2006-11-28 11:18:46 UTC (rev 4101)
@@ -1,4 +1,4 @@
-mock:6:10: Open and close block do not match: {switch} and {/if}
+mock:5:9: Expecting an case block.

- {/if}
- ^
+ {$foo}
+ ^

Modified:
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0143.out
===================================================================
---
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0143.out
2006-11-28 10:22:05 UTC (rev 4100)
+++
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0143.out
2006-11-28 11:18:46 UTC (rev 4101)
@@ -1,4 +1,4 @@
-mock:6:12: Open and close block do not match: {switch} and {/case}
+mock:5:9: Expecting an case block.

- {/case}
- ^
+ {$foo}
+ ^

Modified:
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0144.out
===================================================================
---
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0144.out
2006-11-28 10:22:05 UTC (rev 4100)
+++
trunk/Template/tests/regression_tests/blocks/incorrect/non_matching_block_0144.out
2006-11-28 11:18:46 UTC (rev 4101)
@@ -1,4 +1,4 @@
-mock:6:15: Open and close block do not match: {switch} and {/default}
+mock:5:9: Expecting an case block.

- {/default}
- ^
+ {$foo}
+ ^

Modified:
trunk/Template/tests/regression_tests/expressions/incorrect_array/missing_brace2.out
===================================================================
---
trunk/Template/tests/regression_tests/expressions/incorrect_array/missing_brace2.out
2006-11-28 10:22:05 UTC (rev 4100)
+++
trunk/Template/tests/regression_tests/expressions/incorrect_array/missing_brace2.out
2006-11-28 11:18:46 UTC (rev 4101)
@@ -1,4 +1,4 @@
-mock:1:19: Expecting a literal
+mock:1:19: Expecting a literal value.

{var $a = array(1,}
^

Modified:
trunk/Template/tests/regression_tests/expressions/incorrect_array/missing_brace3.out
===================================================================
---
trunk/Template/tests/regression_tests/expressions/incorrect_array/missing_brace3.out
2006-11-28 10:22:05 UTC (rev 4100)
+++
trunk/Template/tests/regression_tests/expressions/incorrect_array/missing_brace3.out
2006-11-28 11:18:46 UTC (rev 4101)
@@ -1,4 +1,4 @@
-mock:1:17: Expecting a literal
+mock:1:17: Expecting a literal value.

{var $a = array(}
^

Modified:
trunk/Template/tests/regression_tests/literals/array_key_without_value.out
===================================================================
--- trunk/Template/tests/regression_tests/literals/array_key_without_value.out
2006-11-28 10:22:05 UTC (rev 4100)
+++ trunk/Template/tests/regression_tests/literals/array_key_without_value.out
2006-11-28 11:18:46 UTC (rev 4101)
@@ -1,4 +1,4 @@
-mock:1:27: Expecting a literal
+mock:1:27: Expecting a literal value.

{var $a = array( "aap" => }
^

Modified:
trunk/Template/tests/regression_tests/literals/array_key_without_value2.out
===================================================================
--- trunk/Template/tests/regression_tests/literals/array_key_without_value2.out
2006-11-28 10:22:05 UTC (rev 4100)
+++ trunk/Template/tests/regression_tests/literals/array_key_without_value2.out
2006-11-28 11:18:46 UTC (rev 4101)
@@ -1,4 +1,4 @@
-mock:1:27: Expecting a literal
+mock:1:27: Expecting a literal value.

{var $a = array( "aap" => )}
^

Modified:
trunk/Template/tests/regression_tests/literals/array_non_end_brace2.out
===================================================================
--- trunk/Template/tests/regression_tests/literals/array_non_end_brace2.out
2006-11-28 10:22:05 UTC (rev 4100)
+++ trunk/Template/tests/regression_tests/literals/array_non_end_brace2.out
2006-11-28 11:18:46 UTC (rev 4101)
@@ -1,4 +1,4 @@
-mock:1:22: Expecting a literal
+mock:1:22: Expecting a literal value.

{var $a = array( 12, }
^

Modified:
trunk/Template/tests/regression_tests/literals/array_start_with_comma.out
===================================================================
--- trunk/Template/tests/regression_tests/literals/array_start_with_comma.out
2006-11-28 10:22:05 UTC (rev 4100)
+++ trunk/Template/tests/regression_tests/literals/array_start_with_comma.out
2006-11-28 11:18:46 UTC (rev 4101)
@@ -1,4 +1,4 @@
-mock:1:17: Expecting a literal
+mock:1:17: Expecting a literal value.

{var $a = array(, 2)}
^



<Prev in Thread] Current Thread [Next in Thread>
Google Custom Search

News | FAQ | advertise