geckon01/Twig
1
0
Fork 0
mirror of https://github.com/twigphp/Twig.git synced 2026-09-14 19:36:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

moved some code to the proper location

Browse Source
This commit is contained in:
Fabien Potencier
2012-12-08 09:18:33 +01:00
parent 3ca17acb4a
commit 9f67d588c8
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/Twig/ExpressionParser.php
+11 -11
View File
@@ -365,6 +365,17 @@ class Twig_ExpressionParser
} else {
throw new Twig_Error_Syntax('Expected name or number', $lineno, $this->parser->getFilename());
}
if ($node instanceof Twig_Node_Expression_Name && null !== $alias = $this->parser->getImportedSymbol('template', $node->getAttribute('name'))) {
if (!$arg instanceof Twig_Node_Expression_Constant) {
throw new Twig_Error_Syntax(sprintf('Dynamic macro names are not supported (called on "%s")', $node->getAttribute('name')), $token->getLine(), $this->parser->getFilename());
}
$node = new Twig_Node_Expression_MethodCall($node, 'get'.$arg->getAttribute('value'), $arguments, $lineno);
$node->setAttribute('safe', true);
return $node;
}
} else {
$type = Twig_TemplateInterface::ARRAY_CALL;
@@ -392,17 +403,6 @@ class Twig_ExpressionParser
$stream->expect(Twig_Token::PUNCTUATION_TYPE, ']');
}
if ($node instanceof Twig_Node_Expression_Name && null !== $alias = $this->parser->getImportedSymbol('template', $node->getAttribute('name'))) {
if (!$arg instanceof Twig_Node_Expression_Constant) {
throw new Twig_Error_Syntax(sprintf('Dynamic macro names are not supported (called on "%s")', $node->getAttribute('name')), $token->getLine(), $this->parser->getFilename());
}
$node = new Twig_Node_Expression_MethodCall($node, 'get'.$arg->getAttribute('value'), $arguments, $lineno);
$node->setAttribute('safe', true);
return $node;
}
return new Twig_Node_Expression_GetAttr($node, $arg, $arguments, $type, $lineno);
}