geckon01/Twig
1
0
Fork 0
mirror of https://github.com/twigphp/Twig.git synced 2026-09-13 19:06:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

remove $is_multitarget return in parseMultitargetExpression

Browse Source 
Furthermore slightly reordered code thus removing redundant expect()
This commit is contained in:
nikic
2010-12-20 18:39:16 +01:00
committed by Fabien Potencier
parent 1467586430
commit d88a3c805f
2 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/Twig/ExpressionParser.php
+2 -7
View File
@@ -336,13 +336,8 @@ class Twig_ExpressionParser
public function parseMultitargetExpression()
{
$lineno = $this->parser->getCurrentToken()->getLine();
$targets = array();
$is_multitarget = false;
while (true) {
if (!empty($targets)) {
$this->parser->getStream()->expect(Twig_Token::PUNCTUATION_TYPE, ',', 'Multiple assignments must be separated by a comma (,)');
}
if ($this->parser->getStream()->test(Twig_Token::PUNCTUATION_TYPE, ')') ||
$this->parser->getStream()->test(Twig_Token::VAR_END_TYPE) ||
$this->parser->getStream()->test(Twig_Token::BLOCK_END_TYPE))
@@ -353,9 +348,9 @@ class Twig_ExpressionParser
if (!$this->parser->getStream()->test(Twig_Token::PUNCTUATION_TYPE, ',')) {
break;
}
$is_multitarget = true;
$this->parser->getStream()->next();
}
return array($is_multitarget, new Twig_Node($targets));
return new Twig_Node($targets);
}
}
lib/Twig/TokenParser/Set.php
+1 -1
View File
@@ -26,7 +26,7 @@ class Twig_TokenParser_Set extends Twig_TokenParser
$capture = false;
if ($stream->test(Twig_Token::OPERATOR_TYPE, '=')) {
$stream->next();
list(, $values) = $this->parser->getExpressionParser()->parseMultitargetExpression();
$values = $this->parser->getExpressionParser()->parseMultitargetExpression();
$stream->expect(Twig_Token::BLOCK_END_TYPE);