archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 14:08:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Add way to pass generator object to opcode handlers

Browse source 
The generator zval is put into the return_value_ptr_ptr.
This commit is contained in:
Nikita Popov 2012-05-26 19:40:29 +02:00
parent f627be5254
commit 1a99d1c887
1 changed files with 28 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

41
Zend/zend_generators.c
View file

@ -86,17 +86,23 @@ static zend_function *zend_generator_get_constructor(zval *object TSRMLS_DC) /*
} }
/* }}} */ /* }}} */
static void zend_generator_resume(zend_generator *generator TSRMLS_DC) /* {{{ */ static void zend_generator_resume(zval *object, zend_generator *generator TSRMLS_DC) /* {{{ */
{ {
/* Go to next opcode (we don't want to run the last one again) */
generator->execute_data->opline++; generator->execute_data->opline++;
/* We (mis) use the return_value_ptr_ptr to provide the generator object
* to the executor. This way YIELD will be able to set the yielded value */
EG(return_value_ptr_ptr) = &object;
execute_ex(generator->execute_data TSRMLS_CC); execute_ex(generator->execute_data TSRMLS_CC);
} }
/* }}} */ /* }}} */
static void zend_generator_ensure_initialized(zend_generator *generator TSRMLS_DC) /* {{{ */ static void zend_generator_ensure_initialized(zval *object, zend_generator *generator TSRMLS_DC) /* {{{ */
{ {
if (!generator->value) { if (!generator->value) {
zend_generator_resume(generator TSRMLS_CC); zend_generator_resume(object, generator TSRMLS_CC);
} }
} }
/* }}} */ /* }}} */
@ -105,15 +111,17 @@ static void zend_generator_ensure_initialized(zend_generator *generator TSRMLS_D
* Rewind the generator */ * Rewind the generator */
ZEND_METHOD(Generator, rewind) ZEND_METHOD(Generator, rewind)
{ {
zval *object;
zend_generator *generator; zend_generator *generator;
if (zend_parse_parameters_none() == FAILURE) { if (zend_parse_parameters_none() == FAILURE) {
return; return;
} }
generator = (zend_generator *) zend_object_store_get_object(getThis() TSRMLS_CC); object = getThis();
generator = (zend_generator *) zend_object_store_get_object(object TSRMLS_CC);
zend_generator_ensure_initialized(generator TSRMLS_CC); zend_generator_ensure_initialized(object, generator TSRMLS_CC);
} }
/* }}} */ /* }}} */
@ -121,15 +129,17 @@ ZEND_METHOD(Generator, rewind)
* Check whether the generator is valid */ * Check whether the generator is valid */
ZEND_METHOD(Generator, valid) ZEND_METHOD(Generator, valid)
{ {
zval *object;
zend_generator *generator; zend_generator *generator;
if (zend_parse_parameters_none() == FAILURE) { if (zend_parse_parameters_none() == FAILURE) {
return; return;
} }
generator = (zend_generator *) zend_object_store_get_object(getThis() TSRMLS_CC); object = getThis();
generator = (zend_generator *) zend_object_store_get_object(object TSRMLS_CC);
zend_generator_ensure_initialized(generator TSRMLS_CC); zend_generator_ensure_initialized(object, generator TSRMLS_CC);
} }
/* }}} */ /* }}} */
@ -137,15 +147,17 @@ ZEND_METHOD(Generator, valid)
* Get the current value */ * Get the current value */
ZEND_METHOD(Generator, current) ZEND_METHOD(Generator, current)
{ {
zval *object;
zend_generator *generator; zend_generator *generator;
if (zend_parse_parameters_none() == FAILURE) { if (zend_parse_parameters_none() == FAILURE) {
return; return;
} }
generator = (zend_generator *) zend_object_store_get_object(getThis() TSRMLS_CC); object = getThis();
generator = (zend_generator *) zend_object_store_get_object(object TSRMLS_CC);
zend_generator_ensure_initialized(generator TSRMLS_CC); zend_generator_ensure_initialized(object, generator TSRMLS_CC);
} }
/* }}} */ /* }}} */
@ -153,15 +165,17 @@ ZEND_METHOD(Generator, current)
* Get the current key */ * Get the current key */
ZEND_METHOD(Generator, key) ZEND_METHOD(Generator, key)
{ {
zval *object;
zend_generator *generator; zend_generator *generator;
if (zend_parse_parameters_none() == FAILURE) { if (zend_parse_parameters_none() == FAILURE) {
return; return;
} }
generator = (zend_generator *) zend_object_store_get_object(getThis() TSRMLS_CC); object = getThis();
generator = (zend_generator *) zend_object_store_get_object(object TSRMLS_CC);
zend_generator_ensure_initialized(generator TSRMLS_CC); zend_generator_ensure_initialized(object, generator TSRMLS_CC);
} }
/* }}} */ /* }}} */
@ -169,15 +183,16 @@ ZEND_METHOD(Generator, key)
* Advances the generator */ * Advances the generator */
ZEND_METHOD(Generator, next) ZEND_METHOD(Generator, next)
{ {
zval *object;
zend_generator *generator; zend_generator *generator;
if (zend_parse_parameters_none() == FAILURE) { if (zend_parse_parameters_none() == FAILURE) {
return; return;
} }
generator = (zend_generator *) zend_object_store_get_object(getThis() TSRMLS_CC); generator = (zend_generator *) zend_object_store_get_object(object TSRMLS_CC);
zend_generator_ensure_initialized(generator TSRMLS_CC); zend_generator_ensure_initialized(object, generator TSRMLS_CC);
} }
/* }}} */ /* }}} */