X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=src%2Fmodule.c;h=eec8611178bc4189d3129fd50a36aff86a793ff1;hb=e32a2cebb5fef59de8c202fc2ff936b51945744a;hp=03d9d8350f3c0b0412cfd6833b403d6e90b5d3a6;hpb=7474b3e23338ea03bcd65551959e2582cc455f9f;p=m6w6%2Fext-psi

diff --git a/src/module.c b/src/module.c
index 03d9d83..eec8611 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,6 +93,24 @@ size_t psi_num_min_args(impl *impl)
 	return n;
 }
 
+void psi_to_bool(zval *return_value, token_t t, impl_val *ret_val, decl_var *var)
+{
+	switch (t) {
+	case PSI_T_FLOAT:
+		RETVAL_DOUBLE((double) deref_impl_val(ret_val, var)->fval);
+		convert_to_boolean(return_value);
+		break;
+	case PSI_T_DOUBLE:
+		RETVAL_DOUBLE(deref_impl_val(ret_val, var)->dval);
+		convert_to_boolean(return_value);
+		break;
+	default:
+		RETVAL_LONG(deref_impl_val(ret_val, var)->lval);
+		convert_to_boolean(return_value);
+		break;
+	}
+}
+
 void psi_to_int(zval *return_value, token_t t, impl_val *ret_val, decl_var *var)
 {
 	switch (t) {
@@ -128,8 +145,7 @@ void psi_to_double(zval *return_value, token_t t, impl_val *ret_val, decl_var *v
 void psi_to_string(zval *return_value, token_t t, impl_val *ret_val, decl_var *var)
 {
 	switch (t) {
-	case PSI_T_CHAR:
-	case PSI_T_SINT8:
+	case PSI_T_INT8:
 	case PSI_T_UINT8:
 		if (!var->arg->var->pointer_level) {
 			RETVAL_STRINGL(&ret_val->cval, 1);
@@ -174,37 +190,25 @@ size_t psi_t_alignment(token_t t)
 	PSI_TAS_C(T); \
 }
 	switch (t) {
-	case PSI_T_CHAR:
-		PSI_TAS_CASE(char);
-		break;
-	case PSI_T_SINT8:
+	case PSI_T_INT8:
 		PSI_TAS_CASE(int8_t);
 		break;
 	case PSI_T_UINT8:
 		PSI_TAS_CASE(uint8_t);
 		break;
-	case PSI_T_SHORT:
-		PSI_TAS_CASE(short);
-		break;
-	case PSI_T_SINT16:
+	case PSI_T_INT16:
 		PSI_TAS_CASE(int16_t);
 		break;
 	case PSI_T_UINT16:
 		PSI_TAS_CASE(uint16_t);
 		break;
-	case PSI_T_INT:
-		PSI_TAS_CASE(int);
-		break;
-	case PSI_T_SINT32:
+	case PSI_T_INT32:
 		PSI_TAS_CASE(int32_t);
 		break;
 	case PSI_T_UINT32:
 		PSI_TAS_CASE(uint32_t);
 		break;
-	case PSI_T_LONG:
-		PSI_TAS_CASE(long);
-		break;
-	case PSI_T_SINT64:
+	case PSI_T_INT64:
 		PSI_TAS_CASE(int64_t);
 		break;
 	case PSI_T_UINT64:
@@ -216,9 +220,6 @@ size_t psi_t_alignment(token_t t)
 	case PSI_T_DOUBLE:
 		PSI_TAS_CASE(double);
 		break;
-	case PSI_T_SIZE_T:
-		PSI_TAS_CASE(size_t);
-		break;
 	case PSI_T_POINTER:
 		{
 			PSI_TAS_P(char);
@@ -236,31 +237,22 @@ size_t psi_t_size(token_t t)
 	size_t size;
 
 	switch (t) {
-	case PSI_T_CHAR:
-		size = sizeof(char);
-		break;
-	case PSI_T_SINT8:
+	case PSI_T_INT8:
 	case PSI_T_UINT8:
 		size = 1;
 		break;
-	case PSI_T_SHORT:
-		size = sizeof(short);
-		break;
-	case PSI_T_SINT16:
+	case PSI_T_INT16:
 	case PSI_T_UINT16:
 		size = 2;
 		break;
 	case PSI_T_INT:
 		size = sizeof(int);
 		break;
-	case PSI_T_SINT32:
+	case PSI_T_INT32:
 	case PSI_T_UINT32:
 		size = 4;
 		break;
-	case PSI_T_LONG:
-		size = sizeof(long);
-		break;
-	case PSI_T_SINT64:
+	case PSI_T_INT64:
 	case PSI_T_UINT64:
 		size = 8;
 		break;
@@ -270,9 +262,6 @@ size_t psi_t_size(token_t t)
 	case PSI_T_DOUBLE:
 		size = sizeof(double);
 		break;
-	case PSI_T_SIZE_T:
-		size = sizeof(size_t);
-		break;
 	case PSI_T_POINTER:
 		size = sizeof(char *);
 		break;
@@ -307,8 +296,7 @@ void psi_from_zval(impl_val *mem, decl_arg *spec, zval *zv, void **tmp)
 	case PSI_T_DOUBLE:
 		mem->dval = zval_get_double(zv);
 		break;
-	case PSI_T_CHAR:
-	case PSI_T_SINT8:
+	case PSI_T_INT8:
 	case PSI_T_UINT8:
 		if (spec->var->pointer_level) {
 			zend_string *zs = zval_get_string(zv);
@@ -325,11 +313,10 @@ void psi_from_zval(impl_val *mem, decl_arg *spec, zval *zv, void **tmp)
 
 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 *));
+	size_t i, j = 0;
+	char *mem = ecalloc(1, s->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));
 
@@ -339,9 +326,9 @@ void *psi_array_to_struct(decl_struct *s, HashTable *arr)
 
 			memset(&tmp, 0, sizeof(tmp));
 			psi_from_zval(&val, darg, entry, &tmp);
-			memcpy(mem + layout->pos, &val, layout->len);
+			memcpy(mem + darg->layout->pos, &val, darg->layout->len);
 			if (tmp) {
-				((void **)(mem + size))[j++] = tmp;
+				((void **)(mem + s->size))[j++] = tmp;
 			}
 		}
 	}
@@ -363,24 +350,36 @@ void psi_to_array(zval *return_value, token_t t, impl_val *ret_val, decl_var *va
 		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;
+			impl_val tmp, tmp_ptr;
 			zval ztmp;
-			char *ptr = (char *) ret_val->ptr + layout.pos;
+			char *ptr = (char *) ret_val->ptr + darg->layout->pos;
 
+			tmp_ptr.ptr = &tmp;
 			memset(&tmp, 0, sizeof(tmp));
-			memcpy(&tmp, ptr, layout.len);
+			memcpy(&tmp, ptr, darg->layout->len);
 			switch (real_decl_type(darg->type)->type) {
-			case PSI_T_CHAR:
+			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);
+					psi_to_string(&ztmp, real_decl_type(darg->type)->type, &tmp_ptr, darg->var);
 					break;
 				}
 				/* no break */
-			case PSI_T_INT:
-			case PSI_T_LONG:
+			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;
+			case PSI_T_STRUCT:
+				psi_to_array(&ztmp, real_decl_type(darg->type)->type, &tmp_ptr, darg->var);
+				break;
 			default:
 				printf("t=%d\n", real_decl_type(darg->type)->type);
 				abort();
@@ -428,7 +427,7 @@ ZEND_RESULT_CODE psi_parse_args(zend_execute_data *execute_data, impl *impl)
 				iarg->val.zend.bval = iarg->def->type == PSI_T_TRUE ? 1 : 0;
 			}
 			Z_PARAM_BOOL(iarg->val.zend.bval);
-		} else if (PSI_T_INT == iarg->type->type || PSI_T_LONG == iarg->type->type) {
+		} else if (PSI_T_INT == iarg->type->type) {
 			if (iarg->def) {
 				iarg->val.zend.lval = zend_atol(iarg->def->text, strlen(iarg->def->text));
 			}
@@ -473,8 +472,8 @@ void *psi_do_calloc(let_calloc *alloc)
 	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 *);
+		/* psi_do_clean expects at least one NULL pointer after the struct */
+		size = type->strct->size + sizeof(void *);
 	} else {
 		size = psi_t_size(type->type);
 	}
@@ -515,7 +514,7 @@ void *psi_do_let(decl_arg *darg)
 			}
 			break;
 		case PSI_T_INTVAL:
