geckon01/Twig
1
0
Fork 0
mirror of https://github.com/twigphp/Twig.git synced 2026-09-10 17:36:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

simplification

Browse Source
This commit is contained in:
Arnaud Le Blanc
2011-11-13 14:23:45 +01:00
parent 2dbb4203c9
commit d41d10ca28
2 changed files with 11 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/Twig/ExpressionParser.php
+3 -7
View File
@@ -184,14 +184,10 @@ class Twig_ExpressionParser
}
}
$expr = null;
$expr = array_shift($nodes);
foreach(array_reverse($nodes) as $node) {
if (null === $expr) {
$expr = $node;
} else {
$expr = new Twig_Node_Expression_Binary_Concat($node, $expr, $node->getLine());
}
foreach($nodes as $node) {
$expr = new Twig_Node_Expression_Binary_Concat($expr, $node, $node->getLine());
}
return $expr;
test/Twig/Tests/ExpressionParserTest.php
+8 -7
View File
@@ -149,31 +149,32 @@ class Twig_Tests_ExpressionParserTest extends PHPUnit_Framework_TestCase
),
array(
'{{ "foo #{bar} baz" }}', new Twig_Node_Expression_Binary_Concat(
new Twig_Node_Expression_Constant('foo ', 1),
new Twig_Node_Expression_Binary_Concat(
new Twig_Node_Expression_Constant('foo ', 1),
new Twig_Node_Expression_Name('bar', 1),
new Twig_Node_Expression_Constant(' baz', 1),
1
),
new Twig_Node_Expression_Constant(' baz', 1),
1
),
)
),
array(
'{{ "foo #{"foo #{bar} baz"} baz" }}', new Twig_Node_Expression_Binary_Concat(
new Twig_Node_Expression_Constant('foo ', 1),
new Twig_Node_Expression_Binary_Concat(
new Twig_Node_Expression_Constant('foo ', 1),
new Twig_Node_Expression_Binary_Concat(
new Twig_Node_Expression_Constant('foo ', 1),
new Twig_Node_Expression_Binary_Concat(
new Twig_Node_Expression_Constant('foo ', 1),
new Twig_Node_Expression_Name('bar', 1),
new Twig_Node_Expression_Constant(' baz', 1),
1
),
new Twig_Node_Expression_Constant(' baz', 1),
1
),
new Twig_Node_Expression_Constant(' baz', 1),
1
),
new Twig_Node_Expression_Constant(' baz', 1),
1
),
),