4078 - in trunk/Template: . src/parsers/source_to_tst/implementations tests/regression_tests/array_append [eZComponents: Trunk]

Author: Raymond Bosman
Date: 2006-11-27 13:52:45 +0100 (Mon, 27 Nov 2006)
New Revision: 4078

Log:
- Fixed an issue that the space before an 'array append' threw an exception.
- Fixed the test output result.

Modified:
   trunk/Template/ChangeLog
   trunk/Template/src/parsers/source_to_tst/implementations/expression.php
   trunk/Template/tests/regression_tests/array_append/append_with_comments.out

Modified: trunk/Template/ChangeLog
===================================================================
--- trunk/Template/ChangeLog    2006-11-27 12:42:09 UTC (rev 4077)
+++ trunk/Template/ChangeLog    2006-11-27 12:52:45 UTC (rev 4078)
@@ -1,4 +1,5 @@
 - Fixed issue #9601: wrong __isset implementation in Template/template.php
+- Fixed an issue that the space before 'array append' threw an exception.
 
 
 1.1beta2 - Monday 20 November 2006

Modified: 
trunk/Template/src/parsers/source_to_tst/implementations/expression.php
===================================================================
--- trunk/Template/src/parsers/source_to_tst/implementations/expression.php     
2006-11-27 12:42:09 UTC (rev 4077)
+++ trunk/Template/src/parsers/source_to_tst/implementations/expression.php     
2006-11-27 12:52:45 UTC (rev 4078)
@@ -171,6 +171,8 @@
 
             $this->currentOperator = $this->parser->handleOperand( 
$this->currentOperator, $this->lastParser->element );
 
