X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-psi;a=blobdiff_plain;f=src%2Fcontext.c;h=11b2abd00dcf1265e607e8b23e378aeaa7dfa316;hp=218da24abb541a0a45d012650f51fa46550822e0;hb=f74ce3f29e2dadd9f839c33ad5292e56e9203efd;hpb=d3171526ab7658114cac4ebe1098af4b038e576e

diff --git a/src/context.c b/src/context.c
index 218da24..11b2abd 100644
--- a/src/context.c
+++ b/src/context.c
@@ -1,6 +1,29 @@
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
+/*******************************************************************************
+ Copyright (c) 2016, Michael Wallner <mike@php.net>.
+ All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
+
+     * Redistributions of source code must retain the above copyright notice,
+       this list of conditions and the following disclaimer.
+     * Redistributions in binary form must reproduce the above copyright
+       notice, this list of conditions and the following disclaimer in the
+       documentation and/or other materials provided with the distribution.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
+ FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*******************************************************************************/
+
+#include "php_psi_stdinc.h"
 
 #include "php.h"
 
@@ -23,27 +46,28 @@
 
 #include <fnmatch.h>
 
-#include "php.h"
 #include "php_scandir.h"
 #include "php_psi.h"
 #include "calc.h"
+#include "call.h"
 #include "libjit.h"
 #include "libffi.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_structs.h"
-#include "php_psi_unions.h"
+#include "token.h"
+#include "parser.h"
+
+#define PSI_PREDEF_TYPES
+#define PSI_PREDEF_CONSTS
+#define PSI_PREDEF_COMPOSITES
+#define PSI_PREDEF_DECLS
+#include "php_psi_posix.h"
 
-PSI_Context *PSI_ContextInit(PSI_Context *C, PSI_ContextOps *ops, PSI_ContextErrorFunc error, unsigned flags)
+struct psi_context *psi_context_init(struct psi_context *C, struct psi_context_ops *ops, psi_error_cb error, unsigned flags)
 {
-	PSI_Data T;
+	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) {
@@ -51,123 +75,124 @@ PSI_Context *PSI_ContextInit(PSI_Context *C, PSI_ContextOps *ops, PSI_ContextErr
 	}
 	memset(C, 0, sizeof(*C));
 
-	C->error = error;
-	C->flags = flags;
+	psi_data_ctor(PSI_DATA(C), error, flags);
 	C->ops = ops;
 
 	if (ops->init) {
 		ops->init(C);
 	}
 
-	ZEND_ASSERT(ops->call != NULL);
-	ZEND_ASSERT(ops->compile != NULL);
+	assert(ops->call != NULL);
+	assert(ops->compile != NULL);
 
 	/* build up predefs in a temporary PSI_Data for validation */
 	memset(&T, 0, sizeof(T));
-	T.error = error;
+	psi_data_ctor_with_dtors(&T, error, flags);
 
 	for (predef_type = &psi_predef_types[0]; predef_type->type_tag; ++predef_type) {
-		decl_type *type = init_decl_type(predef_type->type_tag, predef_type->type_name);
-		decl_var *var = init_decl_var(predef_type->alias, 0, 0); /* FIXME: indirection */
-		decl_arg *def = init_decl_arg(type, var);
+		struct psi_decl_type *type = psi_decl_type_init(predef_type->type_tag, predef_type->type_name);
+		struct psi_decl_var *var = psi_decl_var_init(predef_type->alias, 0, 0); /* FIXME: indirection */
+		struct psi_decl_arg *def = psi_decl_arg_init(type, var);
 
-		T.defs = add_decl_typedef(T.defs, def);
+		T.types = psi_plist_add(T.types, &def);
 	}
 	for (predef_const = &psi_predef_consts[0]; predef_const->type_tag; ++predef_const) {
-		impl_def_val *val = init_impl_def_val(predef_const->val_type_tag, predef_const->val_text);
-		const_type *type = init_const_type(predef_const->type_tag, predef_const->type_name);
-		constant *constant = init_constant(type, predef_const->var_name, val);
+		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);
 
-		T.consts = add_constant(T.consts, constant);
+		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;
-		decl_args *dargs = init_decl_args(NULL);
-		decl_struct *dstruct = init_decl_struct(predef_struct->var_name, dargs);
-
-		dstruct->size = predef_struct->size;
-		dstruct->align = predef_struct->offset;
-		for (member = &predef_struct[1]; member->type_tag; ++member) {
-			decl_type *type;
-			decl_var *dvar;
-			decl_arg *darg;
-
-			type = init_decl_type(member->type_tag, member->type_name);
-			dvar = init_decl_var(member->var_name, member->pointer_level, member->array_size);
-			darg = init_decl_arg(type, dvar);
-			darg->layout = init_decl_struct_layout(member->offset, member->size);
-			dargs = add_decl_arg(dargs, darg);
+	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);
+
+		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 = add_decl_struct(T.structs, dstruct);
-		predef_struct = member;
-	}
-	for (predef_union = &psi_predef_unions[0]; predef_union->type_tag; ++predef_union) {
-		struct psi_predef_union *member;
-		decl_args *dargs = init_decl_args(NULL);
-		decl_union *dunion = init_decl_union(predef_union->var_name, dargs);
-
-		dunion->size = predef_union->size;
-		dunion->align = predef_union->offset;
-		for (member = &predef_union[1]; member->type_tag; ++member) {
-			decl_type *type;
-			decl_var *dvar;
-			decl_arg *darg;
-
-			type = init_decl_type(member->type_tag, member->type_name);
-			dvar = init_decl_var(member->var_name, member->pointer_level, member->array_size);
-			darg = init_decl_arg(type, dvar);
-			darg->layout = init_decl_struct_layout(member->offset, member->size);
-			dargs = add_decl_arg(dargs, darg);
+		for (member = &predef_composite[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);
+
+			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);
+			}
+		}
+		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);
 		}
 
