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

support any expression as hash key

Browse Source
This commit is contained in:
Arnaud Le Blanc
2011-11-12 11:56:00 +01:00
parent 65f09ac724
commit 3b1f269e25
2 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/Twig/ExpressionParser.php
+11 -8
View File
@@ -166,6 +166,7 @@ class Twig_ExpressionParser
$stream = $this->parser->getStream();
$stream->expect(Twig_Token::PUNCTUATION_TYPE, '[', 'An array element was expected');
$elements = array();
$index = 0;
while (!$stream->test(Twig_Token::PUNCTUATION_TYPE, ']')) {
if (!empty($elements)) {
$stream->expect(Twig_Token::PUNCTUATION_TYPE, ',', 'An array element must be followed by a comma');
@@ -176,7 +177,12 @@ class Twig_ExpressionParser
}
}
$elements[] = $this->parseExpression();
$value = $this->parseExpression();
$key = new Twig_Node_Expression_Constant($index, $value->getLine());
array_push($elements, $key, $value);
$index += 1;
}
$stream->expect(Twig_Token::PUNCTUATION_TYPE, ']', 'An opened array is not properly closed');
@@ -198,14 +204,11 @@ class Twig_ExpressionParser
}
}
if (!$stream->test(Twig_Token::STRING_TYPE) && !$stream->test(Twig_Token::NUMBER_TYPE)) {
$current = $stream->getCurrent();
throw new Twig_Error_Syntax(sprintf('A hash key must be a quoted string or a number (unexpected token "%s" of value "%s"', Twig_Token::typeToEnglish($current->getType(), $current->getLine()), $current->getValue()), $current->getLine());
}
$key = $stream->next()->getValue();
$key = $this->parseExpression();
$stream->expect(Twig_Token::PUNCTUATION_TYPE, ':', 'A hash key must be followed by a colon (:)');
$elements[$key] = $this->parseExpression();
$value = $this->parseExpression();
array_push($elements, $key, $value);
}
$stream->expect(Twig_Token::PUNCTUATION_TYPE, '}', 'An opened hash is not properly closed');
lib/Twig/Node/Expression/Array.php
+3 -3
View File
@@ -24,16 +24,16 @@ class Twig_Node_Expression_Array extends Twig_Node_Expression
{
$compiler->raw('array(');
$first = true;
foreach ($this->nodes as $name => $node) {
foreach (array_chunk($this->nodes, 2) as $entry) {
if (!$first) {
$compiler->raw(', ');
}
$first = false;
$compiler
->repr($name)
->subcompile($entry[0])
->raw(' => ')
->subcompile($node)
->subcompile($entry[1])
;
}
$compiler->raw(')');