com php-src: Refactor zend_mark_function_as_generator : Zend/zend_compile.c
| From: | Xinchen Hui | Date: | Mon, 19 Oct 2015 13:57:21 +0000 |
| Subject: | com php-src: Refactor zend_mark_function_as_generator : Zend/zend_compile.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-89457@lists.php.net to get a copy of this message | ||
Commit: 43a4336820f429ccbde1b0e036eadd4e1bd702d4
Author: Levi Morrison <levim@php.net> Mon, 19 Oct 2015 01:25:16 -0600
Committer: Xinchen Hui <laruence@gmail.com> Mon, 19 Oct 2015 06:57:21 -0700
Parents: 620daef1e253dc841f5dcb24976e5378c296e8cd
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=43a4336820f429ccbde1b0e036eadd4e1bd702d4
Log:
Refactor zend_mark_function_as_generator
Changed paths:
M Zend/zend_compile.c
Diff:
diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c
index 26655ad..f77d8b6 100644
--- a/Zend/zend_compile.c
+++ b/Zend/zend_compile.c
@@ -1136,19 +1136,19 @@ static void zend_mark_function_as_generator() /* {{{ */
zend_error_noreturn(E_COMPILE_ERROR,
"The \"yield\" expression can only be used inside a function");
}
+
if (CG(active_op_array)->fn_flags & ZEND_ACC_HAS_RETURN_TYPE) {
const char *msg = "Generators may only declare a return type of Generator, Iterator or
Traversable, %s is not permitted";
- if (!CG(active_op_array)->arg_info[-1].class_name) {
- zend_error_noreturn(E_COMPILE_ERROR, msg,
- zend_get_type_by_const(CG(active_op_array)->arg_info[-1].type_hint));
- }
- if (!(ZSTR_LEN(CG(active_op_array)->arg_info[-1].class_name) ==
sizeof("Traversable")-1
- && zend_binary_strcasecmp(ZSTR_VAL(CG(active_op_array)->arg_info[-1].class_name),
sizeof("Traversable")-1, "Traversable", sizeof("Traversable")-1) == 0)
&&
- !(ZSTR_LEN(CG(active_op_array)->arg_info[-1].class_name) == sizeof("Iterator")-1
- && zend_binary_strcasecmp(ZSTR_VAL(CG(active_op_array)->arg_info[-1].class_name),
sizeof("Iterator")-1, "Iterator", sizeof("Iterator")-1) == 0)
&&
- !(ZSTR_LEN(CG(active_op_array)->arg_info[-1].class_name) == sizeof("Generator")-1
- && zend_binary_strcasecmp(ZSTR_VAL(CG(active_op_array)->arg_info[-1].class_name),
sizeof("Generator")-1, "Generator", sizeof("Generator")-1) == 0)) {
- zend_error_noreturn(E_COMPILE_ERROR, msg,
ZSTR_VAL(CG(active_op_array)->arg_info[-1].class_name));
+ zend_arg_info return_info = CG(active_op_array)->arg_info[-1];
+
+ if (!return_info.class_name) {
+ zend_error_noreturn(E_COMPILE_ERROR, msg, zend_get_type_by_const(return_info.type_hint));
+ }
+
+ if (!zend_string_equals_literal_ci(return_info.class_name, "Traversable")
+ && !zend_string_equals_literal_ci(return_info.class_name, "Iterator")
+ && !zend_string_equals_literal_ci(return_info.class_name, "Generator")) {
+ zend_error_noreturn(E_COMPILE_ERROR, msg, ZSTR_VAL(return_info.class_name));
}
}