-		T.unions = add_decl_union(T.unions, dunion);
-		predef_union = member;
+		predef_composite = member;
 	}
 	for (predef_decl = &psi_predef_decls[0]; predef_decl->type_tag; ++predef_decl) {
 		struct psi_predef_decl *farg;
-		decl_type *ftype = init_decl_type(predef_decl->type_tag, predef_decl->type_name);
-		decl_var *fname = init_decl_var(predef_decl->var_name, predef_decl->pointer_level, predef_decl->array_size);
-		decl_arg *func = init_decl_arg(ftype, fname);
-		decl_args *args = init_decl_args(NULL);
-		decl *decl = init_decl(init_decl_abi("default"), func, args);
+		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);
 
 		for (farg = &predef_decl[1]; farg->type_tag; ++farg) {
-			decl_type *arg_type = init_decl_type(farg->type_tag, farg->type_name);
-			decl_var *arg_var = init_decl_var(farg->var_name, farg->pointer_level, farg->array_size);
-			decl_arg *darg = init_decl_arg(arg_type, arg_var);
-			args = add_decl_arg(args, darg);
+			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);
 		}
 
-		T.decls = add_decl(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;
-		decl_type *ftype = init_decl_type(predef_decl->type_tag, predef_decl->type_name);
-		decl_var *fname = init_decl_var(predef_decl->var_name, predef_decl->pointer_level, predef_decl->array_size);
-		decl_arg *func = init_decl_arg(ftype, fname);
-		decl_args *args = init_decl_args(NULL);
-		decl *decl = init_decl(init_decl_abi("default"), func, args);
-
-		for (farg = &predef_decl[1]; farg->type_tag; ++farg) {
-			decl_type *arg_type = init_decl_type(farg->type_tag, farg->type_name);
-			decl_var *arg_var = init_decl_var(farg->var_name, farg->pointer_level, farg->array_size);
-			decl_arg *darg = init_decl_arg(arg_type, arg_var);
-			args = add_decl_arg(args, darg);
+		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);
 		}
-		args->varargs = 1;
 
-		T.decls = add_decl(T.decls, decl);
 		predef_decl = farg;
 	}
 
-	PSI_ContextValidateData(PSI_DATA(C), &T);
-
-	C->count = 1;
-	C->data = malloc(sizeof(*C->data));
-	PSI_DataExchange(C->data, &T);
+	psi_context_add_data(C, &T);
 
 	return C;
 }