-			if (iarg->type->type == PSI_T_INT || iarg->type->type == PSI_T_LONG) {
+			if (iarg->type->type == PSI_T_INT) {
 				arg_val->lval = iarg->val.zend.lval;
 			} else {
 				arg_val->lval = zval_get_long(iarg->_zv);
@@ -566,40 +565,22 @@ void *psi_do_let(decl_arg *darg)
 	}
 }
 
-void psi_do_set(zval *return_value, set_func *func, decl_vars *vars)
+void psi_do_set(zval *return_value, set_value *set)
 {
-	impl_val *val = (impl_val *) &vars->vars[0]->arg->let->ptr;
+	impl_val *val = (impl_val *) &set->vars->vars[0]->arg->let->ptr;
+	token_t t = real_decl_type(set->vars->vars[0]->arg->type)->type;
 
 	ZVAL_DEREF(return_value);
 	zval_dtor(return_value);
 
-	switch (func->type) {
-	case PSI_T_TO_STRING:
-		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();
-	}
+	set->func->handler(return_value, t, val, set->vars->vars[0]);
 }
 
-void psi_do_return(impl *impl, impl_val *ret_val, zval *return_value)
+void psi_do_return(zval *return_value, return_stmt *ret, impl_val *ret_val)
 {
-	return_stmt *ret = impl->stmts->ret.list[0];
+	token_t t = real_decl_type(ret->decl->type)->type;
 
-	switch (ret->func->type) {
-	case PSI_T_TO_STRING:
-		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(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();
-	}
+	ret->set->func->handler(return_value, t, ret_val, ret->decl->var);
 }
 
 void psi_do_free(free_stmt *fre)
@@ -639,8 +620,7 @@ void psi_do_clean(impl *impl)
 			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);
+				void **ptr = (void **) ((char *) darg->let->mem + type->strct->size);
 
 				while (*ptr) {
 					efree(*ptr++);