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

parser support for interpolated strings

Browse Source
This commit is contained in:
Arnaud Le Blanc
2011-11-12 16:54:35 +01:00
parent c8bba24dec
commit 098634e0b7
1 changed files with 37 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/Twig/ExpressionParser.php
+37 -1
View File
@@ -143,11 +143,15 @@ class Twig_ExpressionParser
break;
case Twig_Token::NUMBER_TYPE:
case Twig_Token::STRING_TYPE:
$this->parser->getStream()->next();
$node = new Twig_Node_Expression_Constant($token->getValue(), $token->getLine());
break;
case Twig_Token::STRING_TYPE:
case Twig_Token::INTERPOLATION_START_TYPE:
$node = $this->parseStringExpression();
break;
default:
if ($token->test(Twig_Token::PUNCTUATION_TYPE, '[')) {
$node = $this->parseArrayExpression();
@@ -161,6 +165,38 @@ class Twig_ExpressionParser
return $this->parsePostfixExpression($node);
}
public function parseStringExpression()
{
$stream = $this->parser->getStream();
$nodes = array();
while (true) {
if ($stream->test(Twig_Token::STRING_TYPE)) {
$token = $stream->next();
$nodes[] = new Twig_Node_Expression_Constant($token->getValue(), $token->getLine());
} else if ($stream->test(Twig_Token::INTERPOLATION_START_TYPE)) {
$stream->next();
$nodes[] = $this->parseExpression();
$stream->expect(Twig_Token::INTERPOLATION_END_TYPE);
} else {
break;
}
}
$expr = null;
foreach(array_reverse($nodes) as $node) {
if (null === $expr) {
$expr = $node;
} else {
$expr = new Twig_Node_Expression_Binary_Concat($node, $expr, $node->getLine());
}
}
return $expr;
}
public function parseArrayExpression()
{
$stream = $this->parser->getStream();