geckon01/Twig
1
0
Fork 0
mirror of https://github.com/twigphp/Twig.git synced 2026-10-26 21:55:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

changed arrow syntax

Browse Source
This commit is contained in:
Fabien Potencier
2019-05-03 15:52:49 +02:00
parent b30bce1139
commit dc2776359c
5 changed files with 34 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ExpressionParser.php
+12 -11
View File
@@ -111,28 +111,29 @@ class ExpressionParser
$stream = $this->parser->getStream();
$token = $this->parser->getCurrentToken();
$line = $token->getLine();
if (!$token->test(Token::PUNCTUATION_TYPE, '|')) {
if (!$token->test(Token::NAME_TYPE, 'fn')) {
return null;
}
if ($stream->look(2)->test(Token::PUNCTUATION_TYPE, '(')) {
return null;
}
$stream->next();
$stream->next(); // fn
$stream->next(); // (
$names = [];
while (true) {
$token = $this->parser->getCurrentToken();
if (!$token->test(Token::NAME_TYPE)) {
throw new SyntaxError(sprintf('Unexpected token "%s" of value "%s".', Token::typeToEnglish($token->getType()), $token->getValue()), $token->getLine(), $stream->getSourceContext());
}
$names[] = $token->getValue();
$stream->next();
$token = $stream->expect(Token::NAME_TYPE);
$value = $token->getValue();
$names[] = new AssignNameExpression($value, $token->getLine());
if (!$stream->nextIf(Token::PUNCTUATION_TYPE, ',')) {
break;
}
}
$stream->expect(Token::PUNCTUATION_TYPE, '|');
$stream->expect(Token::PUNCTUATION_TYPE, ')');
$stream->expect(Token::ARROW_TYPE);
return new ArrowFunctionExpression($this->parseExpression(0), $names, $line);
return new ArrowFunctionExpression($this->parseExpression(0), new Node($names), $line);
}
protected function getPrimary()