X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-psi;a=blobdiff_plain;f=src%2Fmarshal.c;h=a900430664c374a0646652adb2d3b47ccfc7ea12;hp=87abf98444948801ab8e25cb405ba12927afe38c;hb=a13e1b24ca0efe550f3b04ff27cf6ff12233412e;hpb=9bcb1df0786a8193d65949c857baaba2f4296e84

diff --git a/src/marshal.c b/src/marshal.c
index 87abf98..a900430 100644
--- a/src/marshal.c
+++ b/src/marshal.c
@@ -99,18 +99,26 @@ zend_internal_arg_info *psi_internal_arginfo(struct psi_impl *impl)
 	aip = calloc(argc + 1 + !!impl->func->vararg, sizeof(*aip));
 
 	fi = (zend_internal_function_info *) &aip[0];
+#ifdef ZEND_TYPE_ENCODE
+	fi->type = ZEND_TYPE_ENCODE(psi_internal_type(impl->func->return_type), 1);
+#else
 	fi->allow_null = 1;
+	fi->type_hint = psi_internal_type(impl->func->return_type);
+#endif
 	fi->required_num_args = psi_impl_num_min_args(impl);
 	fi->return_reference = impl->func->return_reference;
-	fi->type_hint = psi_internal_type(impl->func->return_type);
 
 	if (impl->func->vararg) {
 		struct psi_impl_arg *vararg = impl->func->vararg;
 		zend_internal_arg_info *ai = &aip[argc];
 
 		ai->name = vararg->var->name;
+#ifdef ZEND_TYPE_ENCODE
+		ai->type = ZEND_TYPE_ENCODE(psi_internal_type(vararg->type), 1);
+#else
 		ai->allow_null = 1;
 		ai->type_hint = psi_internal_type(vararg->type);
+#endif
 		if (vararg->var->reference) {
 			ai->pass_by_reference = 1;
 		}
@@ -121,12 +129,15 @@ zend_internal_arg_info *psi_internal_arginfo(struct psi_impl *impl)
 		zend_internal_arg_info *ai = &aip[i];
 
 		ai->name = iarg->var->name;
+#ifdef ZEND_TYPE_ENCODE
+		ai->type = ZEND_TYPE_ENCODE(psi_internal_type(iarg->type), 1);
+#else
+		ai->allow_null = 1;
 		ai->type_hint = psi_internal_type(iarg->type);
+#endif
 		if (iarg->var->reference) {
 			ai->pass_by_reference = 1;
 		}
-		/* FIXME: if (iarg->var->reference || (iarg->def && iarg->def->type == PSI_T_NULL)) */
-		ai->allow_null = 1;
 	}
 
 	return aip;