@@ -175,16 +200,16 @@ PSI_Context *PSI_ContextInit(PSI_Context *C, PSI_ContextOps *ops, PSI_ContextErr
 static int psi_select_dirent(const struct dirent *entry)
 {
 #ifndef FNM_CASEFOLD
-#define FNM_CASEFOLD 0
+# define FNM_CASEFOLD 0
 #endif
 	return 0 == fnmatch("*.psi", entry->d_name, FNM_CASEFOLD);
 }
 
-void PSI_ContextBuild(PSI_Context *C, const char *paths)
+void psi_context_build(struct psi_context *C, const char *paths)
 {
 	int i, n;
 	char *sep = NULL, *cpy = strdup(paths), *ptr = cpy;
-	struct dirent **entries = NULL;
+	struct dirent **entries;
 
 	do {
 		sep = strchr(ptr, ':');
@@ -193,33 +218,39 @@ void PSI_ContextBuild(PSI_Context *C, const char *paths)
 			*sep = 0;
 		}
 
+		entries = NULL;
 		n = php_scandir(ptr, &entries, psi_select_dirent, alphasort);
 
 		if (n > 0) {
 			for (i = 0; i < n; ++i) {
 				char psi[MAXPATHLEN];
-				PSI_Parser P;
+				struct psi_parser P;
 
 				if (MAXPATHLEN <= slprintf(psi, MAXPATHLEN, "%s/%s", ptr, entries[i]->d_name)) {
-					C->error(C, NULL, PSI_WARNING, "Path to PSI file too long: %s/%s",
+					C->error(PSI_DATA(C), NULL, PSI_WARNING, "Path to PSI file too long: %s/%s",
 						ptr, entries[i]->d_name);
 				}
-				if (!PSI_ParserInit(&P, psi, C->error, C->flags)) {
-					C->error(C, NULL, PSI_WARNING, "Failed to init PSI parser (%s): %s",
+				if (!psi_parser_init(&P, C->error, C->flags)) {
+					C->error(PSI_DATA(C), NULL, PSI_WARNING, "Failed to init PSI parser (%s): %s",
+						psi, strerror(errno));
+					continue;
+				}
+				if (!psi_parser_open_file(&P, psi)) {
+					C->error(PSI_DATA(C), NULL, PSI_WARNING, "Failed to open PSI file (%s): %s",
 						psi, strerror(errno));
 					continue;
 				}
 
-				while (0 < PSI_ParserScan(&P)) {
-					PSI_ParserParse(&P, PSI_TokenAlloc(&P));
+				while (0 < psi_parser_scan(&P)) {
+					psi_parser_parse(&P, psi_token_alloc(&P));
 					if (P.num == PSI_T_EOF) {
 						break;
 					}
 				}
 
-				PSI_ParserParse(&P, NULL);
-				PSI_ContextValidate(C, &P);
-				PSI_ParserDtor(&P);
+				psi_parser_parse(&P, NULL);
+				psi_context_add_data(C, PSI_DATA(&P));
+				psi_parser_dtor(&P);
 			}
 		}
 
@@ -234,54 +265,68 @@ void PSI_ContextBuild(PSI_Context *C, const char *paths)
 	} while (sep);
 
 
-	if (PSI_ContextCompile(C) && SUCCESS != zend_register_functions(NULL, C->closures, NULL, MODULE_PERSISTENT)) {
-		C->error(C, NULL, PSI_WARNING, "Failed to register functions!");
+	if (psi_context_compile(C) && SUCCESS != zend_register_functions(NULL, C->closures, NULL, MODULE_PERSISTENT)) {
+		C->error(PSI_DATA(C), NULL, PSI_WARNING, "Failed to register functions!");
 	}
 
 	free(cpy);
-
 }
 
-zend_function_entry *PSI_ContextCompile(PSI_Context *C)
+zend_function_entry *psi_context_compile(struct psi_context *C)
 {
-	size_t i;
 	zend_constant zc;
 
 	zc.flags = CONST_PERSISTENT|CONST_CS;
 	zc.module_number = EG(current_module)->module_number;
 
 	if (C->consts) {
-		for (i = 0; i < C->consts->count; ++i) {
-			constant *c = C->consts->list[i];
+		size_t i = 0;
+		struct psi_const *c;
+
+		while (psi_plist_get(C->consts, i++, &c)) {
+
+			if (zend_get_constant_str(c->name, strlen(c->name))) {
+				continue;
+			}
 
 			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));
 
 			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_init(c->val->text, strlen(c->val->text), 1));
+				break;
+			default:
+				assert(0);
 				break;
 			}
+
 			zend_register_constant(&zc);
 		}
 	}
+
 	if (C->enums) {
-		for (i = 0; i < C->enums->count; ++i) {
-			decl_enum *e = C->enums->list[i];
-			size_t j;
+		size_t i = 0;
+		struct psi_decl_enum *e;
 
-			for (j = 0; j < e->items->count; ++j) {
-				decl_enum_item *i = e->items->list[j];
-				zend_string *name = strpprintf(0, "psi\\%s\\%s", e->name, i->name);
+		while (psi_plist_get(C->enums, i++, &e)) {
+			size_t j = 0;
+			struct psi_decl_enum_item *item;
+
+			while (psi_plist_get(e->items, j++, &item)) {
+				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(i->num, NULL));
+				ZVAL_LONG(&zc.value, psi_long_num_exp(item->num, NULL));
 				zend_register_constant(&zc);
 				zend_string_release(name);
 			}
@@ -292,13 +337,38 @@ zend_function_entry *PSI_ContextCompile(PSI_Context *C)
 }
 
 
-void PSI_ContextCall(PSI_Context *C, decl_callinfo *decl_call, impl_vararg *va)
+ZEND_RESULT_CODE psi_context_call(struct psi_context *C, zend_execute_data *execute_data, zval *return_value, struct psi_impl *impl)
 {
-	C->ops->call(C, decl_call, va);
+	struct psi_call_frame *frame;
+
+	frame = psi_call_frame_init(C, impl->decl, impl);
+
+	if (SUCCESS != psi_call_frame_parse_args(frame, execute_data)) {
+		psi_call_frame_free(frame);
+
+		return FAILURE;
+	}
+
+	psi_call_frame_enter(frame);
+
+	if (SUCCESS != psi_call_frame_do_let(frame)) {
+		psi_call_frame_do_return(frame, return_value);
+		psi_call_frame_free(frame);
+
+		return FAILURE;
+	}
+
+	psi_call_frame_do_call(frame);
+	psi_call_frame_do_return(frame, return_value);
+	psi_call_frame_do_set(frame);
+	psi_call_frame_do_free(frame);
+	psi_call_frame_free(frame);
+
+	return SUCCESS;
 }
 
 
-void PSI_ContextDtor(PSI_Context *C)
+void psi_context_dtor(struct psi_context *C)
 {
 	size_t i;
 	zend_function_entry *zfe;
@@ -307,11 +377,11 @@ void PSI_ContextDtor(PSI_Context *C)
 		C->ops->dtor(C);
 	}
 
-	free_decl_libs(&C->psi.libs);
+	psi_data_dtor(PSI_DATA(C));
 
 	if (C->data) {
 		for (i = 0; i < C->count; ++i) {
-			PSI_DataDtor(&C->data[i]);
+			psi_data_dtor(&C->data[i]);
 		}
 		free(C->data);
 	}
@@ -322,52 +392,40 @@ void PSI_ContextDtor(PSI_Context *C)
 		}
 		free(C->closures);
 	}
-
-	if (C->consts) {
-		if (C->consts->list) {
-			free(C->consts->list);
-		}
-		free(C->consts);
-	}
-	if (C->defs) {
-		if (C->defs->list) {
-			free(C->defs->list);
-		}
-		free(C->defs);
-	}
-	if (C->structs) {
-		if (C->structs->list) {
-			free(C->structs->list);
-		}
-		free(C->structs);
-	}
-	if (C->enums) {
-		if (C->enums->list) {
-			free(C->enums->list);
-		}
-		free(C->enums);
-	}
-	if (C->decls) {
-		if (C->decls->list) {
-			free(C->decls->list);
-		}
-		free(C->decls);
-	}
-	if (C->impls) {
-		if (C->impls->list) {
-			free(C->impls->list);
-		}
-		free(C->impls);
-	}
-
-	memset(C, 0, sizeof(*C));
 }
 
-void PSI_ContextFree(PSI_Context **C)
+void psi_context_free(struct psi_context **C)
 {
 	if (*C) {
-		PSI_ContextDtor(*C);
+		psi_context_dtor(*C);
 		free(*C);
 		*C = NULL;
 	}
 }
+
+bool psi_context_add_data(struct psi_context *C, struct psi_data *P)
+{
+	struct psi_data *D;
+
+	C->data = realloc(C->data, (C->count + 1) * sizeof(*C->data));
+	D = psi_data_exchange(&C->data[C->count++], P);
+
+	return psi_data_validate(PSI_DATA(C), D);
+}
+
+void psi_context_dump(struct psi_context *C, int fd)
+{
+
+	dprintf(fd, "// psi.engine=%s\n",
+			(char *) C->ops->query(C, PSI_CONTEXT_QUERY_SELF, NULL));
+
+	psi_data_dump(fd, PSI_DATA(C));
+
+//	size_t i;
+//	dprintf(fd, "/* parsed\n");
+//	for (i = 0; i < C->count; ++i) {
+//		psi_data_dump(fd, &C->data[i]);
+//	}
+//	dprintf(fd, "*/\n");
+
+}