D9134.id21696.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D9134.id21696.diff
View Options

	diff --git a/src/parser/aast/api/AASTNode.php b/src/parser/aast/api/AASTNode.php
	--- a/src/parser/aast/api/AASTNode.php
	+++ b/src/parser/aast/api/AASTNode.php
	@@ -151,16 +151,21 @@
	}

	public function selectDescendantsOfType($type_name) {
	- $type = $this->getTypeIDFromTypeName($type_name);
	+ return $this->selectDescendantsOfTypes(array($type_name));
	+ }
	+
	+ public function selectDescendantsOfTypes(array $type_names) {
	+ $nodes = array();
	+ foreach ($type_names as $type_name) {
	+ $type = $this->getTypeIDFromTypeName($type_name);

	- if (isset($this->selectCache)) {
	- if (isset($this->selectCache[$type])) {
	- $nodes = $this->selectCache[$type];
	+ if (isset($this->selectCache)) {
	+ if (isset($this->selectCache[$type])) {
	+ $nodes = $nodes + $this->selectCache[$type];
	+ }
	} else {
	- $nodes = array();
	+ $nodes = $nodes + $this->executeSelectDescendantsOfType($this, $type);
	}
	- } else {
	- $nodes = $this->executeSelectDescendantsOfType($this, $type);
	}

	return AASTNodeList::newFromTreeAndNodes($this->tree, $nodes);