X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-psi;a=blobdiff_plain;f=src%2Fparser.h;h=faa95e4931d9811788bf76e5decaa87a87fc08d6;hp=3d2dd6fefb9bf5e7ddeca8be285cb665652a225f;hb=2421d323be79e4a811a4197914330a8c0124b130;hpb=207ff7bc85e967235f0ad1ffbf47c0f85f375063

diff --git a/src/parser.h b/src/parser.h
index 3d2dd6f..faa95e4 100644
--- a/src/parser.h
+++ b/src/parser.h
@@ -12,6 +12,7 @@
 
 #define BSIZE 256
 
+#define PSI_T_POINTER PSI_T_ASTERISK
 typedef int token_t;
 
 /* in php_psi.h */
@@ -141,6 +142,7 @@ static inline decl_arg *init_decl_arg(decl_type *type, decl_var *var) {
 	decl_arg *arg = calloc(1, sizeof(*arg));
 	arg->type = type;
 	arg->var = var;
+	var->arg = arg;
 	return arg;
 }
 
@@ -234,7 +236,12 @@ typedef struct decl {
 	decl_abi *abi;
 	decl_arg *func;
 	decl_args *args;
-	void *dlptr;
+	struct impl *impl;
+	struct {
+		void *sym;
+		void *info;
+		void **args;
+	} call;
 } decl;
 
 static inline decl* init_decl(decl_abi *abi, decl_arg *func, decl_args *args) {
@@ -326,12 +333,16 @@ static inline void free_decl_structs(decl_structs *ss) {
 typedef union impl_val {
 	char cval;
 	int8_t i8;
+	uint8_t u8;
 	short sval;
 	int16_t i16;
+	uint16_t u16;
 	int ival;
 	int32_t i32;
+	uint32_t u32;
 	long lval;
 	int64_t i64;
+	uint64_t u64;
 	float fval;
 	double dval;
 	union {
@@ -346,12 +357,28 @@ typedef union impl_val {
 static inline impl_val *deref_impl_val(impl_val *ret_val, decl_var *var) {
 	unsigned i;
 
-	if (var->arg->var != var) for (i = 0; i < var->pointer_level; ++i) {
+	if (var->arg->var != var) for (i = 1; i < var->pointer_level; ++i) {
 		ret_val = *(void **) ret_val;
 	}
 	return ret_val;
 }
 
+static inline impl_val *enref_impl_val(void *ptr, decl_var *var) {
+	impl_val *val, *val_ptr;
+	unsigned i;
+
+	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) {
+		val_ptr->ptr = (void **) val_ptr + 1;
+		val_ptr = val_ptr->ptr;
+	}
+	val_ptr->ptr = ptr;
+	return val;
+}
+
 typedef struct impl_type {
 	char *name;
 	token_t type;
@@ -404,6 +431,68 @@ static inline void free_impl_def_val(impl_def_val *def) {
 	free(def);
 }
 
+typedef struct const_type {
+	token_t type;
+	char *name;
+} const_type;
+
+static inline const_type *init_const_type(token_t type, const char *name) {
+	const_type *ct = calloc(1, sizeof(*ct));
+	ct->type = type;
+	ct->name = strdup(name);
+	return ct;
+}
+
+static inline void free_const_type(const_type *type) {
+	free(type->name);
+	free(type);
+}
+
+typedef struct constant {
+	const_type *type;
+	char *name;
+	impl_def_val *val;
+} constant;
+
+static inline constant *init_constant(const_type *type, const char *name, impl_def_val *val) {
+	constant *c = calloc(1, sizeof(*c));
+	c->type = type;
+	c->name = strdup(name);
+	c->val = val;
+	return c;
+}
+
+static inline void free_constant(constant *constant) {
+	free_const_type(constant->type);
+	free(constant->name);
+	free_impl_def_val(constant->val);
+	free(constant);
+}
+
+typedef struct constants {
+	size_t count;
+	constant **list;
+} constants;
+
+static inline constants *add_constant(constants *constants, constant *constant) {
+	if (!constants) {
+		constants = calloc(1, sizeof(*constants));
+	}
+	constants->list = realloc(constants->list, ++constants->count * sizeof(*constants->list));
+	constants->list[constants->count-1] = constant;
+	return constants;
+}
+
+static inline void free_constants(constants *c) {
+	size_t i;
+
+	for (i = 0; i < c->count; ++i) {
+		free_constant(c->list[i]);
+	}
+	free(c->list);
+	free(c);
+}
+
 typedef struct impl_arg {
 	impl_type *type;
 	impl_var *var;
@@ -483,20 +572,68 @@ static inline void free_impl_func(impl_func *f) {
 	free(f);
 }
 
+typedef struct num_exp {
+	token_t t;
+	union {
+		char *numb;
+		char *cnst;
+		decl_var *dvar;
+	} u;
+	token_t operator;
+	struct num_exp *operand;
+} num_exp;
+
+static inline num_exp *init_num_exp(token_t t, void *num) {
+	num_exp *exp = calloc(1, sizeof(*exp));
+	switch (exp->t = t) {
+	case PSI_T_NUMBER:
+		exp->u.numb = strdup(num);
+		break;
+	case PSI_T_NSNAME:
+		exp->u.cnst = strdup(num);
+		break;
+	case PSI_T_NAME:
+		exp->u.dvar = num;
+		break;
+	EMPTY_SWITCH_DEFAULT_CASE();
+	}
+	return exp;
+}
+
+static inline void free_num_exp(num_exp *exp) {
+	switch (exp->t) {
+	case PSI_T_NUMBER:
+		free(exp->u.numb);
+		break;
+	case PSI_T_NSNAME:
+		free(exp->u.cnst);
+		break;
+	case PSI_T_NAME:
+		free_decl_var(exp->u.dvar);
+		break;
+	EMPTY_SWITCH_DEFAULT_CASE();
+	}
+	if (exp->operand) {
+		free_num_exp(exp->operand);
+	}
+	free(exp);
+}
+
 typedef struct let_calloc {
-	size_t n;
-	decl_type *type;
+	num_exp *nmemb;
+	num_exp *size;
 } let_calloc;
 
-static inline let_calloc *init_let_calloc(long n, decl_type *type) {
+static inline let_calloc *init_let_calloc(num_exp *nmemb, num_exp *size) {
 	let_calloc *alloc = calloc(1, sizeof(*alloc));
-	alloc->n = n;
-	alloc->type = type;
+	alloc->nmemb = nmemb;
+	alloc->size = size;
 	return alloc;
 }
 
 static inline void free_let_calloc(let_calloc *alloc) {
-	free_decl_type(alloc->type);
+	free_num_exp(alloc->nmemb);
+	free_num_exp(alloc->size);
 	free(alloc);
 }
 
@@ -570,9 +707,12 @@ static inline void free_let_stmt(let_stmt *stmt) {
 	free(stmt);
 }
 
+struct set_value;
+
 typedef struct set_func {
 	token_t type;
 	char *name;
+	void (*handler)(zval *, struct set_value *set, impl_val *ret_val);
 } set_func;
 
 static inline set_func *init_set_func(token_t type, const char *name) {
@@ -590,6 +730,12 @@ static inline void free_set_func(set_func *func) {
 typedef struct set_value {
 	set_func *func;
 	decl_vars *vars;
+	struct {
+		struct set_value *set;
+		impl_val *val;
+	} outer;
+	struct set_value **inner;
+	size_t count;
 } set_value;
 
 static inline set_value *init_set_value(set_func *func, decl_vars *vars) {
@@ -598,10 +744,22 @@ static inline set_value *init_set_value(set_func *func, decl_vars *vars) {
 	val->vars = vars;
 	return val;
 }
+static inline set_value *add_inner_set_value(set_value *val, set_value *inner) {
+	val->inner = realloc(val->inner, ++val->count * sizeof(*val->inner));
+	val->inner[val->count-1] = inner;
+	return val;
+}
 
 static inline void free_set_value(set_value *val) {
 	free_set_func(val->func);
 	free_decl_vars(val->vars);
+	if (val->inner) {
+		size_t i;
+		for (i = 0; i < val->count; ++i) {
+			free_set_value(val->inner[i]);
+		}
+		free(val->inner);
+	}
 	free(val);
 }
 
@@ -625,36 +783,85 @@ static inline void free_set_stmt(set_stmt *set) {
 }
 
 typedef struct return_stmt {
-	set_func *func;
-	decl_var *decl;
+	set_value *set;
+	decl_arg *decl;
 } return_stmt;
 
-static inline return_stmt *init_return_stmt(set_func *func, decl_var *decl) {
+static inline return_stmt *init_return_stmt(set_value *val) {
 	return_stmt *ret = calloc(1, sizeof(*ret));
-	ret->func = func;
-	ret->decl = decl;
+	ret->set = val;
 	return ret;
 }
 
 static inline void free_return_stmt(return_stmt *ret) {
-	free_set_func(ret->func);
-	free_decl_var(ret->decl);
+	//free_set_func(ret->func);
+	//free_decl_var(ret->decl);
+	free_set_value(ret->set);
 	free(ret);
 }
 
-typedef struct free_stmt {
+typedef struct free_call {
+	char *func;
 	decl_vars *vars;
+	decl *decl;
+} free_call;
+
+static inline free_call *init_free_call(const char *func, decl_vars *vars) {
+	free_call *f = calloc(1, sizeof(*f));
+	f->func = strdup(func);
+	f->vars = vars;
+	return f;
+}
+
+static inline void free_free_call(free_call *f) {
+	free(f->func);
+	free(f);
+}
+
+typedef struct free_calls {
+	free_call **list;
+	size_t count;
+} free_calls;
+
+static inline free_calls *init_free_calls(free_call *f) {
+	free_calls *fcs = calloc(1, sizeof(*fcs));
+	if (f) {
+		fcs->count = 1;
+		fcs->list = calloc(1, sizeof(*fcs->list));
+		fcs->list[0] = f;
+	}
+	return fcs;
+}
+
+static inline void free_free_calls(free_calls *fcs) {
+	size_t i;
+
+	for (i = 0; i < fcs->count; ++i) {
+		free_free_call(fcs->list[i]);
+	}
+	free(fcs->list);
+	free(fcs);
+}
+
+static inline free_calls *add_free_call(free_calls *fcs, free_call *f) {
+	fcs->list = realloc(fcs->list, ++fcs->count * sizeof(*fcs->list));
+	fcs->list[fcs->count-1] = f;
+	return fcs;
+}
+
+typedef struct free_stmt {
+	free_calls *calls;
 } free_stmt;
 
-static inline free_stmt *init_free_stmt(decl_vars *vars) {
-	free_stmt *free_ = calloc(1, sizeof(*free_));
-	free_->vars = vars;
-	return free_;
+static inline free_stmt *init_free_stmt(free_calls *calls) {
+	free_stmt *f = calloc(1, sizeof(*f));
+	f->calls = calls;
+	return f;
 }
 
-static inline void free_free_stmt(free_stmt *free_) {
-	free_decl_vars(free_->vars);
-	free(free_);
+static inline void free_free_stmt(free_stmt *f) {
+	free_free_calls(f->calls);
+	free(f);
 }
 
 typedef struct impl_stmt {
@@ -807,67 +1014,6 @@ static void free_impls(impls *impls) {
 	free(impls);
 }
 
-typedef struct const_type {
-	token_t type;
-	char *name;
-} const_type;
-
-static inline const_type *init_const_type(token_t type, const char *name) {
-	const_type *ct = calloc(1, sizeof(*ct));
-	ct->type = type;
-	ct->name = strdup(name);
-	return ct;
-}
-
-static inline void free_const_type(const_type *type) {
-	free(type->name);
-	free(type);
-}
-
-typedef struct constant {
-	const_type *type;
-	char *name;
-	impl_def_val *val;
-} constant;
-
-static inline constant *init_constant(const_type *type, const char *name, impl_def_val *val) {
-	constant *c = calloc(1, sizeof(*c));
-	c->type = type;
-	c->name = strdup(name);
-	c->val = val;
-	return c;
-}
-
-static inline void free_constant(constant *constant) {
-	free_const_type(constant->type);
-	free(constant->name);
-	free_impl_def_val(constant->val);
-	free(constant);
-}
-
-typedef struct constants {
-	size_t count;
-	constant **list;
-} constants;
-
-static inline constants *add_constant(constants *constants, constant *constant) {
-	if (!constants) {
-		constants = calloc(1, sizeof(*constants));
-	}
-	constants->list = realloc(constants->list, ++constants->count * sizeof(*constants->list));
-	constants->list[constants->count-1] = constant;
-	return constants;
-}
-
-static inline void free_constants(constants *c) {
-	size_t i;
-
-	for (i = 0; i < c->count; ++i) {
-		free_constant(c->list[i]);
-	}
-	free(c->list);
-	free(c);
-}
 
 #define PSI_ERROR 16
 #define PSI_WARNING 32
@@ -970,7 +1116,7 @@ static inline PSI_Token *PSI_TokenAlloc(PSI_Parser *P) {
 	PSI_Token *T;
 	size_t token_len;
 
-	if (P->cur <= P->tok) {
+	if (P->cur < P->tok) {
 		return NULL;
 	}