Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Now throws PHPTal_TemplateException when using metal:define-macro & metal:use-macro #3

Merged
merged 1 commit into from Apr 1, 2012
Merged

Now throws PHPTal_TemplateException when using metal:define-macro & metal:use-macro #3

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 2 additions & 1 deletion classes/PHPTAL/Php/Attribute/METAL/UseMacro.php
View file
Open in desktop
Expand Up @@ -57,7 +57,8 @@ public function before(PHPTAL_Php_CodeWriter $codewriter)
if ($defineAttr = $this->phpelement->getAttributeNodeNS(
'http://xml.zope.org/namespaces/metal', 'define-macro')) {
if ($defineAttr->getValue() == $macroname)
throw new Exception("Cannot simultaneously define and use macro '$macroname'");
throw new PHPTAL_TemplateException("Cannot simultaneously define and use macro '$macroname'",
$this->phpelement->getSourceFile(), $this->phpelement->getSourceLine());
}

// local macro (no filename specified) and non dynamic macro name
Expand Down