mirror_php/PHP-Parser
1
0
Fork 0
mirror of https://github.com/nikic/PHP-Parser.git synced 2025-06-04 19:14:49 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #22 from schmittjoh/resolveCatchType

Browse Source 
fixes a bug where catch type was not resolved
This commit is contained in:
nikic 2012-05-04 00:45:47 -07:00
commit f33cd97a8d
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/PHPParser/NodeVisitor/NameResolver.php
View File

@ -66,6 +66,8 @@ class PHPParser_NodeVisitor_NameResolver extends PHPParser_NodeVisitorAbstract
if ($node->class instanceof PHPParser_Node_Name) { if ($node->class instanceof PHPParser_Node_Name) {
$node->class = $this->resolveClassName($node->class); $node->class = $this->resolveClassName($node->class);
} }
} elseif ($node instanceof PHPParser_Node_Stmt_Catch) {
$node->type = $this->resolveClassName($node->type);
} elseif ($node instanceof PHPParser_Node_Expr_FuncCall } elseif ($node instanceof PHPParser_Node_Expr_FuncCall
|| $node instanceof PHPParser_Node_Expr_ConstFetch || $node instanceof PHPParser_Node_Expr_ConstFetch
) { ) {
@ -102,7 +104,7 @@ class PHPParser_NodeVisitor_NameResolver extends PHPParser_NodeVisitorAbstract
$name->prepend($this->namespace); $name->prepend($this->namespace);
} }
return new PHPParser_Node_Name_FullyQualified($name->parts); return new PHPParser_Node_Name_FullyQualified($name->parts, $name->getLine());
} }
protected function resolveOtherName(PHPParser_Node_Name $name) { protected function resolveOtherName(PHPParser_Node_Name $name) {
@ -120,7 +122,7 @@ class PHPParser_NodeVisitor_NameResolver extends PHPParser_NodeVisitorAbstract
$name->prepend($this->namespace); $name->prepend($this->namespace);
} }
return new PHPParser_Node_Name_FullyQualified($name->parts); return new PHPParser_Node_Name_FullyQualified($name->parts, $name->getLine());
} }
protected function addNamespacedName(PHPParser_Node $node) { protected function addNamespacedName(PHPParser_Node $node) {
@ -128,7 +130,7 @@ class PHPParser_NodeVisitor_NameResolver extends PHPParser_NodeVisitorAbstract
$node->namespacedName = clone $this->namespace; $node->namespacedName = clone $this->namespace;
$node->namespacedName->append($node->name); $node->namespacedName->append($node->name);
} else { } else {
$node->namespacedName = new PHPParser_Node_Name($node->name); $node->namespacedName = new PHPParser_Node_Name($node->name, $node->getLine());
} }
} }
} }