Skip to content

Commit

Permalink
Revert "merged branch arnaud-lb/hash-key-expr (PR twigphp#514)"
Browse files Browse the repository at this point in the history 
This reverts commit 8665c64, reversing
changes made to 4aba337.
  • Loading branch information
@fabpot
fabpot committed Dec 23, 2011
1 parent a555fae commit 99b2c5b
Show file tree
Hide file tree
Showing 7 changed files with 26 additions and 79 deletions.
1 change: 0 additions & 1 deletion CHANGELOG
View file
@@ -1,6 +1,5 @@
* 1.5.0

* allowed hash keys to be any expression
* added a do tag
* added a flush tag
* added support for dynamically named filters and functions
Expand Down
19 changes: 8 additions & 11 deletions lib/Twig/ExpressionParser.php
View file
Expand Up @@ -198,7 +198,6 @@ public function parseArrayExpression()
$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');
Expand All @@ -209,12 +208,7 @@ public function parseArrayExpression()
}
}

$value = $this->parseExpression();
$key = new Twig_Node_Expression_Constant($index, $value->getLine());

array_push($elements, $key, $value);

$index += 1;
$elements[] = $this->parseExpression();
}
$stream->expect(Twig_Token::PUNCTUATION_TYPE, ']', 'An opened array is not properly closed');

Expand All @@ -236,11 +230,14 @@ public function parseHashExpression()
}
}

$key = $this->parseExpression();
$stream->expect(Twig_Token::PUNCTUATION_TYPE, ':', 'A hash key must be followed by a colon (:)');
$value = $this->parseExpression();
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());
}

array_push($elements, $key, $value);
$key = $stream->next()->getValue();
$stream->expect(Twig_Token::PUNCTUATION_TYPE, ':', 'A hash key must be followed by a colon (:)');
$elements[$key] = $this->parseExpression();
}
$stream->expect(Twig_Token::PUNCTUATION_TYPE, '}', 'An opened hash is not properly closed');

Expand Down
20 changes: 3 additions & 17 deletions lib/Twig/Node/Expression/Array.php
View file
Expand Up @@ -15,20 +15,6 @@ public function __construct(array $elements, $lineno)
parent::__construct($elements, array(), $lineno);
}

public function getKeyValuePairs()
{
$pairs = array();

foreach (array_chunk($this->nodes, 2) as $pair) {
$pairs[] = array(
'key' => $pair[0],
'value' => $pair[1],
);
}

return $pairs;
}