@@ -143,7 +154,7 @@ void psi_set_void(zval *return_value, struct psi_set_exp *set, impl_val *ret_val
 /*
  * ?
  */
-impl_val *psi_let_void(impl_val *tmp, struct psi_decl_type *spec, token_t impl_type, impl_val *ival, zval *zvalue, void **to_free)
+impl_val *psi_let_void(impl_val *tmp, struct psi_decl_arg *spec, token_t impl_type, impl_val *ival, zval *zvalue, void **to_free)
 {
 	return tmp;
 }
@@ -158,7 +169,7 @@ void psi_set_zval(zval *return_value, struct psi_set_exp *set, impl_val *ret_val
 /*
  * let dvar = zval($ivar)
  */
-impl_val *psi_let_zval(impl_val *tmp, struct psi_decl_type *spec, token_t impl_type, impl_val *ival, zval *zvalue, void **to_free)
+impl_val *psi_let_zval(impl_val *tmp, struct psi_decl_arg *spec, token_t impl_type, impl_val *ival, zval *zvalue, void **to_free)
 {
 	*to_free = tmp->ptr = emalloc(sizeof(zval));
 	ZVAL_COPY_VALUE(tmp->ptr, zvalue);
@@ -197,10 +208,10 @@ static inline impl_val *psi_val_boolval(impl_val *tmp, token_t real_type, zend_b
 /*
  * let dvar = boolval($ivar)
  */
-impl_val *psi_let_boolval(impl_val *tmp, struct psi_decl_type *spec, token_t impl_type, impl_val *ival, zval *zvalue, void **to_free)
+impl_val *psi_let_boolval(impl_val *tmp, struct psi_decl_arg *spec, token_t impl_type, impl_val *ival, zval *zvalue, void **to_free)
 {
 	zend_bool boolval;
-	token_t real_type = spec ? psi_decl_type_get_real(spec)->type : PSI_T_UINT8;
+	token_t real_type = spec ? psi_decl_type_get_real(spec->type)->type : PSI_T_UINT8;
 
 	if (ival && impl_type == PSI_T_BOOL) {
 		boolval = ival->zend.bval;
@@ -237,15 +248,22 @@ void psi_set_to_int(zval *return_value, struct psi_set_exp *set, impl_val *ret_v
 	case PSI_T_UINT32:		RETVAL_LONG(v->u32);				break;
 	case PSI_T_INT64:		RETVAL_LONG(v->i64);				break;
 	case PSI_T_UINT64:		RETVAL_LONG_U64(v->u64);			break;
-	case PSI_T_FLOAT:		RETVAL_DOUBLE((double) v->fval);	break;
-	case PSI_T_DOUBLE:		RETVAL_DOUBLE(v->dval);				break;
+	case PSI_T_FLOAT:
+		RETVAL_DOUBLE((double) v->fval);
+		convert_to_long(return_value);
+		break;
+	case PSI_T_DOUBLE:
+		RETVAL_DOUBLE(v->dval);
+		convert_to_long(return_value);
+		break;
 #ifdef HAVE_LONG_DOUBLE
-	case PSI_T_LONG_DOUBLE:	RETVAL_DOUBLE((double) v->ldval);	break;
+	case PSI_T_LONG_DOUBLE:
+		RETVAL_DOUBLE((double) v->ldval);
+		convert_to_long(return_value);
+		break;
 #endif
 	EMPTY_SWITCH_DEFAULT_CASE();
 	}
-
-	convert_to_long(return_value);
 }
 
 static inline impl_val *psi_val_intval(impl_val *tmp, token_t real_type, zend_long intval) {
@@ -259,6 +277,7 @@ static inline impl_val *psi_val_intval(impl_val *tmp, token_t real_type, zend_lo
 	case PSI_T_INT64:		tmp->i64 = intval;		break;
 	case PSI_T_UINT64:		tmp->u64 = intval;		break;
 	case PSI_T_INT:			tmp->ival = intval;		break;
+	case PSI_T_ENUM:
 	case PSI_T_LONG:		tmp->lval = intval;		break;
 	case PSI_T_FLOAT:		tmp->fval = intval;		break;
 	case PSI_T_DOUBLE:		tmp->dval = intval;		break;
@@ -274,10 +293,10 @@ static inline impl_val *psi_val_intval(impl_val *tmp, token_t real_type, zend_lo
 /*
  * let dvar = intval($ivar)
  */
-impl_val *psi_let_intval(impl_val *tmp, struct psi_decl_type *spec, token_t impl_type, impl_val *ival, zval *zvalue, void **to_free)
+impl_val *psi_let_intval(impl_val *tmp, struct psi_decl_arg *spec, token_t impl_type, impl_val *ival, zval *zvalue, void **to_free)
 {
 	zend_long intval;
-	token_t real_type = spec ? psi_decl_type_get_real(spec)->type : PSI_T_LONG;
+	token_t real_type = spec ? psi_decl_type_get_real(spec->type)->type : PSI_T_LONG;
 
 	if (ival && impl_type == PSI_T_INT) {
 		intval = ival->zend.lval;
@@ -339,10 +358,10 @@ static inline impl_val *psi_val_floatval(impl_val *tmp, token_t real_type, doubl
 /*
  * let dvar = floatval($ivar)
  */
-impl_val *psi_let_floatval(impl_val *tmp, struct psi_decl_type *spec, token_t impl_type, impl_val *ival, zval *zvalue, void **to_free)
+impl_val *psi_let_floatval(impl_val *tmp, struct psi_decl_arg *spec, token_t impl_type, impl_val *ival, zval *zvalue, void **to_free)
 {
 	double floatval;
-	token_t real_type = spec ? psi_decl_type_get_real(spec)->type : PSI_T_DOUBLE;
+	token_t real_type = spec ? psi_decl_type_get_real(spec->type)->type : PSI_T_DOUBLE;
 
 	if (ival && (impl_type == PSI_T_FLOAT || impl_type == PSI_T_DOUBLE)) {
 		floatval = ival->dval;
@@ -387,7 +406,7 @@ void psi_set_to_stringl(zval *return_value, struct psi_set_exp *set, impl_val *r
 		struct psi_set_exp *sub_exp;
 
 		psi_plist_get(set->inner, 0, &sub_exp);
-		RETVAL_STRINGL(str, psi_long_num_exp(sub_exp->data.num, frame));
+		RETVAL_STRINGL(str, psi_long_num_exp(sub_exp->data.num, frame, NULL));
 	} else {
 		RETVAL_EMPTY_STRING();
 	}
@@ -396,7 +415,7 @@ void psi_set_to_stringl(zval *return_value, struct psi_set_exp *set, impl_val *r
 /*
  * let dvar = strval($ivar)
  */
-impl_val *psi_let_strval(impl_val *tmp, struct psi_decl_type *spec, token_t impl_type, impl_val *ival, zval *zvalue, void **to_free)
+impl_val *psi_let_strval(impl_val *tmp, struct psi_decl_arg *spec, token_t impl_type, impl_val *ival, zval *zvalue, void **to_free)
 {
 	if (ival && impl_type == PSI_T_STRING) {
 		if (ival->zend.str) {
@@ -404,8 +423,6 @@ impl_val *psi_let_strval(impl_val *tmp, struct psi_decl_type *spec, token_t impl
 		} else {
 			tmp->ptr = "";
 		}
-	} else if (0 && Z_TYPE_P(zvalue) == IS_STRING) {
-		tmp->ptr = Z_STRVAL_P(zvalue);
 	} else {
 		zend_string *zs = zval_get_string(zvalue);
 		tmp->ptr = estrdup(zs->val);
@@ -419,7 +436,7 @@ impl_val *psi_let_strval(impl_val *tmp, struct psi_decl_type *spec, token_t impl
 /*
  * let dvar = pathval($ivar)
  */
-impl_val *psi_let_pathval(impl_val *tmp, struct psi_decl_type *spec, token_t impl_type, impl_val *ival, zval *zvalue, void **to_free)
+impl_val *psi_let_pathval(impl_val *tmp, struct psi_decl_arg *spec, token_t impl_type, impl_val *ival, zval *zvalue, void **to_free)
 {
 	tmp = psi_let_strval(tmp, spec, impl_type, ival, zvalue, to_free);
 	if (SUCCESS != php_check_open_basedir(tmp->ptr)) {
@@ -433,7 +450,7 @@ impl_val *psi_let_pathval(impl_val *tmp, struct psi_decl_type *spec, token_t imp
 /*
  * let dvar = strlen($ivar)
  */
-impl_val *psi_let_strlen(impl_val *tmp, struct psi_decl_type *spec, token_t impl_type, impl_val *ival, zval *zvalue, void **to_free)
+impl_val *psi_let_strlen(impl_val *tmp, struct psi_decl_arg *spec, token_t impl_type, impl_val *ival, zval *zvalue, void **to_free)
 {
 	if (ival && impl_type == PSI_T_STRING) {
 		if (ival->zend.str) {
@@ -450,12 +467,14 @@ impl_val *psi_let_strlen(impl_val *tmp, struct psi_decl_type *spec, token_t impl
 	return tmp;
 }
 
+#if 0
 static impl_val *iterate(impl_val *val, size_t size, unsigned i, impl_val *tmp)
 {
 	memset(tmp, 0, sizeof(*tmp));
 	memcpy(tmp, ((char *) val) + size * i, size);
 	return tmp;
 }
+#endif
 
 /*
  * set $ivar = to_array(dvar,
@@ -519,7 +538,7 @@ void psi_set_to_array_counted(zval *return_value, struct psi_set_exp *set, impl_
 	}
 
 	psi_plist_get(set->inner, 0, &sub_exp);
-	count = psi_long_num_exp(sub_exp->data.num, frame);
+	count = psi_long_num_exp(sub_exp->data.num, frame, NULL);
 	psi_plist_get(set->inner, 1, &sub_exp);
 
 	for (ptr = (char *) ret_val; 0 < count--; ptr += size) {
@@ -569,49 +588,12 @@ void psi_set_to_array(zval *return_value, struct psi_set_exp *set, impl_val *r_v
 	}
 }
 
-//impl_val *psi_let_arrval(impl_val *tmp, decl_type *spec, decl_var *spec_var, token_t impl_type, impl_val *ival, zval *zvalue, void **to_free)
-//{
-//	decl_type *real = real_decl_type(spec);
-//	HashTable *arr;
-//	zval *zv;
-//	size_t i, sz;
-//	decl_arg tmp_arg = {0};
-//
-//	if (impl_type != PSI_T_ARRAY) {
-//		SEPARATE_ARG_IF_REF(zvalue);
-//		convert_to_array(zvalue);
-//	}
-//	arr = HASH_OF(zvalue);
-//
-//	switch (real->type) {
-//	case PSI_T_STRUCT:
-//		*to_free = tmp = psi_array_to_struct(real->real.strct, arr);
-//		break;
-//	case PSI_T_UNION:
-//		*to_free = tmp = psi_array_to_union(real->real.unn, arr);
-//		break;
-//	default:
-//		sz = psi_t_size(real->type);
-//		tmp = *to_free = ecalloc(zend_hash_num_elements(arr), sz);
-//		tmp_arg.type = spec;
-//		tmp_arg.var = spec_var;
-//		ZEND_HASH_FOREACH_VAL_IND(arr, zv)
-//		{
-//			void *ptr = ((char *) tmp) + (i++ * sz);
-//			psi_from_zval_ex(NULL, (impl_val **) &ptr, &tmp_arg, 0, zv, NULL);
-//		}
-//		ZEND_HASH_FOREACH_END();
-//	}
-//
-//	return tmp;
-//}
-
 /*
  * let dvar = count($ivar)
  */
-impl_val *psi_let_count(impl_val *tmp, struct psi_decl_type *spec, token_t impl_type, impl_val *ival, zval *zvalue, void **to_free)
+impl_val *psi_let_count(impl_val *tmp, struct psi_decl_arg *spec, token_t impl_type, impl_val *ival, zval *zvalue, void **to_free)
 {
-	return psi_val_intval(tmp, psi_decl_type_get_real(spec)->type, psi_zval_count(zvalue));
+	return psi_val_intval(tmp, psi_decl_type_get_real(spec->type)->type, psi_zval_count(zvalue));
 }
 
 /*
@@ -633,7 +615,7 @@ void psi_set_to_object(zval *return_value, struct psi_set_exp *set, impl_val *r_
 /*
  * let dvar = objval($ivar)
  */
-impl_val *psi_let_objval(impl_val *tmp, struct psi_decl_type *spec, token_t impl_type, impl_val *ival, zval *zvalue, void **to_free)
+impl_val *psi_let_objval(impl_val *tmp, struct psi_decl_arg *spec, token_t impl_type, impl_val *ival, zval *zvalue, void **to_free)
 {
 	psi_object *obj;