helly Mon Jun 9 12:58:51 2003 EDT
Modified files:
/spl spl.php spl_array.c spl_foreach.c
Log:
No more namespaces
Index: spl/spl.php
diff -u spl/spl.php:1.1.1.1 spl/spl.php:1.2
--- spl/spl.php:1.1.1.1 Thu May 1 19:28:28 2003
+++ spl/spl.php Mon Jun 9 12:58:51 2003
@@ -1,306 +1,304 @@
<?php
-/* \brief Standard PHP Library
+/* Standard PHP Library
*
* (c) M.Boerger 2003
*/
-namespace spl {
- /*! \brief Interface to foreach() construct
- *
- * Any class that implements this interface can for example be used as
- * the input parameter to foreach() calls which would normally be an
- * array.
+/*! \brief Interface to foreach() construct
+ *
+ * Any class that implements this interface can for example be used as
+ * the input parameter to foreach() calls which would normally be an
+ * array.
+ *
+ * The only thing a class has to do is
+ */
+interface iterator {
+
+ /*! \brief Create a new iterator
*
- * The only thing a class has to do is
+ * used for example in foreach() operator.
*/
- interface iterator {
-
- /*! \brief Create a new iterator
- *
- * used for example in foreach() operator.
- */
- function new_iterator();
+ function new_iterator();
+}
+
+/*! \brief Simple forward iterator
+ *
+ * Any class that implements this interface can be used as the
+ * return of a foreach interface. And hence the class itself
+ * can be used as a parameter to be iterated (normally an array).
+ *
+ * \code
+ class c implements spl::foreach, spl::forward {
+ private $num = 0;
+ function new_iterator() {
+ $this->num = 0;
+ return $this;
+ }
+ function current() {
+ return $this->num;
+ }
+ function next() {
+ $this->num++;
+ }
+ function has_more() {
+ return $this->num < 5;
+ }
}
+
+ $t = new c();
- /*! \brief Simple forward iterator
- *
- * Any class that implements this interface can be used as the
- * return of a foreach interface. And hence the class itself
- * can be used as a parameter to be iterated (normally an array).
- *
- * \code
- class c implements spl::foreach, spl::forward {
- private $num = 0;
- function new_iterator() {
- $this->num = 0;
- return $this;
- }
- function current() {
- return $this->num;
- }
- function next() {
- $this->num++;
- }
- function has_more() {
- return $this->num < 5;
- }
+ foreach($t as $num) {
+ echo "$num\n";
+ }
+ \endcode
+ *
+ * A very interesting usage scenario are for example database queries.
+ * Without this interface you need to do it without foreach or fetch the
+ * whole rowset into an array.
+ *
+ * In the above code the class implements both the foreach and the
+ * forward interface. Doing this you cannot have nested foreach calls.
+ * If you need this you must split the two parts.
+ *
+ * \code
+ class c implements spl::foreach {
+ public $max = 3;
+ function new_iterator() {
+ return new c_iter($this);
}
-
- $t = new c();
+ }
+ class c_iter implements spl::forward {
+ private $obj;
+ private $num = 0;
+ function __construct($obj) {
+ $this->obj = $obj;
+ }
+ function current() {
+ return $this->num;
+ }
+ function next() {
+ $this->num++;
+ }
+ function has_more() {
+ return $this->num < $this->obj->max;
+ }
+ }
+
+ $t = new c();
- foreach($t as $num) {
- echo "$num\n";
+ foreach($t as $outer) {
+ foreach($t as $inner) {
+ echo "$outer,$inner\n";
}
- \endcode
- *
- * A very interesting usage scenario are for example database queries.
- * Without this interface you need to do it without foreach or fetch the
- * whole rowset into an array.
- *
- * In the above code the class implements both the foreach and the
- * forward interface. Doing this you cannot have nested foreach calls.
- * If you need this you must split the two parts.
- *
- * \code
- class c implements spl::foreach {
- public $max = 3;
- function new_iterator() {
- return new c_iter($this);
- }
- }
- class c_iter implements spl::forward {
- private $obj;
- private $num = 0;
- function __construct($obj) {
- $this->obj = $obj;
- }
- function current() {
- return $this->num;
- }
- function next() {
- $this->num++;
- }
- function has_more() {
- return $this->num < $this->obj->max;
- }
- }
-
- $t = new c();
-
- foreach($t as $outer) {
- foreach($t as $inner) {
- echo "$outer,$inner\n";
- }
+ }
+ \endcode
+ *
+ * You can also use this interface with the for() construct.
+ *
+ * \code
+ class c implements spl::foreach {
+ public $max = 3;
+ function new_iterator() {
+ return new c_iter($this);
}
- \endcode
- *
- * You can also use this interface with the for() construct.
- *
- * \code
- class c implements spl::foreach {
- public $max = 3;
- function new_iterator() {
- return new c_iter($this);
- }
- }
- class c_iter implements spl::forward {
- private $obj;
- private $num = 0;
- function __construct($obj) {
- $this->obj = $obj;
- }
- function current() {
- return $this->num;
- }
- function next() {
- $this->num++;
- }
- function has_more() {
- return $this->num < $this->obj->max;
- }
- }
-
- $t = new c();
-
- for ($iter = $t->new_iterator(); $iter->has_more(); $iter->next()) {
- echo $iter->current() . "\n";
- }
- \endcode
- */
- interface forward {
-
- /*! \brief Retrieve the current currentent
- *
- * \return \c mixed current element or \c false if no more elements
- */
- function current();
-
- /*! \brief Forward to next element.
- */
- function next();
-
- /*! \brief Check if more elements are available.
- *
- * \return \c bool whether or not more elements are available
- */
- function has_more();
}
+ class c_iter implements spl::forward {
+ private $obj;
+ private $num = 0;
+ function __construct($obj) {
+ $this->obj = $obj;
+ }
+ function current() {
+ return $this->num;
+ }
+ function next() {
+ $this->num++;
+ }
+ function has_more() {
+ return $this->num < $this->obj->max;
+ }
+ }
- /*! \brief A restartable iterator.
- *
- * This iterator allows you to implement a restartable iterator. That
- * means the iterator can be rewind to the first element after accessing
- * any number of elements.
- *
- * \note If you use sequence in foreach then rewind() will be called
- * first.
- */
- interface sequence extends forward {
+ $t = new c();
- /*! Restart the sequence by positioning it to the first element.
- */
- function rewind();
- }
+ for ($iter = $t->new_iterator(); $iter->has_more(); $iter->next()) {
+ echo $iter->current() . "\n";
+ }
+ \endcode
+ */
+interface forward {
- /*! \brief associative interface
+ /*! \brief Retrieve the current currentent
*
- * This interface allows to implement associative iterators
- * and containers.
+ * \return \c mixed current element or \c false if no more elements
*/
- interface assoc {
-
- /*! \brief Retrieve the current elements key
- *
- * \return \c mixed current key or \c false if no more elements
- */
- function key();
- }
+ function current();
+
+ /*! \brief Forward to next element.
+ */
+ function next();
- /*! \brief associative foreach() interface
+ /*! \brief Check if more elements are available.
*
- * This interface extends the forward interface to support keys.
- * With this interface you can do:
- * \code
- $t = new c();
- foreach($t as $key => $elem).
- \endcode
- */
- interface assoc_forward extends forward implements assoc {
- }
+ * \return \c bool whether or not more elements are available
+ */
+ function has_more();
+}
- /*! \brief associative sequence
+/*! \brief A restartable iterator.
+ *
+ * This iterator allows you to implement a restartable iterator. That
+ * means the iterator can be rewind to the first element after accessing
+ * any number of elements.
+ *
+ * \note If you use sequence in foreach then rewind() will be called
+ * first.
+ */
+interface sequence extends forward {
+
+ /*! Restart the sequence by positioning it to the first element.
*/
- interface assoc_sequence extends sequence implements assoc {
- }
+ function rewind();
+}
+
+/*! \brief associative interface
+ *
+ * This interface allows to implement associative iterators
+ * and containers.
+ */
+interface assoc {
- /*! \brief array read only access for objects
+ /*! \brief Retrieve the current elements key
+ *
+ * \return \c mixed current key or \c false if no more elements
*/
- interface array_read {
-
- /*! Check whether or not the given index exists.
- * The returned value is interpreted as converted to bool.
- */
- function exists($index);
-
- /*! Read the value at position $index.
- * This function is only beeing called if exists() returns true.
- */
- function get($index);
- }
+ function key();
+}
+
+/*! \brief associative foreach() interface
+ *
+ * This interface extends the forward interface to support keys.
+ * With this interface you can do:
+ * \code
+ $t = new c();
+ foreach($t as $key => $elem).
+ \endcode
+ */
+interface assoc_forward extends forward implements assoc {
+}
+
+/*! \brief associative sequence
+ */
+interface assoc_sequence extends sequence implements assoc {
+}
+
+/*! \brief array read only access for objects
+ */
+interface array_read {
- /*! \brief array read/write access for objects.
- *
- * The following example shows how to use an array_writer:
- * \code
- class array_emulation implemets spl::array_access {
- private $ar = array();
- function exists($index) {
- return array_key_exists($index, $this->ar);
- }
- function get($index) {
- return $this->ar[$index];
- }
- function set($index, $value) {
- $this->ar[$index] = $value;
- }
- }
- \endcode
+ /*! Check whether or not the given index exists.
+ * The returned value is interpreted as converted to bool.
*/
- interface array_access extends array_read {
+ function exists($index);
- /*! Set the value identified by $index to $value.
- */
- function set($value, $index);
- }
+ /*! Read the value at position $index.
+ * This function is only beeing called if exists() returns true.
+ */
+ function get($index);
+}
- /*! \brief array read/write access with customized array_writer
- *
- * The internal structure requires that write access via interfaces
- * is divided into two parts. First the index is used to create an
- * array_writer which will later receive the new value and calls the
- * containers set() method with appropriate parameters.
- *
- * Sometimes it is helpfull to overwrite this behavior and have your
- * own implementation for the array_writer.
- *
- * The following example shows how to use a customized array_writer:
- * \code
- class array_emulation_ex extends array_emulation implemets
spl::array_access_ex {
- private $last_index = NULL;
- function new_writer($index) {
- $last_index = $index;
- return new array_write(&$this, $index);
- }
+/*! \brief array read/write access for objects.
+ *
+ * The following example shows how to use an array_writer:
+ * \code
+ class array_emulation implemets spl::array_access {
+ private $ar = array();
+ function exists($index) {
+ return array_key_exists($index, $this->ar);
}
- \endcode
+ function get($index) {
+ return $this->ar[$index];
+ }
+ function set($index, $value) {
+ $this->ar[$index] = $value;
+ }
+ }
+ \endcode
+ */
+interface array_access extends array_read {
+
+ /*! Set the value identified by $index to $value.
*/
- interface array_access_ex extends array_access {
+ function set($value, $index);
+}
- /*! Create an array_writer interface for the specified index.
- *
- * If your container uses array_access instead of array_access_ex
- * the following code would be equal to the internal new_writer()
- * method:
- \code
- function new_writer($index) {
- return new array_write(&$this, $index);
- }
- \endcode
- */
- function new_writer($index);
+/*! \brief array read/write access with customized array_writer
+ *
+ * The internal structure requires that write access via interfaces
+ * is divided into two parts. First the index is used to create an
+ * array_writer which will later receive the new value and calls the
+ * containers set() method with appropriate parameters.
+ *
+ * Sometimes it is helpfull to overwrite this behavior and have your
+ * own implementation for the array_writer.
+ *
+ * The following example shows how to use a customized array_writer:
+ * \code
+ class array_emulation_ex extends array_emulation implemets
spl::array_access_ex {
+ private $last_index = NULL;
+ function new_writer($index) {
+ $last_index = $index;
+ return new array_write(&$this, $index);
+ }
}
+ \endcode
+ */
+interface array_access_ex extends array_access {
- /*! \brief array writer interface
+ /*! Create an array_writer interface for the specified index.
*
- * for every write access to an array_access instance an array_writer
- * is created which receives the originating object and the index as
- * parameters for the constructor call.
- *
- * The following shows the equivalent php code for the default
- * implementation array_write.
- * \code
- class array_write implements array_writer {
- private $obj;
- private $idx;
- function __construct(&$obj, $index = null) {
- $this->obj = $obj;
- $this->idx = $index;
- }
- function set($value) {
- return $this->obj->set($this->idx, $value);
- }
+ * If your container uses array_access instead of array_access_ex
+ * the following code would be equal to the internal new_writer()
+ * method:
+ \code
+ function new_writer($index) {
+ return new array_write(&$this, $index);
}
\endcode
- *
- * See array_access for more.
*/
- interface array_writer {
+ function new_writer($index);
+}
- /*! Set the corresponding value to $value.
- */
- function set($value);
+/*! \brief array writer interface
+ *
+ * for every write access to an array_access instance an array_writer
+ * is created which receives the originating object and the index as
+ * parameters for the constructor call.
+ *
+ * The following shows the equivalent php code for the default
+ * implementation array_write.
+ * \code
+ class array_write implements array_writer {
+ private $obj;
+ private $idx;
+ function __construct(&$obj, $index = null) {
+ $this->obj = $obj;
+ $this->idx = $index;
+ }
+ function set($value) {
+ return $this->obj->set($this->idx, $value);
+ }
}
+ \endcode
+ *
+ * See array_access for more.
+ */
+interface array_writer {
+ /*! Set the corresponding value to $value.
+ */
+ function set($value);
}
+
?>
Index: spl/spl_array.c
diff -u spl/spl_array.c:1.3 spl/spl_array.c:1.4
--- spl/spl_array.c:1.3 Sat May 24 17:02:33 2003
+++ spl/spl_array.c Mon Jun 9 12:58:51 2003
@@ -209,7 +209,7 @@
writer->idx = dim; writer->idx->refcount++;
SELECTIVE_PZVAL_LOCK(*retval, result);
} else {
- zend_error(E_ERROR, "Object must implement spl::array_access
for write access");
+ zend_error(E_ERROR, "Object must implement spl_array_access
for write access");
retval = &EG(error_zval_ptr);
}
SELECTIVE_PZVAL_LOCK(*retval, result);
@@ -282,7 +282,7 @@
if (writer && *writer && Z_TYPE_PP(writer) == IS_OBJECT) {
/* optimization: do pre checks and only test for handlers in case of
- * spl::array_writer_default, for spl::array_writer we must use the
+ * spl_array_writer_default, for spl_array_writer we must use the
* long way of calling spl_instance
* if (spl_is_instance_of(writer, spl_ce_array_writer_default
TSRMLS_CC))
*/
Index: spl/spl_foreach.c
diff -u spl/spl_foreach.c:1.10 spl/spl_foreach.c:1.11
--- spl/spl_foreach.c:1.10 Mon Jun 9 12:57:17 2003
+++ spl/spl_foreach.c Mon Jun 9 12:58:51 2003
@@ -75,7 +75,7 @@
instance_ce = spl_get_class_entry(retval TSRMLS_CC);
is_a = spl_implements(instance_ce);
if (!(is_a & SPL_IS_A_FORWARD)) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Objects created
by new_iterator() must implement spl::forward");
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Objects created
by new_iterator() must implement spl_forward");
ZEND_EXECUTE_HOOK_ORIGINAL(ZEND_FE_RESET);
}
PZVAL_LOCK(retval);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
