X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-psi;a=blobdiff_plain;f=src%2Fcontext.c;h=d1eb05e35323aed7137f258c808b24420cb402e6;hp=b4e73ad2015df02e3d06a91335bf0417a5aa6ce1;hb=c5b2de8ed1d92dd42f910d4347d9175f27e3acbb;hpb=ddeb4918bce67ed63c5f4c8c4e250e92ebdef89d

diff --git a/src/context.c b/src/context.c
index b4e73ad..d1eb05e 100644
--- a/src/context.c
+++ b/src/context.c
@@ -56,21 +56,18 @@
 #include "token.h"
 #include "parser.h"
 
-#include "php_psi_types.h"
-#include "php_psi_consts.h"
-#include "php_psi_decls.h"
-#include "php_psi_va_decls.h"
-#include "php_psi_fn_decls.h"
-#include "php_psi_structs.h"
-#include "php_psi_unions.h"
+#define PSI_PREDEF_TYPES
+#define PSI_PREDEF_CONSTS
+#define PSI_PREDEF_COMPOSITES
+#define PSI_PREDEF_DECLS
+#include "php_psi_posix.h"
 
 struct psi_context *psi_context_init(struct psi_context *C, struct psi_context_ops *ops, psi_error_cb error, unsigned flags)
 {
 	struct psi_data T;
 	struct psi_predef_type *predef_type;
 	struct psi_predef_const *predef_const;
-	struct psi_predef_struct *predef_struct;
-	struct psi_predef_union *predef_union;
+	struct psi_predef_composite *predef_composite;
 	struct psi_predef_decl *predef_decl;
 
 	if (!C) {
@@ -100,42 +97,48 @@ struct psi_context *psi_context_init(struct psi_context *C, struct psi_context_o
 		T.types = psi_plist_add(T.types, &def);
 	}
 	for (predef_const = &psi_predef_consts[0]; predef_const->type_tag; ++predef_const) {
-		struct psi_impl_def_val *val = psi_impl_def_val_init(predef_const->val_type_tag, predef_const->val_text);
 		struct psi_const_type *type = psi_const_type_init(predef_const->type_tag, predef_const->type_name);
-		struct psi_const *constant = psi_const_init(type, predef_const->var_name, val);
+		struct psi_impl_def_val *val;
+		struct psi_const *constant;
+
+		switch (type->type) {
+		case PSI_T_INT:
+			val = psi_impl_def_val_init(PSI_T_INT, NULL);
+			val->ival.zend.lval = predef_const->value.lval;
+			break;
+		case PSI_T_STRING:
+			val = psi_impl_def_val_init(PSI_T_STRING, NULL);
+			val->ival.zend.str = zend_string_init(predef_const->value.ptr, strlen(predef_const->value.ptr), 1);
+			break;
+		default:
+			assert(0);
+			break;
+		}
 
+		constant = psi_const_init(type, predef_const->var_name, val);
 		T.consts = psi_plist_add(T.consts, &constant);
 	}
-	for (predef_struct = &psi_predef_structs[0]; predef_struct->type_tag; ++predef_struct) {
-		struct psi_predef_struct *member;
+	for (predef_composite = &psi_predef_composites[0]; predef_composite->type_tag; ++predef_composite) {
+		struct psi_predef_composite *member;
+		struct psi_decl_struct *dstruct;
+		struct psi_decl_union *dunion;
 		struct psi_plist *dargs = psi_plist_init((psi_plist_dtor) psi_decl_arg_free);
-		struct psi_decl_struct *dstruct = psi_decl_struct_init(predef_struct->var_name, dargs);
-
-		dstruct->size = predef_struct->size;
-		dstruct->align = predef_struct->offset;
-		for (member = &predef_struct[1]; member->type_tag; ++member) {
-			struct psi_decl_type *type;
-			struct psi_decl_var *dvar;
-			struct psi_decl_arg *darg;
 
-			type = psi_decl_type_init(member->type_tag, member->type_name);
-			dvar = psi_decl_var_init(member->var_name, member->pointer_level, member->array_size);
-			darg = psi_decl_arg_init(type, dvar);
-			darg->layout = psi_layout_init(member->offset, member->size);
-			dstruct->args = psi_plist_add(dstruct->args, &darg);
+		switch (predef_composite->type_tag) {
+		case PSI_T_STRUCT:
+			dstruct = psi_decl_struct_init(predef_composite->var_name, dargs);
+			dstruct->size = predef_composite->size;
+			dstruct->align = predef_composite->offset;
+			break;
+		case PSI_T_UNION:
+			dunion = psi_decl_union_init(predef_composite->var_name, dargs);
+			dunion->size = predef_composite->size;
+			dunion->align = predef_composite->offset;
+			break;
+		default:
+			assert(0);
 		}
-
-		T.structs = psi_plist_add(T.structs, &dstruct);
-		predef_struct = member;
-	}
-	for (predef_union = &psi_predef_unions[0]; predef_union->type_tag; ++predef_union) {
-		struct psi_predef_union *member;
-		struct psi_plist *dargs = psi_plist_init((psi_plist_dtor) psi_decl_arg_free);
-		struct psi_decl_union *dunion = psi_decl_union_init(predef_union->var_name, dargs);
-
-		dunion->size = predef_union->size;
-		dunion->align = predef_union->offset;
-		for (member = &predef_union[1]; member->type_tag; ++member) {
+		for (member = &predef_composite[1]; member->type_tag; ++member) {
 			struct psi_decl_type *type;
 			struct psi_decl_var *dvar;
 			struct psi_decl_arg *darg;
@@ -144,58 +147,38 @@ struct psi_context *psi_context_init(struct psi_context *C, struct psi_context_o
 			dvar = psi_decl_var_init(member->var_name, member->pointer_level, member->array_size);
 			darg = psi_decl_arg_init(type, dvar);
 			darg->layout = psi_layout_init(member->offset, member->size);
-			dunion->args = psi_plist_add(dunion->args, &darg);
-		}
 
-		T.unions = psi_plist_add(T.unions, &dunion);
-		predef_union = member;
-	}
-	for (predef_decl = &psi_predef_decls[0]; predef_decl->type_tag; ++predef_decl) {
-		struct psi_predef_decl *farg;
-		struct psi_decl_type *ftype = psi_decl_type_init(predef_decl->type_tag, predef_decl->type_name);
-		struct psi_decl_var *fname = psi_decl_var_init(predef_decl->var_name, predef_decl->pointer_level, predef_decl->array_size);
-		struct psi_decl_arg *func = psi_decl_arg_init(ftype, fname);
-		struct psi_plist *args = psi_plist_init((psi_plist_dtor) psi_decl_arg_free);
-		struct psi_decl *decl = psi_decl_init(psi_decl_abi_init("default"), func, args);
-
-		for (farg = &predef_decl[1]; farg->type_tag; ++farg) {
-			struct psi_decl_type *arg_type = psi_decl_type_init(farg->type_tag, farg->type_name);
-			struct psi_decl_var *arg_var = psi_decl_var_init(farg->var_name, farg->pointer_level, farg->array_size);
-			struct psi_decl_arg *darg = psi_decl_arg_init(arg_type, arg_var);
-			decl->args = psi_plist_add(decl->args, &darg);
+			switch (predef_composite->type_tag) {
+			case PSI_T_STRUCT:
+				dstruct->args = psi_plist_add(dstruct->args, &darg);
+				break;
+			case PSI_T_UNION:
+				dunion->args = psi_plist_add(dunion->args, &darg);
+				break;
+			default:
+				assert(0);
+			}
 		}
-
-		T.decls = psi_plist_add(T.decls, &decl);
-		predef_decl = farg;
-	}
-
-	for (predef_decl = &psi_predef_vararg_decls[0]; predef_decl->type_tag; ++predef_decl) {
-		struct psi_predef_decl *farg;
-		struct psi_decl_type *ftype = psi_decl_type_init(predef_decl->type_tag, predef_decl->type_name);
-		struct psi_decl_var *fname = psi_decl_var_init(predef_decl->var_name, predef_decl->pointer_level, predef_decl->array_size);
-		struct psi_decl_arg *func = psi_decl_arg_init(ftype, fname);
-		struct psi_plist *args = psi_plist_init((psi_plist_dtor) psi_decl_arg_free);
-		struct psi_decl *decl = psi_decl_init(psi_decl_abi_init("default"), func, args);
-
-		for (farg = &predef_decl[1]; farg->type_tag; ++farg) {
-			struct psi_decl_type *arg_type = psi_decl_type_init(farg->type_tag, farg->type_name);
-			struct psi_decl_var *arg_var = psi_decl_var_init(farg->var_name, farg->pointer_level, farg->array_size);
-			struct psi_decl_arg *darg = psi_decl_arg_init(arg_type, arg_var);
-			decl->args = psi_plist_add(decl->args, &darg);
+		switch (predef_composite->type_tag) {
+		case PSI_T_STRUCT:
+			T.structs = psi_plist_add(T.structs, &dstruct);
+			break;
+		case PSI_T_UNION:
+			T.unions = psi_plist_add(T.unions, &dunion);
+			break;
+		default:
+			assert(0);
 		}
-		decl->varargs = 1;
 
-		T.decls = psi_plist_add(T.decls, &decl);
-		predef_decl = farg;
+		predef_composite = member;
 	}
-
-	for (predef_decl = &psi_predef_functor_decls[0]; predef_decl->type_tag; ++predef_decl) {
+	for (predef_decl = &psi_predef_decls[0]; predef_decl->type_tag; ++predef_decl) {
 		struct psi_predef_decl *farg;
 		struct psi_decl_type *dtype, *ftype = psi_decl_type_init(predef_decl->type_tag, predef_decl->type_name);
 		struct psi_decl_var *fname = psi_decl_var_init(predef_decl->var_name, predef_decl->pointer_level, predef_decl->array_size);
 		struct psi_decl_arg *tdef, *func = psi_decl_arg_init(ftype, fname);
 		struct psi_plist *args = psi_plist_init((psi_plist_dtor) psi_decl_arg_free);
-		struct psi_decl *decl = psi_decl_init(psi_decl_abi_init("default"), func, args);
+		struct psi_decl *decl = psi_decl_init(func, args);
 
 		for (farg = &predef_decl[1]; farg->type_tag; ++farg) {
 			struct psi_decl_type *arg_type = psi_decl_type_init(farg->type_tag, farg->type_name);
@@ -204,10 +187,22 @@ struct psi_context *psi_context_init(struct psi_context *C, struct psi_context_o
 			decl->args = psi_plist_add(decl->args, &darg);
 		}
 
-		dtype = psi_decl_type_init(PSI_T_FUNCTION, fname->name);
-		dtype->real.func = decl;
-		tdef = psi_decl_arg_init(dtype, psi_decl_var_copy(fname));
-		T.types = psi_plist_add(T.types, &tdef);
+		switch (predef_decl->kind) {
+		case DECL_KIND_VARARG:
+			decl->varargs = 1;
+			/* no break */
+		case DECL_KIND_STD:
+			T.decls = psi_plist_add(T.decls, &decl);
+			break;
+		case DECL_KIND_FUNCTOR:
+			dtype = psi_decl_type_init(PSI_T_FUNCTION, fname->name);
+			dtype->real.func = decl;
+			tdef = psi_decl_arg_init(dtype, psi_decl_var_copy(fname));
+			T.types = psi_plist_add(T.types, &tdef);
+			break;
+		default:
+			assert(0);
+		}
 
 		predef_decl = farg;
 	}
@@ -245,6 +240,7 @@ void psi_context_build(struct psi_context *C, const char *paths)
 			for (i = 0; i < n; ++i) {
 				char psi[MAXPATHLEN];
 				struct psi_parser P;
+				struct psi_parser_input *I;
 
 				if (MAXPATHLEN <= slprintf(psi, MAXPATHLEN, "%s/%s", ptr, entries[i]->d_name)) {
 					C->error(PSI_DATA(C), NULL, PSI_WARNING, "Path to PSI file too long: %s/%s",
@@ -255,22 +251,15 @@ void psi_context_build(struct psi_context *C, const char *paths)
 						psi, strerror(errno));
 					continue;
 				}
-				if (!psi_parser_open_file(&P, psi)) {
+				if (!(I = psi_parser_open_file(&P, psi, true))) {
 					C->error(PSI_DATA(C), NULL, PSI_WARNING, "Failed to open PSI file (%s): %s",
 						psi, strerror(errno));
 					continue;
 				}
-
-				while (0 < psi_parser_scan(&P)) {
-					psi_parser_parse(&P, psi_token_alloc(&P));
-					if (P.num == PSI_T_EOF) {
-						break;
-					}
-				}
-
-				psi_parser_parse(&P, NULL);
+				psi_parser_parse(&P, I);
 				psi_context_add_data(C, PSI_DATA(&P));
 				psi_parser_dtor(&P);
+				free(I);
 			}
 		}
 
@@ -304,28 +293,36 @@ zend_function_entry *psi_context_compile(struct psi_context *C)
 		struct psi_const *c;
 
 		while (psi_plist_get(C->consts, i++, &c)) {
-			zc.name = zend_string_init(c->name + (c->name[0] == '\\'), strlen(c->name) - (c->name[0] == '\\'), 1);
-			ZVAL_NEW_STR(&zc.value, zend_string_init(c->val->text, strlen(c->val->text), 1));
+
+			if (zend_get_constant_str(c->name, strlen(c->name))) {
+				continue;
+			}
+
+			zc.name = zend_string_init(c->name, strlen(c->name), 1);
 
 			switch (c->type->type) {
 			case PSI_T_BOOL:
-				convert_to_boolean(&zc.value);
+				ZVAL_BOOL(&zc.value, c->val->ival.zend.bval);
 				break;
 			case PSI_T_INT:
-				convert_to_long(&zc.value);
+				ZVAL_LONG(&zc.value, c->val->ival.zend.lval);
 				break;
 			case PSI_T_FLOAT:
-				convert_to_double(&zc.value);
+				ZVAL_DOUBLE(&zc.value, c->val->ival.dval);
 				break;
 			case PSI_T_STRING:
 			case PSI_T_QUOTED_STRING:
+				ZVAL_NEW_STR(&zc.value, zend_string_copy(c->val->ival.zend.str));
 				break;
 			default:
 				assert(0);
+				break;
 			}
+
 			zend_register_constant(&zc);
 		}
 	}
+
 	if (C->enums) {
 		size_t i = 0;
 		struct psi_decl_enum *e;
@@ -338,7 +335,7 @@ zend_function_entry *psi_context_compile(struct psi_context *C)
 				zend_string *name = strpprintf(0, "psi\\%s\\%s", e->name, item->name);
 
 				zc.name = zend_string_dup(name, 1);
-				ZVAL_LONG(&zc.value, psi_long_num_exp(item->num, NULL));
+				ZVAL_LONG(&zc.value, psi_long_num_exp(item->num, NULL, NULL));
 				zend_register_constant(&zc);
 				zend_string_release(name);
 			}
@@ -370,7 +367,22 @@ ZEND_RESULT_CODE psi_context_call(struct psi_context *C, zend_execute_data *exec
 		return FAILURE;
 	}
 
+	if (SUCCESS != psi_call_frame_do_assert(frame, PSI_ASSERT_PRE)) {
+		psi_call_frame_do_return(frame, return_value);
+		psi_call_frame_free(frame);
+
+		return FAILURE;
+	}
+
 	psi_call_frame_do_call(frame);
+
+	if (SUCCESS != psi_call_frame_do_assert(frame, PSI_ASSERT_POST)) {
+		psi_call_frame_do_return(frame, return_value);
+		psi_call_frame_free(frame);
+
+		return FAILURE;
+	}
+
 	psi_call_frame_do_return(frame, return_value);
 	psi_call_frame_do_set(frame);
 	psi_call_frame_do_free(frame);