/**
* Compiles the node to PHP.
*
Expand All @@ -38,16 +24,16 @@ public function compile(Twig_Compiler $compiler)
{
$compiler->raw('array(');
$first = true;
foreach ($this->getKeyValuePairs() as $pair) {
foreach ($this->nodes as $name => $node) {
if (!$first) {
$compiler->raw(', ');
}
$first = false;

$compiler
->subcompile($pair['key'])
->repr($name)
->raw(' => ')
->subcompile($pair['value'])
->subcompile($node)
;
}
$compiler->raw(')');
Expand Down
40 changes: 9 additions & 31 deletions test/Twig/Tests/ExpressionParserTest.php
View file
Expand Up @@ -64,6 +64,7 @@ public function getFailingTestsForArray()
{
return array(
array('{{ [1, "a": "b"] }}'),
array('{{ {a: "b"} }}'),
array('{{ {"a": "b", 2} }}'),
);
}
Expand All @@ -73,72 +74,49 @@ public function getTestsForArray()
return array(
// simple array
array('{{ [1, 2] }}', new Twig_Node_Expression_Array(array(
new Twig_Node_Expression_Constant(0, 1),
new Twig_Node_Expression_Constant(1, 1),

new Twig_Node_Expression_Constant(1, 1),
new Twig_Node_Expression_Constant(2, 1),
), 1),
),

// array with trailing ,
array('{{ [1, 2, ] }}', new Twig_Node_Expression_Array(array(
new Twig_Node_Expression_Constant(0, 1),
new Twig_Node_Expression_Constant(1, 1),

new Twig_Node_Expression_Constant(1, 1),
new Twig_Node_Expression_Constant(2, 1),
), 1),
),

// simple hash
array('{{ {"a": "b", "b": "c"} }}', new Twig_Node_Expression_Array(array(
new Twig_Node_Expression_Constant('a', 1),
new Twig_Node_Expression_Constant('b', 1),

new Twig_Node_Expression_Constant('b', 1),
new Twig_Node_Expression_Constant('c', 1),
'a' => new Twig_Node_Expression_Constant('b', 1),
'b' => new Twig_Node_Expression_Constant('c', 1),
), 1),
),

// hash with trailing ,
array('{{ {"a": "b", "b": "c", } }}', new Twig_Node_Expression_Array(array(
new Twig_Node_Expression_Constant('a', 1),
new Twig_Node_Expression_Constant('b', 1),

new Twig_Node_Expression_Constant('b', 1),
new Twig_Node_Expression_Constant('c', 1),
'a' => new Twig_Node_Expression_Constant('b', 1),
'b' => new Twig_Node_Expression_Constant('c', 1),
), 1),
),

// hash in an array
array('{{ [1, {"a": "b", "b": "c"}] }}', new Twig_Node_Expression_Array(array(
new Twig_Node_Expression_Constant(0, 1),
new Twig_Node_Expression_Constant(1, 1),

new Twig_Node_Expression_Constant(1, 1),
new Twig_Node_Expression_Array(array(
new Twig_Node_Expression_Constant('a', 1),
new Twig_Node_Expression_Constant('b', 1),

new Twig_Node_Expression_Constant('b', 1),
new Twig_Node_Expression_Constant('c', 1),
'a' => new Twig_Node_Expression_Constant('b', 1),
'b' => new Twig_Node_Expression_Constant('c', 1),
), 1),
), 1),
),

// array in a hash
array('{{ {"a": [1, 2], "b": "c"} }}', new Twig_Node_Expression_Array(array(
new Twig_Node_Expression_Constant('a', 1),
new Twig_Node_Expression_Array(array(
new Twig_Node_Expression_Constant(0, 1),
new Twig_Node_Expression_Constant(1, 1),

'a' => new Twig_Node_Expression_Array(array(
new Twig_Node_Expression_Constant(1, 1),
new Twig_Node_Expression_Constant(2, 1),
), 1),
new Twig_Node_Expression_Constant('b', 1),
new Twig_Node_Expression_Constant('c', 1),
'b' => new Twig_Node_Expression_Constant('c', 1),
), 1),
),
);
Expand Down
10 changes: 0 additions & 10 deletions test/Twig/Tests/Fixtures/expressions/array.test
View file
Expand Up @@ -27,13 +27,6 @@ Twig supports array notation
2,
]|join(',')
}}

{# keys can be any expression #}
{% set a = 1 %}
{% set b = "foo" %}
{% set ary = { a: 'a', b: 'b', 'c': 'c', a~b: 'd' } %}
{{ ary|keys|join(',') }}
{{ ary|join(',') }}
--DATA--
return array('bar' => 'bar', 'foo' => array('bar' => 'bar'))
--EXPECT--
Expand All @@ -50,6 +43,3 @@ bar
FOO,BAR,

1,2

1,foo,c,1foo
a,b,c,d
11 changes: 4 additions & 7 deletions test/Twig/Tests/Node/Expression/ArrayTest.php
View file
Expand Up @@ -18,10 +18,10 @@ class Twig_Tests_Node_Expression_ArrayTest extends Twig_Tests_Node_TestCase
*/
public function testConstructor()
{
$elements = array(new Twig_Node_Expression_Constant('foo', 0), $foo = new Twig_Node_Expression_Constant('bar', 0));
$elements = array('foo' => $foo = new Twig_Node_Expression_Constant('bar', 0));
$node = new Twig_Node_Expression_Array($elements, 0);

$this->assertEquals($foo, $node->getNode(1));
$this->assertEquals($foo, $node->getNode('foo'));
}

/**
Expand All @@ -36,11 +36,8 @@ public function testCompile($node, $source, $environment = null)
public function getTests()
{
$elements = array(
new Twig_Node_Expression_Constant('foo', 0),
new Twig_Node_Expression_Constant('bar', 0),

new Twig_Node_Expression_Constant('bar', 0),
new Twig_Node_Expression_Constant('foo', 0),
'foo' => new Twig_Node_Expression_Constant('bar', 0),
'bar' => new Twig_Node_Expression_Constant('foo', 0),
);
$node = new Twig_Node_Expression_Array($elements, 0);

Expand Down
4 changes: 2 additions & 2 deletions test/Twig/Tests/Node/IncludeTest.php
View file
Expand Up @@ -25,7 +25,7 @@ public function testConstructor()
$this->assertEquals($expr, $node->getNode('expr'));
$this->assertFalse($node->getAttribute('only'));

$vars = new Twig_Node_Expression_Array(array(new Twig_Node_Expression_Constant('foo', 0), new Twig_Node_Expression_Constant(true, 0)), 0);
$vars = new Twig_Node_Expression_Array(array('foo' => new Twig_Node_Expression_Constant(true, 0)), 0);
$node = new Twig_Node_Include($expr, $vars, true, false, 0);
$this->assertEquals($vars, $node->getNode('variables'));
$this->assertTrue($node->getAttribute('only'));
Expand Down Expand Up @@ -62,7 +62,7 @@ public function getTests()
);

$expr = new Twig_Node_Expression_Constant('foo.twig', 0);
$vars = new Twig_Node_Expression_Array(array(new Twig_Node_Expression_Constant('foo', 0), new Twig_Node_Expression_Constant(true, 0)), 0);
$vars = new Twig_Node_Expression_Array(array('foo' => new Twig_Node_Expression_Constant(true, 0)), 0);
$node = new Twig_Node_Include($expr, $vars, false, false, 0);
$tests[] = array($node, '$this->env->loadTemplate("foo.twig")->display(array_merge($context, array("foo" => true)));');

Expand Down

0 comments on commit 99b2c5b

Please sign in to comment.