X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-psi;a=blobdiff_plain;f=src%2Fparser.h;h=8c25e88b221ce26e9e9dcc036de1d09b56f6e2ec;hp=2ea0ec8f2ce9c88be55e6e75e4269b14dfd26658;hb=5abcb8724ac7046d62203ea643e9ce69f63a6a8a;hpb=c2dc24a4967dd767fc4a240f93ca0de4600a8c62

diff --git a/src/parser.h b/src/parser.h
index 2ea0ec8..8c25e88 100644
--- a/src/parser.h
+++ b/src/parser.h
@@ -65,6 +65,40 @@ static inline decl_type *init_decl_type(token_t type, const char *name) {
 	return t;
 }
 
+static inline decl_type *init_decl_type_ex(token_t type, int argc, ...) {
+	va_list argv;
+	char *ptr, *arg;
+	unsigned i;
+	size_t len, pos = 0, all = 0;
+	decl_type *t = calloc(1, sizeof(*t));
+
+	va_start(argv, argc);
+	for (i = 0; i < argc; ++i) {
+		arg = va_arg(argv, char *);
+		len = va_arg(argv, size_t);
+
+		if (len) {
+			if (all) {
+				pos = all;
+				ptr = realloc(ptr, 1 + (all += len));
+			} else {
+				ptr = malloc(ptr, 1 + (all = len));
+			}
+			memcpy(ptr + pos, arg, len);
+		}
+	}
+	va_end(argv);
+
+	if (!all) {
+		ptr = calloc(1, 1);
+	} else {
+		ptr[all] = 0;
+	}
+	t->type = type;
+	t->name = ptr;
+	return t;
+}
+
 static inline decl_type *real_decl_type(decl_type *type) {
 	while (type->real) {
 		type = type->real;
@@ -833,7 +867,7 @@ static inline void free_set_value(set_value *val) {
 	if (val->vars) {
 		free_decl_vars(val->vars);
 	}
-	if (val->inner) {
+	if (val->inner && (!val->outer.set || val->outer.set->inner != val->inner)) {
 		size_t i;
 		for (i = 0; i < val->count; ++i) {
 			free_set_value(val->inner[i]);
@@ -1145,7 +1179,16 @@ static inline void add_decl_lib(decl_libs *libs, void *dlopened) {
 static inline impl_val *deref_impl_val(impl_val *ret_val, decl_var *var) {
 	unsigned i;
 
-	if (var->arg->var != var) for (i = 1; i < var->pointer_level; ++i) {
+	ZEND_ASSERT(var->arg->var != var);
+#if 0
+	fprintf(stderr, "deref: %s pl=%u:%u as=%u:%u %p\n",
+			var->name, var->pointer_level, var->arg->var->pointer_level,
+			var->array_size, var->arg->var->array_size, ret_val);
+#endif
+	for (i = 0; i < var->pointer_level; ++i) {
+#if 0
+		fprintf(stderr, "-- %p %p %p\n", ret_val, *(void**)ret_val, ret_val->ptr);
+#endif
 		ret_val = *(void **) ret_val;
 	}
 	return ret_val;
@@ -1155,11 +1198,21 @@ static inline impl_val *enref_impl_val(void *ptr, decl_var *var) {
 	impl_val *val, *val_ptr;
 	unsigned i;
 
+	ZEND_ASSERT(var->arg->var == var);
+#if 0
+	fprintf(stderr, "enref: %s pl=%u:%u as=%u:%u\n",
+			var->name, var->pointer_level, var->arg->var->pointer_level,
+			var->array_size, var->arg->var->array_size);
+#endif
 	if (!var->pointer_level && real_decl_type(var->arg->type)->type != PSI_T_STRUCT) {
 		return ptr;
 	}
+
 	val = val_ptr = calloc(var->pointer_level + 1, sizeof(void *));
-	for (i = 1; i < var->pointer_level; ++i) {
+	for (i = !var->arg->var->array_size; i < var->pointer_level; ++i) {
+#if 0
+		fprintf(stderr, "++\n");
+#endif
 		val_ptr->ptr = (void **) val_ptr + 1;
 		val_ptr = val_ptr->ptr;
 	}
@@ -1168,16 +1221,14 @@ static inline impl_val *enref_impl_val(void *ptr, decl_var *var) {
 }
 
 static inline impl_val *struct_member_ref(decl_arg *set_arg, impl_val *struct_ptr, impl_val **to_free) {
-	void *ptr = (char *) struct_ptr->ptr + set_arg->layout->pos;
-	impl_val *val = enref_impl_val(ptr, set_arg->var);
-
-	if (val != ptr) {
-		*to_free = val;
-	}
-
-	return val;
+	void *ptr = (char *) struct_ptr + set_arg->layout->pos;
+#if 0
+	fprintf(stderr, "struct member %s: %p\n", set_arg->var->name, ptr);
+#endif
+	return ptr;
 }
 
+
 #define PSI_ERROR 16
 #define PSI_WARNING 32
 typedef void (*psi_error_cb)(PSI_Token *token, int type, const char *msg, ...);
@@ -1235,6 +1286,10 @@ typedef struct PSI_Parser {
 	char *cur, *tok, *lim, *eof, *ctx, *mrk, buf[BSIZE];
 } PSI_Parser;
 
+static inline size_t PSI_TokenAllocSize(size_t token_len, size_t fname_len) {
+	return sizeof(PSI_Token) + token_len + fname_len + sizeof(unsigned) + 2;
+}
+
 static inline PSI_Token *PSI_TokenAlloc(PSI_Parser *P) {
 	PSI_Token *T;
 	size_t token_len, fname_len;
@@ -1248,7 +1303,7 @@ static inline PSI_Token *PSI_TokenAlloc(PSI_Parser *P) {
 	token_len = P->cur - P->tok;
 	fname_len = strlen(P->psi.file.fn);
 
-	T = calloc(1, sizeof(*T) + token_len + fname_len + sizeof(unsigned) + 2);
+	T = calloc(1, PSI_TokenAllocSize(token_len, fname_len);
 	T->type = token_typ;
 	T->size = token_len;
 	T->text = &T->buf[0];
@@ -1263,8 +1318,7 @@ static inline PSI_Token *PSI_TokenAlloc(PSI_Parser *P) {
 }
 
 static inline PSI_Token *PSI_TokenCopy(PSI_Token *src) {
-	size_t fname_len = strlen(src->file);
-	size_t strct_len = sizeof(*src) + src->size + fname_len + sizeof(unsigned) + 2;
+	size_t strct_len = PSI_TokenAllocSize(src->size, strlen(src->file));
 	PSI_Token *ptr = malloc(strct_len);
 
 	memcpy(ptr, src, strct_len);
@@ -1275,6 +1329,32 @@ static inline PSI_Token *PSI_TokenCopy(PSI_Token *src) {
 	return ptr;
 }
 
+static inline PSI_Token *PSI_TokenCat(unsigned argc, ...) {
+	va_list argv;
+	unsigned i;
+	PSI_Token *T = NULL;
+
+	va_start(argv, argc);
+	for (i = 0; i < argc; ++i) {
+		PSI_Token *arg = va_arg(argv, PSI_Token *);
+
+		if (T) {
+			size_t fname_len = strlen(T->file);
+
+			T = realloc(T, PSI_TokenAllocSize(T->size + arg->size, fname_len));
+			memmove(&T->buf[T->size + 1], T->file, fname_len + 1);
+			memcpy(T->file - 1, arg->text, arg->size + 1)
+			T->file = &T->buf[T->size + 1];
+		} else {
+			T = PSI_TokenCopy(arg);
+			T->type = PSI_T_NAME;
+		}
+	}
+	va_end(argv);
+
+	return T;
+}
+
 static inline const char *PSI_TokenLocation(PSI_Token *t) {
 	return t ? t->file : "<builtin>:0:0";
 }