X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-psi;a=blobdiff_plain;f=src%2Fcall.c;h=704675c91f444abab532f63f0447fdabfcf68096;hp=6c924c8fa8872e1f475239d1ff74256b1e302287;hb=698841dfdd4d70d24e0b7af25ac7100bc2cb26a4;hpb=53495ef4bd0321f7f92dd05eef8e01b90d7b415a

diff --git a/src/call.c b/src/call.c
index 6c924c8..704675c 100644
--- a/src/call.c
+++ b/src/call.c
@@ -23,14 +23,20 @@
  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 *******************************************************************************/
 
-#include "php_psi_stdinc.h"
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#else
+# include "php_config.h"
+#endif
+
 #include "context.h"
 #include "data.h"
 #include "call.h"
 
+#include "php_psi.h"
+
 #include "php.h"
 #include "zend_exceptions.h"
-#include "ext/spl/spl_exceptions.h"
 
 struct psi_call_frame_argument *psi_call_frame_argument_init(struct psi_impl_arg *spec,
 		impl_val *ival, zval *zptr, int is_vararg) {
@@ -159,9 +165,9 @@ struct psi_call_frame_symbol *psi_call_frame_fetch_symbol(
 		struct psi_call_frame *frame, struct psi_decl_var *dvar) {
 	struct psi_call_frame_symbol *frame_sym;
 
-	frame_sym = zend_hash_str_find_ptr(&frame->symbols, dvar->fqn, strlen(dvar->fqn));
+	frame_sym = zend_hash_find_ptr(&frame->symbols, dvar->fqn);
 	if (!frame_sym) {
-		frame_sym = zend_hash_str_add_ptr(&frame->symbols, dvar->fqn, strlen(dvar->fqn),
+		frame_sym = zend_hash_add_ptr(&frame->symbols, dvar->fqn,
 				psi_call_frame_symbol_init(dvar));
 	}
 	return frame_sym;
@@ -173,17 +179,16 @@ zval *psi_call_frame_new_argument(struct psi_call_frame *frame,
 		/* varargs are just appended with numeric indices */
 		return zend_hash_next_index_insert_ptr(&frame->arguments, frame_arg);
 	} else {
-		return zend_hash_str_add_ptr(&frame->arguments,
-				frame_arg->spec->var->name, strlen(frame_arg->spec->var->name),
-				frame_arg);
+		return zend_hash_add_ptr(&frame->arguments,
+				frame_arg->spec->var->name, frame_arg);
 	}
 }
 
 zval *psi_call_frame_sub_argument(struct psi_call_frame *frame,
-		struct psi_impl_var *inner_var, zval *outer_zval, const char *name) {
+		struct psi_impl_var *inner_var, zval *outer_zval, zend_string *name) {
 	struct psi_call_frame_argument *iarg;
 	zval *inner_zval = zend_symtable_str_find(Z_ARRVAL_P(outer_zval),
-			&inner_var->name[1], strlen(&inner_var->name[1]));
+			&inner_var->name->val[1], inner_var->name->len - 1);
 
 	if (!inner_zval) {
 		zval empty_zval;
@@ -191,7 +196,7 @@ zval *psi_call_frame_sub_argument(struct psi_call_frame *frame,
 		SEPARATE_ZVAL(outer_zval);
 		ZVAL_NULL(&empty_zval);
 		inner_zval = zend_symtable_str_update(Z_ARRVAL_P(outer_zval),
-				&inner_var->name[1], strlen(&inner_var->name[1]),
+				&inner_var->name->val[1], inner_var->name->len - 1,
 				&empty_zval);
 	}
 
@@ -200,21 +205,23 @@ zval *psi_call_frame_sub_argument(struct psi_call_frame *frame,
 	if (!iarg) {
 		struct psi_call_frame_argument *frame_arg;
 		impl_val empty_val = {0};
+		zend_string *type_str = psi_string_init_interned(ZEND_STRL("mixed"), 1);
 		struct psi_impl_arg *carg_spec = psi_impl_arg_init(
-				psi_impl_type_init(PSI_T_MIXED, "mixed"),
+				psi_impl_type_init(PSI_T_MIXED, type_str),
 				psi_impl_var_copy(inner_var), NULL);
 
 		psi_call_frame_push_auto_ex(frame, carg_spec, (void(*)(void*)) psi_impl_arg_free);
 		frame_arg = psi_call_frame_argument_init(carg_spec, &empty_val, inner_zval, 0);
-		zend_hash_str_add_ptr(&frame->arguments, name, strlen(name), frame_arg);
+		zend_hash_add_ptr(&frame->arguments, name, frame_arg);
+		zend_string_release(type_str);
 	}
 
 	return inner_zval;
 }
 
 struct psi_call_frame_argument *psi_call_frame_get_argument(
-		struct psi_call_frame *frame, const char *name) {
-	return zend_hash_str_find_ptr(&frame->arguments, name, strlen(name));
+		struct psi_call_frame *frame, zend_string *name) {
+	return zend_hash_find_ptr(&frame->arguments, name);
 }
 
 size_t psi_call_frame_num_var_args(struct psi_call_frame *frame) {
@@ -250,7 +257,12 @@ struct psi_context *psi_call_frame_get_context(struct psi_call_frame *frame) {
 	return frame->context;
 }
 
-ZEND_RESULT_CODE psi_call_frame_parse_args(struct psi_call_frame *frame,
+#if PHP_VERSION_ID < 70300
+#	define PARAM_PROLOGUE(separate) Z_PARAM_PROLOGUE(separate)
+#else
+#	define PARAM_PROLOGUE(separate) Z_PARAM_PROLOGUE(1, separate)
+#endif
+bool psi_call_frame_parse_args(struct psi_call_frame *frame,
 		zend_execute_data *execute_data) {
 	size_t i, argc = psi_plist_count(frame->impl->func->args);
 	zend_error_handling zeh;
@@ -262,7 +274,7 @@ ZEND_RESULT_CODE psi_call_frame_parse_args(struct psi_call_frame *frame,
 
 		rv = zend_parse_parameters_none();
 		zend_restore_error_handling(&zeh);
-		return rv;
+		return rv == SUCCESS;
 	}
 
 	ZEND_PARSE_PARAMETERS_START(
@@ -300,9 +312,9 @@ ZEND_RESULT_CODE psi_call_frame_parse_args(struct psi_call_frame *frame,
 			Z_PARAM_ARRAY_EX(tmp, _optional || iarg->var->reference,
 					iarg->var->reference);
 		} else if (PSI_T_OBJECT == iarg->type->type) {
-			Z_PARAM_PROLOGUE(iarg->var->reference);
+			PARAM_PROLOGUE(iarg->var->reference);
 		} else if (PSI_T_MIXED == iarg->type->type) {
-			Z_PARAM_PROLOGUE(iarg->var->reference);
+			PARAM_PROLOGUE(iarg->var->reference);
 		} else if (PSI_T_CALLABLE == iarg->type->type) {
 			zend_fcall_info fci;
 			zend_fcall_info_cache fcc;
@@ -328,7 +340,7 @@ ZEND_RESULT_CODE psi_call_frame_parse_args(struct psi_call_frame *frame,
 	}
 	ZEND_PARSE_PARAMETERS_END_EX(
 		zend_restore_error_handling(&zeh);
-		return FAILURE;
+		return false;
 	);
 
 	/* set up defaults */
@@ -343,7 +355,7 @@ ZEND_RESULT_CODE psi_call_frame_parse_args(struct psi_call_frame *frame,
 	}
 
 	zend_restore_error_handling(&zeh);
-	return SUCCESS;
+	return true;
 }
 
 void psi_call_frame_enter(struct psi_call_frame *frame) {
@@ -365,7 +377,7 @@ void psi_call_frame_enter(struct psi_call_frame *frame) {
 	frame->rpointer = rv_sym->ptr = rv_sym->ival_ptr;
 }
 
-ZEND_RESULT_CODE psi_call_frame_do_let(struct psi_call_frame *frame) {
+bool psi_call_frame_do_let(struct psi_call_frame *frame) {
 	size_t i;
 	struct psi_let_stmt *let;
 	struct psi_decl_arg *arg;
@@ -411,27 +423,23 @@ ZEND_RESULT_CODE psi_call_frame_do_let(struct psi_call_frame *frame) {
 		}
 	}
 
-	return SUCCESS;
+	return true;
 }
 
-ZEND_RESULT_CODE psi_call_frame_do_assert(struct psi_call_frame *frame, enum psi_assert_kind kind) {
+bool psi_call_frame_do_assert(struct psi_call_frame *frame, enum psi_assert_kind kind) {
 	size_t i = 0;
 	struct psi_assert_stmt *ass;
 
 	while (psi_plist_get(frame->impl->stmts.ass, i++, &ass)) {
 		if (ass->kind == kind) {
 			if (!psi_assert_stmt_exec(ass, frame)) {
-				char *message = psi_assert_stmt_message(ass);
-				zend_throw_exception(kind == PSI_ASSERT_PRE
-						? spl_ce_InvalidArgumentException
-						: spl_ce_UnexpectedValueException, message, 0);
-				free(message);
-				return FAILURE;
+				psi_assert_stmt_throw(ass);
+				return false;
 			}
 		}
 	}
 
-	return SUCCESS;
+	return true;
 }
 
 void psi_call_frame_do_call(struct psi_call_frame *frame) {
@@ -471,6 +479,7 @@ void psi_call_frame_do_callback(struct psi_call_frame *frame, struct psi_call_fr
 	rc = zend_fcall_info_call(&frame_arg->ival_ptr->zend.cb->fci,
 			&frame_arg->ival_ptr->zend.cb->fcc,	&return_value, NULL);
 	assert(rc == SUCCESS);
+	(void) rc;
 
 	/* marshal return value of the userland call */
 	frame_arg->zval_ptr = &return_value;
@@ -530,8 +539,6 @@ static void psi_call_frame_local_auto_dtor(void *auto_list)
 	efree(auto_list);
 }
 
-#include "php_psi.h"
-
 void psi_call_frame_free(struct psi_call_frame *frame) {
 	zend_hash_destroy(&frame->arguments);
 	zend_hash_destroy(&frame->symbols);
@@ -541,8 +548,7 @@ void psi_call_frame_free(struct psi_call_frame *frame) {
 
 		memcpy(temp, &frame->temp, sizeof(*temp));
 		ZVAL_OBJ(&zlocal, psi_object_init_ex(NULL, temp, psi_call_frame_local_auto_dtor));
-		zend_set_local_var_str(frame->impl->func->name,
-				strlen(frame->impl->func->name), &zlocal, /* force */ 1);
+		zend_set_local_var(frame->impl->func->name, &zlocal, /* force */ 1);
 	} else {
 		zend_llist_destroy(&frame->temp);
 	}