From: nikic <+@ni-po.com> Date: Wed, 22 Dec 2010 16:33:28 +0000 (+0100) Subject: rename $parser to $stream in parseArguments X-Git-Url: http://git.silmor.de/gitweb/?a=commitdiff_plain;h=4ebbc5e43e446d8f48b03dff2e1c1357dce43acd;p=web%2Fkonrad%2Ftwig.git rename $parser to $stream in parseArguments --- diff --git a/lib/Twig/ExpressionParser.php b/lib/Twig/ExpressionParser.php index bba2ae3..68f9a9d 100644 --- a/lib/Twig/ExpressionParser.php +++ b/lib/Twig/ExpressionParser.php @@ -296,17 +296,17 @@ class Twig_ExpressionParser public function parseArguments() { - $parser = $this->parser->getStream(); - $parser->expect(Twig_Token::PUNCTUATION_TYPE, '('); - $args = array(); - while (!$parser->test(Twig_Token::PUNCTUATION_TYPE, ')')) { + $stream = $this->parser->getStream(); + + $stream->expect(Twig_Token::PUNCTUATION_TYPE, '(', 'A list of arguments must be opened by a parenthesis'); + while (!$stream->test(Twig_Token::PUNCTUATION_TYPE, ')')) { if (!empty($args)) { - $parser->expect(Twig_Token::PUNCTUATION_TYPE, ',', 'Arguments must be separated by a comma'); + $stream->expect(Twig_Token::PUNCTUATION_TYPE, ',', 'Arguments must be separated by a comma'); } $args[] = $this->parseExpression(); } - $parser->expect(Twig_Token::PUNCTUATION_TYPE, ')', 'A list of arguments must be closed by a parenthesis'); + $stream->expect(Twig_Token::PUNCTUATION_TYPE, ')', 'A list of arguments must be closed by a parenthesis'); return new Twig_Node($args); }