Skip to content

Minor cleanup of some unused code in SPL #5430

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 3 commits into from
Closed

Minor cleanup of some unused code in SPL #5430

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ba1a50a
Remove code duplication in spl_pqueue_get_iterator
alexdowad May 12, 2020
f37e8bc
SplPriorityQueue uses iteration flags in iterator struct
alexdowad May 12, 2020
aa20b7d
Remove useless prototype for spl_heap_get_iterator
alexdowad May 12, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 12 additions & 34 deletions ext/spl/spl_heap.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,22 +62,18 @@ typedef struct _spl_ptr_heap {
size_t elem_size;
} spl_ptr_heap;

typedef struct _spl_heap_object spl_heap_object;
typedef struct _spl_heap_it spl_heap_it;

struct _spl_heap_object {
typedef struct _spl_heap_object {
spl_ptr_heap *heap;
int flags;
zend_function *fptr_cmp;
zend_function *fptr_count;
zend_object std;
};
} spl_heap_object;

/* define an overloaded iterator structure */
struct _spl_heap_it {
typedef struct _spl_heap_it {
zend_user_iterator intern;
int flags;
};
} spl_heap_it;

typedef struct _spl_pqueue_elem {
zval data;
Expand Down Expand Up @@ -371,8 +367,6 @@ static int spl_ptr_heap_count(spl_ptr_heap *heap) { /* {{{ */
}
/* }}} */

zend_object_iterator *spl_heap_get_iterator(zend_class_entry *ce, zval *object, int by_ref);

static void spl_heap_object_free_storage(zend_object *object) /* {{{ */
{
spl_heap_object *intern = spl_heap_from_obj(object);
Expand Down Expand Up @@ -905,7 +899,7 @@ static zval *spl_heap_it_get_current_data(zend_object_iterator *iter) /* {{{ */

static zval *spl_pqueue_it_get_current_data(zend_object_iterator *iter) /* {{{ */
{
zend_user_iterator *user_it = (zend_user_iterator *) iter;
spl_heap_it *it = (spl_heap_it*)iter;
spl_heap_object *object = Z_SPLHEAP_P(&iter->data);

if (object->heap->flags & SPL_HEAP_CORRUPTED) {
Expand All @@ -917,11 +911,11 @@ static zval *spl_pqueue_it_get_current_data(zend_object_iterator *iter) /* {{{ *
return NULL;
}

if (Z_ISUNDEF(user_it->value)) {
if (Z_ISUNDEF(it->intern.value)) {
spl_pqueue_elem *elem = spl_heap_elem(object->heap, 0);
spl_pqueue_extract_helper(&user_it->value, elem, object->flags);
spl_pqueue_extract_helper(&it->intern.value, elem, it->flags);
}
return &user_it->value;
return &it->intern.value;
}
/* }}} */

Expand Down Expand Up @@ -1106,27 +1100,11 @@ zend_object_iterator *spl_heap_get_iterator(zend_class_entry *ce, zval *object,

zend_object_iterator *spl_pqueue_get_iterator(zend_class_entry *ce, zval *object, int by_ref) /* {{{ */
{
spl_heap_it *iterator;
spl_heap_object *heap_object = Z_SPLHEAP_P(object);

if (by_ref) {
zend_throw_exception(spl_ce_RuntimeException, "An iterator cannot be used with foreach by reference", 0);
return NULL;
zend_object_iterator *iterator = spl_heap_get_iterator(ce, object, by_ref);
if (iterator != NULL) {
iterator->funcs = &spl_pqueue_it_funcs;
}

iterator = emalloc(sizeof(spl_heap_it));

zend_iterator_init((zend_object_iterator*)iterator);

Z_ADDREF_P(object);
ZVAL_OBJ(&iterator->intern.it.data, Z_OBJ_P(object));
iterator->intern.it.funcs = &spl_pqueue_it_funcs;
iterator->intern.ce = ce;
iterator->flags = heap_object->flags;

ZVAL_UNDEF(&iterator->intern.value);

return &iterator->intern.it;
return iterator;
}
/* }}} */

Expand Down
21 changes: 21 additions & 0 deletions ext/spl/tests/SplPriorityQueue_consistent_extract_flags.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
--TEST--
Type of values yielded by SplPriorityQueue to 'foreach' loop do not change partway
--FILE--
<?php

$q = new SplPriorityQueue();
$q->insert('a', 10);
$q->insert('b', 20);
$q->insert('c', 30);

$q->setExtractFlags(SplPriorityQueue::EXTR_DATA);
foreach ($q as $item) {
$q->setExtractFlags(SplPriorityQueue::EXTR_BOTH);
echo $item, "\n";
}

?>
--EXPECT--
c
b
a