com php-src: Make generator functions return a Generator object: Zend/tests/generators/generator_returns_generator.phpt Zend/zend_execute.c
Zend/zend_vm_def.h Zend/zend _vm_execute.h
| From: | Gustavo André dos Santos Lopes | Date: | Sun, 20 May 2012 12:45:01 +0000 |
| Subject: | com php-src: Make generator functions return a Generator object: Zend/tests/generators/generator_returns_generator.phpt Zend/zend_execute.c Zend/zend_vm_def.h Zend/zend _vm_execute.h |
||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-70082@lists.php.net to get a copy of this message | ||
Commit: 46fa26ab853b766c9222e49dbe7555de360b42f4
Author: Nikita Popov <nikic@php.net> Sun, 20 May 2012 14:45:01 +0200
Parents: 40b7533576b4f2ec4ba872d027179d92db71d844
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=46fa26ab853b766c9222e49dbe7555de360b42f4
Log:
Make generator functions return a Generator object
Right now generator functions simply immediately return a new Generator
object (no suspension yet).
Changed paths:
A Zend/tests/generators/generator_returns_generator.phpt
M Zend/zend_execute.c
M Zend/zend_vm_def.h
M Zend/zend_vm_execute.h
Diff:
diff --git a/Zend/tests/generators/generator_returns_generator.phpt
b/Zend/tests/generators/generator_returns_generator.phpt
new file mode 100644
index 0000000..a3e2b29
--- /dev/null
+++ b/Zend/tests/generators/generator_returns_generator.phpt
@@ -0,0 +1,16 @@
+--TEST--
+A generator function returns a Generator object
+--FILE--
+<?php
+
+function* foo() {
+ // execution is suspended here, so the following never gets run:
+ echo "Foo";
+}
+
+$generator = foo();
+var_dump($generator instanceof Generator);
+
+?>
+--EXPECT--
+bool(true)
diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c
index d72fc73..d82abfc 100644
--- a/Zend/zend_execute.c
+++ b/Zend/zend_execute.c
@@ -35,6 +35,7 @@
#include "zend_exceptions.h"
#include "zend_interfaces.h"
#include "zend_closures.h"
+#include "zend_generators.h"
#include "zend_vm.h"
#include "zend_dtrace.h"
diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h
index 9dc7e08..13ae824 100644
--- a/Zend/zend_vm_def.h
+++ b/Zend/zend_vm_def.h
@@ -5197,9 +5197,17 @@ ZEND_VM_HANDLER(156, ZEND_SEPARATE, VAR, UNUSED)
ZEND_VM_HANDLER(159, ZEND_SUSPEND_AND_RETURN_GENERATOR, ANY, ANY)
{
- /* do nothing for now */
+ if (EG(return_value_ptr_ptr)) {
+ zval *return_value;
- ZEND_VM_NEXT_OPCODE();
+ ALLOC_INIT_ZVAL(return_value);
+ object_init_ex(return_value, zend_ce_generator);
+
+ *EG(return_value_ptr_ptr) = return_value;
+ }
+
+ /* for now we just do a normal return without suspension */
+ ZEND_VM_DISPATCH_TO_HELPER(zend_leave_helper);
}
ZEND_VM_EXPORT_HELPER(zend_do_fcall, zend_do_fcall_common_helper)
diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h
index c6c3af6..1233811 100644
--- a/Zend/zend_vm_execute.h
+++ b/Zend/zend_vm_execute.h
@@ -1154,9 +1154,17 @@ static int ZEND_FASTCALL
ZEND_USER_OPCODE_SPEC_HANDLER(ZEND_OPCODE_HANDLER_ARGS
static int ZEND_FASTCALL ZEND_SUSPEND_AND_RETURN_GENERATOR_SPEC_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
{
- /* do nothing for now */
+ if (EG(return_value_ptr_ptr)) {
+ zval *return_value;
- ZEND_VM_NEXT_OPCODE();
+ ALLOC_INIT_ZVAL(return_value);
+ object_init_ex(return_value, zend_ce_generator);
+
+ *EG(return_value_ptr_ptr) = return_value;
+ }
+
+ /* for now we just do a normal return without suspension */
+ return zend_leave_helper_SPEC(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
}
static int ZEND_FASTCALL ZEND_FETCH_CLASS_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)