+            $this->findNextElement();
+
             if ( $this->parseArrayFetch( $cursor, $allowArrayAppend ) )
             {
                 $this->findNextElement();

Modified: 
trunk/Template/tests/regression_tests/array_append/append_with_comments.out
===================================================================
--- trunk/Template/tests/regression_tests/array_append/append_with_comments.out 
2006-11-27 12:42:09 UTC (rev 4077)
+++ trunk/Template/tests/regression_tests/array_append/append_with_comments.out 
2006-11-27 12:52:45 UTC (rev 4078)
@@ -1,254 +1,130 @@
-array(126) {
-  [0]=>
-  int(0)
-  [1]=>
-  int(1)
-  [2]=>
-  int(1)
-  [3]=>
-  int(1)
-  [4]=>
-  int(1)
-  [5]=>
-  int(1)
-  [6]=>
-  int(1)
-  [7]=>
-  int(1)
-  [8]=>
-  int(1)
-  [9]=>
-  int(1)
-  [10]=>
-  int(1)
-  [11]=>
-  int(1)
-  [12]=>
-  int(1)
-  [13]=>
-  int(1)
-  [14]=>
-  int(1)
-  [15]=>
-  int(1)
-  [16]=>
-  int(1)
-  [17]=>
-  int(1)
-  [18]=>
-  int(1)
-  [19]=>
-  int(1)
-  [20]=>
-  int(1)
-  [21]=>
-  int(1)
-  [22]=>
-  int(1)
-  [23]=>
-  int(1)
-  [24]=>
-  int(1)
-  [25]=>
-  int(1)
-  [26]=>
-  int(1)
-  [27]=>
-  int(1)
-  [28]=>
-  int(1)
-  [29]=>
-  int(1)
-  [30]=>
-  int(1)
-  [31]=>
-  int(1)
-  [32]=>
-  int(1)
-  [33]=>
-  int(1)
-  [34]=>
-  int(1)
-  [35]=>
-  int(1)
-  [36]=>
-  int(1)
-  [37]=>
-  int(1)
-  [38]=>
-  int(1)
-  [39]=>
-  int(1)
-  [40]=>
-  int(1)
-  [41]=>
-  int(1)
-  [42]=>
-  int(1)
-  [43]=>
-  int(1)
-  [44]=>
-  int(1)
-  [45]=>
-  int(1)
-  [46]=>
-  int(1)
-  [47]=>
-  int(1)
-  [48]=>
-  int(1)
-  [49]=>
-  int(1)
-  [50]=>
-  int(1)
-  [51]=>
-  int(1)
-  [52]=>
-  int(1)
-  [53]=>
-  int(1)
-  [54]=>
-  int(1)
-  [55]=>
-  int(1)
-  [56]=>
-  int(1)
-  [57]=>
-  int(1)
-  [58]=>
-  int(1)
-  [59]=>
-  int(1)
-  [60]=>
-  int(1)
-  [61]=>
-  int(1)
-  [62]=>
-  int(1)
-  [63]=>
-  int(1)
-  [64]=>
-  int(1)
-  [65]=>
-  int(1)
-  [66]=>
-  int(1)
-  [67]=>
-  int(1)
-  [68]=>
-  int(1)
-  [69]=>
-  int(1)
-  [70]=>
-  int(1)
-  [71]=>
-  int(1)
-  [72]=>
-  int(1)
-  [73]=>
-  int(1)
-  [74]=>
-  int(1)
-  [75]=>
-  int(1)
-  [76]=>
-  int(1)
-  [77]=>
-  int(1)
-  [78]=>
-  int(1)
-  [79]=>
-  int(1)
-  [80]=>
-  int(1)
-  [81]=>
-  int(1)
-  [82]=>
-  int(1)
-  [83]=>
-  int(1)
-  [84]=>
-  int(1)
-  [85]=>
-  int(1)
-  [86]=>
-  int(1)
-  [87]=>
-  int(1)
-  [88]=>
-  int(1)
-  [89]=>
-  int(1)
-  [90]=>
-  int(1)
-  [91]=>
-  int(1)
-  [92]=>
-  int(1)
-  [93]=>
-  int(1)
-  [94]=>
-  int(1)
-  [95]=>
-  int(1)
-  [96]=>
-  int(1)
-  [97]=>
-  int(1)
-  [98]=>
-  int(1)
-  [99]=>
-  int(1)
-  [100]=>
-  int(1)
-  [101]=>
-  int(1)
-  [102]=>
-  int(1)
-  [103]=>
-  int(1)
-  [104]=>
-  int(1)
-  [105]=>
-  int(1)
-  [106]=>
-  int(1)
-  [107]=>
-  int(1)
-  [108]=>
-  int(1)
-  [109]=>
-  int(1)
-  [110]=>
-  int(1)
-  [111]=>
-  int(1)
-  [112]=>
-  int(1)
-  [113]=>
-  int(1)
-  [114]=>
-  int(1)
-  [115]=>
-  int(1)
-  [116]=>
-  int(1)
-  [117]=>
-  int(1)
-  [118]=>
-  int(1)
-  [119]=>
-  int(1)
-  [120]=>
-  int(1)
-  [121]=>
-  int(1)
-  [122]=>
-  int(1)
-  [123]=>
-  int(1)
-  [124]=>
-  int(1)
-  [125]=>
-  int(1)
-}
+Array
+(
+    [0] => 0
+    [1] => 1
+    [2] => 1
+    [3] => 1
+    [4] => 1
+    [5] => 1
+    [6] => 1
+    [7] => 1
+    [8] => 1
+    [9] => 1
+    [10] => 1
+    [11] => 1
+    [12] => 1
+    [13] => 1
+    [14] => 1
+    [15] => 1
+    [16] => 1
+    [17] => 1
+    [18] => 1
+    [19] => 1
+    [20] => 1
+    [21] => 1
+    [22] => 1
+    [23] => 1
+    [24] => 1
+    [25] => 1
+    [26] => 1
+    [27] => 1
+    [28] => 1
+    [29] => 1
+    [30] => 1
+    [31] => 1
+    [32] => 1
+    [33] => 1
+    [34] => 1
+    [35] => 1
+    [36] => 1
+    [37] => 1
+    [38] => 1
+    [39] => 1
+    [40] => 1
+    [41] => 1
+    [42] => 1
+    [43] => 1
+    [44] => 1
+    [45] => 1
+    [46] => 1
+    [47] => 1
+    [48] => 1
+    [49] => 1
+    [50] => 1
+    [51] => 1
+    [52] => 1
+    [53] => 1
+    [54] => 1
+    [55] => 1
+    [56] => 1
+    [57] => 1
+    [58] => 1
+    [59] => 1
+    [60] => 1
+    [61] => 1
+    [62] => 1
+    [63] => 1
+    [64] => 1
+    [65] => 1
+    [66] => 1
+    [67] => 1
+    [68] => 1
+    [69] => 1
+    [70] => 1
+    [71] => 1
+    [72] => 1
+    [73] => 1
+    [74] => 1
+    [75] => 1
+    [76] => 1
+    [77] => 1
+    [78] => 1
+    [79] => 1
+    [80] => 1
+    [81] => 1
+    [82] => 1
+    [83] => 1
+    [84] => 1
+    [85] => 1
+    [86] => 1
+    [87] => 1
+    [88] => 1
+    [89] => 1
+    [90] => 1
+    [91] => 1
+    [92] => 1
+    [93] => 1
+    [94] => 1
+    [95] => 1
+    [96] => 1
+    [97] => 1
+    [98] => 1
+    [99] => 1
+    [100] => 1
+    [101] => 1
+    [102] => 1
+    [103] => 1
+    [104] => 1
+    [105] => 1
+    [106] => 1
+    [107] => 1
+    [108] => 1
+    [109] => 1
+    [110] => 1
+    [111] => 1
+    [112] => 1
+    [113] => 1
+    [114] => 1
+    [115] => 1
+    [116] => 1
+    [117] => 1
+    [118] => 1
+    [119] => 1
+    [120] => 1
+    [121] => 1
+    [122] => 1
+    [123] => 1
+    [124] => 1
+    [125] => 1
+)
+