danog/PHP-Parser
1
0
Fork 0
mirror of https://github.com/danog/PHP-Parser.git synced 2024-11-27 04:14:44 +01:00
Code Issues Projects Releases Wiki Activity

Some minor improvements (performance and exception wise) for the node traverser

Browse Source
This commit is contained in:
nikic 2011-08-31 21:19:31 +02:00
parent 63525d36e7
commit 393221ce63
1 changed files with 13 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
lib/PHPParser/NodeTraverser.php
View File

@ -29,6 +29,10 @@ class PHPParser_NodeTraverser
* @param array|PHPParser_NodeAbstract $node Node or array * @param array|PHPParser_NodeAbstract $node Node or array
*/ */
public function traverse(&$node) { public function traverse(&$node) {
if (!is_array($node) && !$node instanceof PHPParser_NodeAbstract) {
throw new InvalidArgumentException('Can only traverse nodes and arrays');
}
foreach ($this->visitors as $visitor) { foreach ($this->visitors as $visitor) {
$visitor->beforeTraverse($node); $visitor->beforeTraverse($node);
} }
@ -41,22 +45,18 @@ class PHPParser_NodeTraverser
} }
protected function _traverse(&$node, array $visitors) { protected function _traverse(&$node, array $visitors) {
if (!is_array($node) && !$node instanceof Traversable) {
return;
}
$doNodes = array(); $doNodes = array();
foreach ($node as $subNodeKey => &$subNode) { foreach ($node as $subNodeKey => &$subNode) {
if ($subNode instanceof PHPParser_NodeAbstract) { if (is_array($subNode)) {
$this->_traverse($subNode, $visitors);
} elseif ($subNode instanceof PHPParser_NodeAbstract) {
foreach ($visitors as $visitor) { foreach ($visitors as $visitor) {
$visitor->enterNode($subNode); $visitor->enterNode($subNode);
} }
}
$this->_traverse($subNode, $visitors); $this->_traverse($subNode, $visitors);
if ($subNode instanceof PHPParser_NodeAbstract) {
foreach ($visitors as $i => $visitor) { foreach ($visitors as $i => $visitor) {
$return = $visitor->leaveNode($subNode); $return = $visitor->leaveNode($subNode);
@ -78,18 +78,12 @@ class PHPParser_NodeTraverser
} }
if (!empty($doNodes)) { if (!empty($doNodes)) {
if (is_array($node)) { if (!is_array($node)) {
while (list($key, $replace) = array_pop($doNodes)) { throw new Exception('Nodes can only be merged if the parent is an array');
array_splice($node, $key, 1, $replace); }
}
} else {
while (list($key, $replace) = array_pop($doNodes)) {
if (!empty($replace)) {
throw new Exception('Nodes can only be merged if the parent is an array');
}
unset($node[$key]); while (list($key, $replace) = array_pop($doNodes)) {
} array_splice($node, $key, 1, $replace);
} }
} }
} }