Revert "merged branch hason/macros (PR #1139)"
authorFabien Potencier <fabien.potencier@gmail.com>
Wed, 2 Oct 2013 19:50:59 +0000 (21:50 +0200)
committerFabien Potencier <fabien.potencier@gmail.com>
Wed, 2 Oct 2013 19:50:59 +0000 (21:50 +0200)
commit74586e9f080a1d475acc5d44c6e76dae66b642b0
treef9ad40e2e67193c68a50d79a23e705f0269b5179
parentbf40fa3d795ace682b5100b07fffd6f7275cdb8b
Revert "merged branch hason/macros (PR #1139)"

This reverts commit 03926034c452bbf7f3bcc14dd167acf39bb33818, reversing
changes made to 730aa25bedeee922c361640f6e4c01e4e6bac998.

Conflicts:
CHANGELOG
doc/tags/macro.rst
doc/templates.rst
lib/Twig/ExpressionParser.php
20 files changed:
CHANGELOG
doc/tags/macro.rst
doc/templates.rst
lib/Twig/ExpressionParser.php
lib/Twig/Node/Expression/MacroCall.php [deleted file]
lib/Twig/Node/Macro.php
lib/Twig/Node/Module.php
lib/Twig/NodeVisitor/SafeAnalysis.php
lib/Twig/Template.php
lib/Twig/TokenParser/From.php
test/Twig/Tests/ExpressionParserTest.php
test/Twig/Tests/Fixtures/exceptions/unknown_macro.test [deleted file]
test/Twig/Tests/Fixtures/exceptions/unknown_macro_different_template.test [deleted file]
test/Twig/Tests/Fixtures/macros/auto_importing_in_same_file.test [deleted file]
test/Twig/Tests/Fixtures/macros/named_arguments.test [deleted file]
test/Twig/Tests/Node/Expression/MacroCallTest.php [deleted file]
test/Twig/Tests/Node/MacroTest.php
test/Twig/Tests/Node/ModuleTest.php
test/Twig/Tests/Node/SandboxedModuleTest.php
test/Twig/Tests/TemplateTest.php