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

diff --git a/src/parser.h b/src/parser.h
index 8c25e88..de5ba10 100644
--- a/src/parser.h
+++ b/src/parser.h
@@ -13,6 +13,8 @@
 #define BSIZE 256
 
 #define PSI_T_POINTER PSI_T_ASTERISK
+#define PSI_T_LONG_DOUBLE (PSI_T_DOUBLE << 16)
+
 typedef int token_t;
 
 /* in php_psi.h */
@@ -41,6 +43,9 @@ typedef union impl_val {
 	uint64_t u64;
 	float fval;
 	double dval;
+#ifdef HAVE_LONG_DOUBLE
+	long double ldval;
+#endif
 	union {
 		zend_bool bval;
 		zend_long lval;
@@ -82,7 +87,7 @@ static inline decl_type *init_decl_type_ex(token_t type, int argc, ...) {
 				pos = all;
 				ptr = realloc(ptr, 1 + (all += len));
 			} else {
-				ptr = malloc(ptr, 1 + (all = len));
+				ptr = malloc(1 + (all = len));
 			}
 			memcpy(ptr + pos, arg, len);
 		}
@@ -318,7 +323,7 @@ typedef struct decl_callinfo {
 	void *info;
 	size_t argc;
 	void **args;
-	void *rval;
+	void **rval;
 } decl_callinfo;
 
 typedef struct decl {
@@ -375,6 +380,10 @@ typedef struct decl_struct {
 	char *name;
 	decl_args *args;
 	size_t size;
+	struct {
+		void *type;
+		void (*dtor)(void *type);
+	} engine;
 } decl_struct;
 
 static inline decl_struct *init_decl_struct(const char *name, decl_args *args) {
@@ -391,6 +400,9 @@ static inline void free_decl_struct(decl_struct *s) {
 	if (s->args) {
 		free_decl_args(s->args);
 	}
+	if (s->engine.type && s->engine.dtor) {
+		s->engine.dtor(s->engine.type);
+	}
 	free(s->name);
 	free(s);
 }
@@ -1204,7 +1216,7 @@ static inline impl_val *enref_impl_val(void *ptr, decl_var *var) {
 			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) {
+	if (!var->pointer_level ){//&& real_decl_type(var->arg->type)->type != PSI_T_STRUCT) {
 		return ptr;
 	}
 
@@ -1303,7 +1315,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, PSI_TokenAllocSize(token_len, fname_len);
+	T = calloc(1, PSI_TokenAllocSize(token_len, fname_len));
 	T->type = token_typ;
 	T->size = token_len;
 	T->text = &T->buf[0];
@@ -1343,7 +1355,7 @@ static inline PSI_Token *PSI_TokenCat(unsigned argc, ...) {
 
 			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)
+			memcpy(T->file - 1, arg->text, arg->size + 1);
 			T->file = &T->buf[T->size + 1];
 		} else {
 			T = PSI_TokenCopy(arg);