X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-psi;a=blobdiff_plain;f=src%2Fmarshal.c;h=9804fe09ffb7a6b5162dfb3df4e553198530e8fb;hp=c7651f6c023243b1b0c4de855aebd921713291d7;hb=2fa436074ca9a5e87f39b696de832fa2188fcfc6;hpb=d57dd73ddbd960613cfc06bc4c9473b71d3598ef

diff --git a/src/marshal.c b/src/marshal.c
index c7651f6..9804fe0 100644
--- a/src/marshal.c
+++ b/src/marshal.c
@@ -112,7 +112,7 @@ zend_internal_arg_info *psi_internal_arginfo(struct psi_impl *impl)
 		struct psi_impl_arg *vararg = impl->func->vararg;
 		zend_internal_arg_info *ai = &aip[argc];
 
-		ai->name = vararg->var->name;
+		ai->name = vararg->var->name->val;
 #ifdef ZEND_TYPE_ENCODE
 		ai->type = ZEND_TYPE_ENCODE(psi_internal_type(vararg->type), 1);
 #else
@@ -128,7 +128,7 @@ zend_internal_arg_info *psi_internal_arginfo(struct psi_impl *impl)
 	while (psi_plist_get(impl->func->args, i++, &iarg)) {
 		zend_internal_arg_info *ai = &aip[i];
 
-		ai->name = iarg->var->name;
+		ai->name = iarg->var->name->val;
 #ifdef ZEND_TYPE_ENCODE
 		ai->type = ZEND_TYPE_ENCODE(psi_internal_type(iarg->type), 1);
 #else
@@ -732,7 +732,7 @@ void psi_set_to_array(zval *return_value, struct psi_set_exp *set, impl_val *r_v
 
 		ZVAL_NULL(&ele);
 		psi_set_exp_exec_ex(sub_exp, &ele, sym->ptr, frame);
-		add_assoc_zval(return_value, ivar->name + 1, &ele);
+		add_assoc_zval(return_value, ivar->name->val + 1, &ele);
 	}
 }