cvs: php-src /ext/spl/examples recursivetreeiterator.inc

helly Mon Oct 3 09:29:32 2005 EDT Modified files: /php-src/ext/spl/examples recursivetreeiterator.inc Log: - Make prefixing more generic http://cvs.php.net/diff.php/php-src/ext/spl/examples/recursivetreeiterator.inc?r1=1.1&r2=1.2&ty=u Index: php-src/ext/spl/examples/recursivetreeiterator.inc diff -u php-src/ext/spl/examples/recursivetreeiterator.inc:1.1 php-src/ext/spl/examples/recursivetreeiterator.inc:1.2 --- php-src/ext/spl/examples/recursivetreeiterator.inc:1.1 Sun Oct 2 13:32:36 2005 +++ php-src/ext/spl/examples/recursivetreeiterator.inc Mon Oct 3 09:29:30 2005 @@ -26,17 +26,61 @@ $this->callToString = (bool)($cit_flags & CachingIterator::CALL_TOSTRING); } + /** @return prefix used if $level < depth and hasNext($level) == true + */ + function getPrefix1() + { + return '| '; + } + + /** @return prefix used if $level < depth and hasNext($level) == false + */ + function getPrefix2() + { + return ' '; + } + + /** @return prefix used if $level == depth and hasNext($level) == true + */ + function getPrefix3() + { + return '|-'; + } + + /** @return prefix used if $level == depth and hasNext($level) == false + */ + function getPrefix4() + { + return '\-'; + } + + function getPrefix($level) + { + if ($level < 0 || $level > $this->getDepth()) + { + throw new OutOfBoundsException('Parameter $level must be >= 0 and <= depth'); + } + if ($level < $this->getDepth()) + { + return $this->getSubIterator($level)->hasNext() ? $this->getPrefix1() : $this->getPrefix2(); + } + else + { + return $this->getSubIterator($level)->hasNext() ? $this->getPrefix3() : $this->getPrefix4(); + } + } + /** @return the current element prefixed with ASCII graphics */ function current() { $tree = ''; - for ($l=0; $l < $this->getDepth(); $l++) { - $tree .= $this->getSubIterator($l)->hasNext() ? '| ' : ' '; + for ($l=0; $l <= $this->getDepth(); $l++) + { + $tree .= $this->getPrefix($l); } - return $tree . ($this->getSubIterator($l)->hasNext() ? '|-' : '\-') - . ($this->callToString ? $this->getSubIterator($l)->__toString() : $this->getSubIterator($l)->current()); + return $tree . ($this->callToString ? $this->__toString() : parent::current()); } /** Aggregates the inner iterator