fixed set tag when used with a capture (closes #70)

This commit is contained in:
Fabien Potencier
2010-06-16 20:04:39 +02:00
parent 7d641d61f6
commit e596d2136e
2 changed files with 5 additions and 4 deletions
+1
View File
@@ -1,5 +1,6 @@
* 0.9.8
* fixed set tag when used with a capture
* fixed type hinting for Twig_Environment::addFilter() method
* 0.9.7 (2010-06-12)
+4 -4
View File
@@ -29,6 +29,10 @@ class Twig_TokenParser_Set extends Twig_TokenParser
list(, $values) = $this->parser->getExpressionParser()->parseMultitargetExpression();
$stream->expect(Twig_Token::BLOCK_END_TYPE);
if (count($names) !== count($values)) {
throw new Twig_SyntaxError("When using set, you must have the same number of variables and assignements.", $lineno);
}
} else {
$capture = true;
@@ -42,10 +46,6 @@ class Twig_TokenParser_Set extends Twig_TokenParser
$stream->expect(Twig_Token::BLOCK_END_TYPE);
}
if (count($names) !== count($values)) {
throw new Twig_SyntaxError("When using set, you must have the same number of variables and assignements.", $lineno);
}
return new Twig_Node_Set($capture, $names, $values, $lineno, $this->getTag());
}