X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-psi;a=blobdiff_plain;f=src%2Fmodule.c;h=628694b44840f6b4c4c54ee43389fe50fac77cf4;hp=166596434ae8a4447bcebcf362c8e5d5b85751e8;hb=469fe3395cb9696e32bcd64639f22113d8fb2ec6;hpb=633acd548ce5da37812bca7119e57c8f56e974e2

diff --git a/src/module.c b/src/module.c
index 1665964..628694b 100644
--- a/src/module.c
+++ b/src/module.c
@@ -38,7 +38,6 @@ int psi_internal_type(impl_type *type)
 	case PSI_T_BOOL:
 		return _IS_BOOL;
 	case PSI_T_INT:
-	case PSI_T_LONG:
 		return IS_LONG;
 	case PSI_T_FLOAT:
 	case PSI_T_DOUBLE:
@@ -94,31 +93,47 @@ size_t psi_num_min_args(impl *impl)
 	return n;
 }
 
-void psi_to_int(impl_val *ret_val, decl_arg *func, zval *return_value)
+void psi_to_int(zval *return_value, token_t t, impl_val *ret_val, decl_var *var)
 {
-	switch (real_decl_type(func->type)->type) {
+	switch (t) {
 	case PSI_T_FLOAT:
+		RETVAL_DOUBLE((double) deref_impl_val(ret_val, var)->fval);
+		convert_to_long(return_value);
+		break;
 	case PSI_T_DOUBLE:
-		RETVAL_DOUBLE(deref_impl_val(0, ret_val, func)->dval);
+		RETVAL_DOUBLE(deref_impl_val(ret_val, var)->dval);
 		convert_to_long(return_value);
 		break;
 	default:
-		RETVAL_LONG(deref_impl_val(0, ret_val, func)->lval);
+		RETVAL_LONG(deref_impl_val(ret_val, var)->lval);
 	}
 }
 
-void psi_to_string(impl_val *ret_val, decl_arg *func, zval *return_value)
+void psi_to_double(zval *return_value, token_t t, impl_val *ret_val, decl_var *var)
 {
-	switch (real_decl_type(func->type)->type) {
-	case PSI_T_CHAR:
-	case PSI_T_SINT8:
+	switch (t) {
+	case PSI_T_FLOAT:
+		RETVAL_DOUBLE((double) deref_impl_val(ret_val, var)->fval);
+		break;
+	case PSI_T_DOUBLE:
+		RETVAL_DOUBLE(deref_impl_val(ret_val, var)->dval);
+		break;
+	default:
+		RETVAL_DOUBLE((double) deref_impl_val(ret_val, var)->lval);
+		break;
+	}
+}
+
+void psi_to_string(zval *return_value, token_t t, impl_val *ret_val, decl_var *var)
+{
+	switch (t) {
+	case PSI_T_INT8:
 	case PSI_T_UINT8:
-		if (!func->var->pointer_level) {
-			char chr = ret_val->lval;
-			RETVAL_STRINGL(&chr, 1);
+		if (!var->arg->var->pointer_level) {
+			RETVAL_STRINGL(&ret_val->cval, 1);
 		} else {
-			ret_val = deref_impl_val(1, ret_val, func);
-			if (ret_val->ptr) {
+			ret_val = deref_impl_val(ret_val, var);
+			if (ret_val && ret_val->ptr) {
 				RETVAL_STRING(ret_val->ptr);
 			} else {
 				RETVAL_EMPTY_STRING();
@@ -126,17 +141,253 @@ void psi_to_string(impl_val *ret_val, decl_arg *func, zval *return_value)
 		}
 		break;
 	case PSI_T_FLOAT:
+		RETVAL_DOUBLE((double) deref_impl_val(ret_val, var)->fval);
+		convert_to_string(return_value);
+		break;
 	case PSI_T_DOUBLE:
-		RETVAL_DOUBLE(deref_impl_val(0, ret_val, func)->dval);
+		RETVAL_DOUBLE(deref_impl_val(ret_val, var)->dval);
 		convert_to_string(return_value);
 		break;
 	default:
-		RETVAL_LONG(deref_impl_val(0, ret_val, func)->lval);
+		RETVAL_LONG(deref_impl_val(ret_val, var)->lval);
 		convert_to_string(return_value);
 		break;
 	}
 }
 
+size_t psi_t_alignment(token_t t)
+{
+	size_t align;
+#define PSI_TAS_D(T) struct PSI_TAS_ ##T { \
+	char c; \
+	T x; \
+}
+#define PSI_TAS_P(T) struct PSI_TAS_ ## T ## _pointer { \
+	char c; \
+	T *x; \
+}
+#define PSI_TAS_C(T) align = offsetof(struct PSI_TAS_ ##T, x)
+#define PSI_TAS_CASE(T) { \
+	PSI_TAS_D(T); \
+	PSI_TAS_C(T); \
+}
+	switch (t) {
+	case PSI_T_INT8:
+		PSI_TAS_CASE(int8_t);
+		break;
+	case PSI_T_UINT8:
+		PSI_TAS_CASE(uint8_t);
+		break;
+	case PSI_T_INT16:
+		PSI_TAS_CASE(int16_t);
+		break;
+	case PSI_T_UINT16:
+		PSI_TAS_CASE(uint16_t);
+		break;
+	case PSI_T_INT32:
+		PSI_TAS_CASE(int32_t);
+		break;
+	case PSI_T_UINT32:
+		PSI_TAS_CASE(uint32_t);
+		break;
+	case PSI_T_INT64:
+		PSI_TAS_CASE(int64_t);
+		break;
+	case PSI_T_UINT64:
+		PSI_TAS_CASE(uint64_t);
+		break;
+	case PSI_T_FLOAT:
+		PSI_TAS_CASE(float);
+		break;
+	case PSI_T_DOUBLE:
+		PSI_TAS_CASE(double);
+		break;
+	case PSI_T_POINTER:
+		{
+			PSI_TAS_P(char);
+			PSI_TAS_C(char_pointer);
+		}
+		break;
+	EMPTY_SWITCH_DEFAULT_CASE();
+	}
+
+	return align;
+}
+
+size_t psi_t_size(token_t t)
+{
+	size_t size;
+
+	switch (t) {
+	case PSI_T_INT8:
+	case PSI_T_UINT8:
+		size = 1;
+		break;
+	case PSI_T_INT16:
+	case PSI_T_UINT16:
+		size = 2;
+		break;
+	case PSI_T_INT:
+		size = sizeof(int);
+		break;
+	case PSI_T_INT32:
+	case PSI_T_UINT32:
+		size = 4;
+		break;
+	case PSI_T_INT64:
+	case PSI_T_UINT64:
+		size = 8;
+		break;
+	case PSI_T_FLOAT:
+		size = sizeof(float);
+		break;
+	case PSI_T_DOUBLE:
+		size = sizeof(double);
+		break;
+	case PSI_T_POINTER:
+		size = sizeof(char *);
+		break;
+	EMPTY_SWITCH_DEFAULT_CASE();
+	}
+	return size;
+}
+
+size_t psi_t_align(token_t t, size_t s)
+{
+	size_t a = psi_t_alignment(t);
+	return ((s - 1) | (a - 1)) + 1;
+}
+
+static impl_val *iterate(impl_val *val, token_t t, unsigned i, impl_val *tmp)
+{
+	size_t size = psi_t_size(t);
+
+	memset(tmp, 0, sizeof(*tmp));
+	memcpy(tmp, val->ptr + size * i, size);
+	return tmp;
+}
+
+void psi_from_zval(impl_val *mem, decl_arg *spec, zval *zv, void **tmp)
+{
+	decl_type *type = real_decl_type(spec->type);
+
+	switch (type->type) {
+	case PSI_T_FLOAT:
+		mem->fval = (float) zval_get_double(zv);
+		break;
+	case PSI_T_DOUBLE:
+		mem->dval = zval_get_double(zv);
+		break;
+	case PSI_T_INT8:
+	case PSI_T_UINT8:
+		if (spec->var->pointer_level) {
+			zend_string *zs = zval_get_string(zv);
+			*tmp = mem->ptr = estrndup(zs->val, zs->len);
+			zend_string_release(zs);
+			break;
+		}
+		/* no break */
+	default:
+		mem->zend.lval = zval_get_long(zv);
+		break;
+	}
+}
+
+void *psi_array_to_struct(decl_struct *s, HashTable *arr)
+{
+	size_t i, j = 0, size = decl_struct_size(s);
+	char *mem = ecalloc(1, size + s->args->count * sizeof(void *));
+
+	if (arr) for (i = 0; i < s->args->count; ++i) {
+		decl_struct_layout *layout = &s->layout[i];
+		decl_arg *darg = s->args->args[i];
+		zval *entry = zend_hash_str_find_ind(arr, darg->var->name, strlen(darg->var->name));
+
+		if (entry) {
+			impl_val val;
+			void *tmp = NULL;
+
+			memset(&tmp, 0, sizeof(tmp));
+			psi_from_zval(&val, darg, entry, &tmp);
+			memcpy(mem + layout->pos, &val, layout->len);
+			if (tmp) {
+				((void **)(mem + size))[j++] = tmp;
+			}
+		}
+	}
+	return mem;
+}
+
+void psi_to_array(zval *return_value, token_t t, impl_val *ret_val, decl_var *var)
+{
+	zval ele;
+	unsigned i;
+	impl_val tmp;
+
+	array_init(return_value);
+
+	if (t == PSI_T_STRUCT) {
+		decl_struct *s = real_decl_type(var->arg->type)->strct;
+		ret_val = deref_impl_val(ret_val, var);
+
+		ZEND_ASSERT(s);
+		for (i = 0; i < s->args->count; ++i) {
+			decl_arg *darg = s->args->args[i];
+			decl_struct_layout layout = s->layout[i];
+			impl_val tmp;
+			zval ztmp;
+			char *ptr = (char *) ret_val->ptr + layout.pos;
+
+			memset(&tmp, 0, sizeof(tmp));
+			memcpy(&tmp, ptr, layout.len);
+			switch (real_decl_type(darg->type)->type) {
+			case PSI_T_FLOAT:
+			case PSI_T_DOUBLE:
+				psi_to_double(&ztmp, real_decl_type(darg->type)->type, &tmp, darg->var);
+				break;
+			case PSI_T_INT8:
+			case PSI_T_UINT8:
+				if (darg->var->pointer_level) {
+					psi_to_string(&ztmp, real_decl_type(darg->type)->type, &tmp, darg->var);
+					break;
+				}
+				/* no break */
+			case PSI_T_INT16:
+			case PSI_T_UINT16:
+			case PSI_T_INT32:
+			case PSI_T_UINT32:
+			case PSI_T_INT64:
+			case PSI_T_UINT64:
+				psi_to_int(&ztmp, real_decl_type(darg->type)->type, &tmp, darg->var);
+				break;
+			default:
+				printf("t=%d\n", real_decl_type(darg->type)->type);
+				abort();
+			}
+			add_assoc_zval(return_value, darg->var->name, &ztmp);
+		}
+		return;
+	}
+	ret_val = deref_impl_val(ret_val, var);
+	for (i = 0; i < var->arg->var->array_size; ++i) {
+		impl_val *ptr = iterate(ret_val, t, i, &tmp);
+
+		switch (t) {
+		case PSI_T_FLOAT:
+			ZVAL_DOUBLE(&ele, (double) ptr->fval);
+			break;
+		case PSI_T_DOUBLE:
+			ZVAL_DOUBLE(&ele, ptr->dval);
+			break;
+		default:
+			ZVAL_LONG(&ele, ptr->lval);
+			break;
+		}
+
+		add_next_index_zval(return_value, &ele);
+	}
+}
+
 ZEND_RESULT_CODE psi_parse_args(zend_execute_data *execute_data, impl *impl)
 {
 	impl_arg *iarg;
@@ -153,15 +404,15 @@ ZEND_RESULT_CODE psi_parse_args(zend_execute_data *execute_data, impl *impl)
 		}
 		if (PSI_T_BOOL == iarg->type->type) {
 			if (iarg->def) {
-				iarg->val.bval = iarg->def->type == PSI_T_TRUE ? 1 : 0;
+				iarg->val.zend.bval = iarg->def->type == PSI_T_TRUE ? 1 : 0;
 			}
-			Z_PARAM_BOOL(iarg->val.bval);
+			Z_PARAM_BOOL(iarg->val.zend.bval);
 		} else if (PSI_T_INT == iarg->type->type) {
 			if (iarg->def) {
-				iarg->val.lval = zend_atol(iarg->def->text, strlen(iarg->def->text));
+				iarg->val.zend.lval = zend_atol(iarg->def->text, strlen(iarg->def->text));
 			}
-			Z_PARAM_LONG(iarg->val.lval);
-		} else if (PSI_T_FLOAT == iarg->type->type) {
+			Z_PARAM_LONG(iarg->val.zend.lval);
+		} else if (PSI_T_FLOAT == iarg->type->type || PSI_T_DOUBLE == iarg->type->type) {
 			if (iarg->def) {
 				iarg->val.dval = zend_strtod(iarg->def->text, NULL);
 			}
@@ -173,12 +424,15 @@ ZEND_RESULT_CODE psi_parse_args(zend_execute_data *execute_data, impl *impl)
 				str.len = strlen(iarg->def->text) - 2;
 				str.val = &iarg->def->text[1];
 			}
-			Z_PARAM_STR_EX(iarg->val.str, 1, 0);
-			if (iarg->val.str) {
-				zend_string_addref(iarg->val.str);
+			Z_PARAM_STR_EX(iarg->val.zend.str, 1, 0);
+			if (iarg->val.zend.str) {
+				zend_string_addref(iarg->val.zend.str);
 			} else if (iarg->def) {
-				iarg->val.str = zend_string_init(str.val, str.len, 0);
+				iarg->val.zend.str = zend_string_init(str.val, str.len, 0);
 			}
+		} else if (PSI_T_ARRAY == iarg->type->type) {
+			/* handled as _zv in let or set */
+			Z_PARAM_PROLOGUE(0);
 		} else {
 			error_code = ZPP_ERROR_FAILURE;
 			break;
@@ -192,57 +446,103 @@ ZEND_RESULT_CODE psi_parse_args(zend_execute_data *execute_data, impl *impl)
 	return SUCCESS;
 }
 
-impl_val *psi_do_let(decl_arg *darg)
+void *psi_do_calloc(let_calloc *alloc)
+{
+	decl_type *type = real_decl_type(alloc->type);
+	size_t size;
+
+	if (type->type == PSI_T_STRUCT) {
+		/* psi_do_clean expects a NULL pointer after the struct */
+		size = decl_struct_size(type->strct) + sizeof(void *);
+	} else {
+		size = psi_t_size(type->type);
+	}
+
+	return ecalloc(alloc->n, size);
+}
+
+void *psi_do_let(decl_arg *darg)
 {
-	impl_val *arg_val = &darg->let->out;
 	impl_arg *iarg = darg->let->arg;
+	impl_val *arg_val;
+
+	darg->let->ptr = &darg->let->out;
+	arg_val = darg->let->ptr;
 
 	if (!iarg) {
-		/* let foo = NULL */
-		memset(arg_val, 0, sizeof(*arg_val));
-		return arg_val;
-	}
-	switch (darg->let->val->func->type) {
-	case PSI_T_BOOLVAL:
-		if (iarg->type->type == PSI_T_BOOL) {
-			arg_val->cval = iarg->val.cval;
-		} else {
-			arg_val->cval = zend_is_true(iarg->_zv);
-		}
-		break;
-	case PSI_T_INTVAL:
-		if (iarg->type->type == PSI_T_INT) {
-			arg_val->lval = iarg->val.lval;
-		} else {
-			arg_val->lval = zval_get_long(iarg->_zv);
-		}
-		break;
-	case PSI_T_STRVAL:
-		if (iarg->type->type == PSI_T_STRING) {
-			arg_val->ptr = estrdup(iarg->val.str->val);
+		/* let foo = calloc(1, long);
+		 * let foo = NULL;
+		 * let foo;
+		 */
+		if (darg->let->val->func && darg->let->val->func->type == PSI_T_CALLOC) {
+			arg_val->ptr = psi_do_calloc(darg->let->val->func->alloc);
 			darg->let->mem = arg_val->ptr;
-			zend_string_release(iarg->val.str);
-		} else {
-			zend_string *zs = zval_get_string(iarg->_zv);
-			arg_val->ptr = estrdup(zs->val);
+		} else if (darg->var->array_size) {
+			arg_val->ptr = ecalloc(darg->var->array_size, sizeof(*arg_val));
 			darg->let->mem = arg_val->ptr;
-			zend_string_release(zs);
-		}
-		break;
-	case PSI_T_STRLEN:
-		if (iarg->type->type == PSI_T_STRING) {
-			arg_val->lval = iarg->val.str->len;
-			zend_string_release(iarg->val.str);
 		} else {
-			zend_string *zs = zval_get_string(iarg->_zv);
-			arg_val->lval = zs->len;
-			zend_string_release(zs);
+			memset(arg_val, 0, sizeof(*arg_val));
+		}
+	} else {
+
+		switch (darg->let->val->func->type) {
+		case PSI_T_BOOLVAL:
+			if (iarg->type->type == PSI_T_BOOL) {
+				arg_val->cval = iarg->val.zend.bval;
+			} else {
+				arg_val->cval = zend_is_true(iarg->_zv);
+			}
+			break;
+		case PSI_T_INTVAL:
+			if (iarg->type->type == PSI_T_INT) {
+				arg_val->lval = iarg->val.zend.lval;
+			} else {
+				arg_val->lval = zval_get_long(iarg->_zv);
+			}
+			break;
+		case PSI_T_STRVAL:
+			if (iarg->type->type == PSI_T_STRING) {
+				arg_val->ptr = estrdup(iarg->val.zend.str->val);
+				darg->let->mem = arg_val->ptr;
+				zend_string_release(iarg->val.zend.str);
+			} else {
+				zend_string *zs = zval_get_string(iarg->_zv);
+				arg_val->ptr = estrdup(zs->val);
+				darg->let->mem = arg_val->ptr;
+				zend_string_release(zs);
+			}
+			break;
+		case PSI_T_STRLEN:
+			if (iarg->type->type == PSI_T_STRING) {
+				arg_val->lval = iarg->val.zend.str->len;
+				zend_string_release(iarg->val.zend.str);
+			} else {
+				zend_string *zs = zval_get_string(iarg->_zv);
+				arg_val->lval = zs->len;
+				zend_string_release(zs);
+			}
+			break;
+		case PSI_T_ARRVAL:
+			if (iarg->type->type == PSI_T_ARRAY) {
+				decl_type *type = real_decl_type(darg->type);
+
+				switch (type->type) {
+				case PSI_T_STRUCT:
+					arg_val->ptr = psi_array_to_struct(type->strct, HASH_OF(iarg->_zv));
+					darg->let->mem = arg_val->ptr;
+					break;
+				}
+			}
+			break;
+		EMPTY_SWITCH_DEFAULT_CASE();
 		}
-		break;
-	EMPTY_SWITCH_DEFAULT_CASE();
 	}
 
-	return arg_val;
+	if (darg->let->val && darg->let->val->is_reference) {
+		return &darg->let->ptr;
+	} else {
+		return darg->let->ptr;
+	}
 }
 
 void psi_do_set(zval *return_value, set_func *func, decl_vars *vars)
@@ -254,7 +554,10 @@ void psi_do_set(zval *return_value, set_func *func, decl_vars *vars)
 
 	switch (func->type) {
 	case PSI_T_TO_STRING:
-		psi_to_string(val, vars->vars[0]->arg, return_value);
+		psi_to_string(return_value, real_decl_type(vars->vars[0]->arg->type)->type, val, vars->vars[0]);
+		break;
+	case PSI_T_TO_ARRAY:
+		psi_to_array(return_value, real_decl_type(vars->vars[0]->arg->type)->type, val, vars->vars[0]);
 		break;
 	EMPTY_SWITCH_DEFAULT_CASE();
 	}
@@ -262,12 +565,17 @@ void psi_do_set(zval *return_value, set_func *func, decl_vars *vars)
 
 void psi_do_return(impl *impl, impl_val *ret_val, zval *return_value)
 {
-	switch (impl->stmts->ret.list[0]->func->type) {
+	return_stmt *ret = impl->stmts->ret.list[0];
+
+	switch (ret->func->type) {
 	case PSI_T_TO_STRING:
-		psi_to_string(ret_val, impl->decl->func, return_value);
+		psi_to_string(return_value, real_decl_type(impl->decl->func->type)->type, ret_val, ret->decl);
 		break;
 	case PSI_T_TO_INT:
-		psi_to_int(ret_val, impl->decl->func, return_value);
+		psi_to_int(return_value, real_decl_type(impl->decl->func->type)->type, ret_val, ret->decl);
+		break;
+	case PSI_T_TO_ARRAY:
+		psi_to_array(return_value, real_decl_type(impl->decl->func->type)->type, ret_val, ret->decl);
 		break;
 	EMPTY_SWITCH_DEFAULT_CASE();
 	}
@@ -296,17 +604,27 @@ void psi_do_clean(impl *impl)
 
 		switch (iarg->type->type) {
 		case PSI_T_STRING:
-			if (iarg->val.str) {
-				zend_string_release(iarg->val.str);
+			if (iarg->val.zend.str) {
+				zend_string_release(iarg->val.zend.str);
 			}
 			break;
 		}
 	}
 
-	for (i = 0; i < impl->decl->args->count; ++i) {
+	if (impl->decl->args) for (i = 0; i < impl->decl->args->count; ++i) {
 		decl_arg *darg = impl->decl->args->args[i];
 
 		if (darg->let && darg->let->mem) {
+			decl_type *type = real_decl_type(darg->type);
+
+			if (type->type == PSI_T_STRUCT) {
+				size_t eos = decl_struct_size(type->strct);
+				void **ptr = (void **) ((char *) darg->let->mem + eos);
+
+				while (*ptr) {
+					efree(*ptr++);
+				}
+			}
 			efree(darg->let->mem);
 			darg->let->mem = NULL;
 		}