X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-psi;a=blobdiff_plain;f=src%2Fparser.h;h=cb069c90e80216f4540846b99a0aeaa27e1bdd10;hp=62f5e31eb0bb2f79bedb4d94540ba9e309cc368c;hb=469fe3395cb9696e32bcd64639f22113d8fb2ec6;hpb=6e8b5c090b44299f82f4e748d8bf6b8bc5b66414

diff --git a/src/parser.h b/src/parser.h
index 62f5e31..cb069c9 100644
--- a/src/parser.h
+++ b/src/parser.h
@@ -14,6 +14,10 @@
 
 typedef int token_t;
 
+/* in php_psi.h */
+size_t psi_t_alignment(token_t);
+size_t psi_t_size(token_t);
+
 typedef struct PSI_Token {
 	token_t type;
 	unsigned line;
@@ -28,7 +32,7 @@ typedef struct decl_type {
 	struct decl_struct *strct;
 } decl_type;
 
-static inline decl_type *init_decl_type(token_t type, char *name) {
+static inline decl_type *init_decl_type(token_t type, const char *name) {
 	decl_type *t = calloc(1, sizeof(*t));
 	t->type = type;
 	t->name = strdup(name);
@@ -52,8 +56,8 @@ typedef struct decl_typedef {
 	decl_type *type;
 } decl_typedef;
 
-static inline decl_typedef *init_decl_typedef(char *name, decl_type *type) {
-	decl_typedef *t = malloc(sizeof(*t));
+static inline decl_typedef *init_decl_typedef(const char *name, decl_type *type) {
+	decl_typedef *t = calloc(1, sizeof(*t));
 	t->alias = strdup(name);
 	t->type = type;
 	return t;
@@ -96,8 +100,8 @@ typedef struct decl_var {
 	struct decl_arg *arg;
 } decl_var;
 
-static inline decl_var *init_decl_var(char *name, unsigned pl, unsigned as) {
-	decl_var *v = malloc(sizeof(*v));
+static inline decl_var *init_decl_var(const char *name, unsigned pl, unsigned as) {
+	decl_var *v = calloc(1, sizeof(*v));
 	v->name = (char *) strdup((const char *) name);
 	v->pointer_level = pl;
 	v->array_size = as;
@@ -116,7 +120,7 @@ typedef struct decl_arg {
 } decl_arg;
 
 static inline decl_arg *init_decl_arg(decl_type *type, decl_var *var) {
-	decl_arg *arg = malloc(sizeof(*arg));
+	decl_arg *arg = calloc(1, sizeof(*arg));
 	arg->type = type;
 	arg->var = var;
 	arg->let = NULL;
@@ -135,9 +139,9 @@ typedef struct decl_vars {
 } decl_vars;
 
 static inline decl_vars *init_decl_vars(decl_var *var) {
-	decl_vars *vars = malloc(sizeof(*vars));
+	decl_vars *vars = calloc(1, sizeof(*vars));
 	vars->count = 1;
-	vars->vars = malloc(sizeof(*vars->vars));
+	vars->vars = calloc(1, sizeof(*vars->vars));
 	vars->vars[0] = var;
 	return vars;
 }
@@ -164,9 +168,9 @@ typedef struct decl_args {
 } decl_args;
 
 static inline decl_args *init_decl_args(decl_arg *arg) {
-	decl_args *args = malloc(sizeof(*args));
+	decl_args *args = calloc(1, sizeof(*args));
 	args->count = 1;
-	args->args = malloc(sizeof(*args->args));
+	args->args = calloc(1, sizeof(*args->args));
 	args->args[0] = arg;
 	return args;
 }
@@ -191,8 +195,8 @@ typedef struct decl_abi {
 	char *convention;
 } decl_abi;
 
-static inline decl_abi *init_decl_abi(char *convention) {
-	decl_abi *abi = malloc(sizeof(*abi));
+static inline decl_abi *init_decl_abi(const char *convention) {
+	decl_abi *abi = calloc(1, sizeof(*abi));
 	abi->convention = strdup(convention);
 	return abi;
 }
@@ -210,7 +214,7 @@ typedef struct decl {
 } decl;
 
 static inline decl* init_decl(decl_abi *abi, decl_arg *func, decl_args *args) {
-	decl *d = malloc(sizeof(*d));
+	decl *d = calloc(1, sizeof(*d));
 	d->abi = abi;
 	d->func = func;
 	d->args = args;
@@ -261,7 +265,7 @@ typedef struct decl_struct {
 	decl_struct_layout *layout;
 } decl_struct;
 
-static inline decl_struct *init_decl_struct(char *name, decl_args *args) {
+static inline decl_struct *init_decl_struct(const char *name, decl_args *args) {
 	decl_struct *s = calloc(1, sizeof(*s));
 	s->name = strdup(name);
 	s->args = args;
@@ -272,10 +276,19 @@ static inline void free_decl_struct(decl_struct *s) {
 	if (s->args) {
 		free_decl_args(s->args);
 	}
+	if (s->layout) {
+		free(s->layout);
+	}
 	free(s->name);
 	free(s);
 }
 
+static inline size_t decl_struct_size(decl_struct *s) {
+	size_t c = s->args->count - 1;
+	decl_type *type = real_decl_type(s->args->args[c]->type);
+	return s->layout[c].pos + psi_t_alignment(type->type);
+}
+
 typedef struct decl_structs {
 	size_t count;
 	decl_struct **list;
@@ -301,21 +314,30 @@ static inline void free_decl_structs(decl_structs *ss) {
 }
 
 typedef union impl_val {
-	unsigned char bval;
 	char cval;
+	int8_t i8;
 	short sval;
+	int16_t i16;
 	int ival;
+	int32_t i32;
+	long lval;
+	int64_t i64;
+	float fval;
 	double dval;
-	zend_long lval;
-	zend_string *str;
+	union {
+		zend_bool bval;
+		zend_long lval;
+		zend_string *str;
+	} zend;
 	void *ptr;
+	uint8_t _dbg[sizeof(void *)];
 } impl_val;
 
-static inline impl_val *deref_impl_val(unsigned level, impl_val *ret_val, decl_arg *darg) {
+static inline impl_val *deref_impl_val(impl_val *ret_val, decl_var *var) {
 	unsigned i;
 
-	for (i = level; i < darg->var->pointer_level && ret_val->ptr; ++i) {
-		ret_val = *(void **)ret_val;
+	if (var->arg->var != var) for (i = 0; i < var->pointer_level; ++i) {
+		ret_val = *(void **) ret_val;
 	}
 	return ret_val;
 }
@@ -325,11 +347,11 @@ typedef struct impl_type {
 	token_t type;
 } impl_type;
 
-static inline impl_type *init_impl_type(token_t type, char *name) {
-	impl_type *t = malloc(sizeof(*t));
+static inline impl_type *init_impl_type(token_t type, const char *name) {
+	impl_type *t = calloc(1, sizeof(*t));
 
 	t->type = type;
-	t->name = (char *) strdup((const char *) name);
+	t->name = strdup(name);
 	return t;
 }
 
@@ -343,9 +365,9 @@ typedef struct impl_var {
 	unsigned reference:1;
 } impl_var;
 
-static inline impl_var *init_impl_var(char *name, int is_reference) {
-	impl_var *var = malloc(sizeof(*var));
-	var->name = (char *) strdup((const char *) name);
+static inline impl_var *init_impl_var(const char *name, int is_reference) {
+	impl_var *var = calloc(1, sizeof(*var));
+	var->name = strdup(name);
 	var->reference = is_reference;
 	return var;
 }
@@ -360,10 +382,10 @@ typedef struct impl_def_val {
 	char *text;
 } impl_def_val;
 
-static inline impl_def_val *init_impl_def_val(PSI_Token *T) {
-	impl_def_val *def = malloc(sizeof(*def));
-	def->type = T->type;
-	def->text = strdup(T->text);
+static inline impl_def_val *init_impl_def_val(token_t t, const char *text) {
+	impl_def_val *def = calloc(1, sizeof(*def));
+	def->type = t;
+	def->text = strdup(text);
 	return def;
 }
 
@@ -381,7 +403,7 @@ typedef struct impl_arg {
 } impl_arg;
 
 static inline impl_arg *init_impl_arg(impl_type *type, impl_var *var, impl_def_val *def) {
-	impl_arg *arg = malloc(sizeof(*arg));
+	impl_arg *arg = calloc(1, sizeof(*arg));
 	arg->type = type;
 	arg->var = var;
 	arg->def = def;
@@ -403,8 +425,8 @@ typedef struct impl_args {
 } impl_args;
 
 static inline impl_args *init_impl_args(impl_arg *arg) {
-	impl_args *args = malloc(sizeof(*args));
-	args->args = malloc(sizeof(*args->args));
+	impl_args *args = calloc(1, sizeof(*args));
+	args->args = calloc(1, sizeof(*args->args));
 	if (arg) {
 		args->count = 1;
 		args->args[0] = arg;
@@ -439,7 +461,7 @@ typedef struct impl_func {
 } impl_func;
 
 static inline impl_func *init_impl_func(char *name, impl_args *args, impl_type *type, int ret_reference) {
-	impl_func *func = malloc(sizeof(*func));
+	impl_func *func = calloc(1, sizeof(*func));
 	func->name = strdup(name);
 	func->args = args ? args : init_impl_args(NULL);
 	func->return_type = type;
@@ -454,21 +476,41 @@ static inline void free_impl_func(impl_func *f) {
 	free(f);
 }
 
+typedef struct let_calloc {
+	size_t n;
+	decl_type *type;
+} let_calloc;
+
+static inline let_calloc *init_let_calloc(long n, decl_type *type) {
+	let_calloc *alloc = calloc(1, sizeof(*alloc));
+	alloc->n = n;
+	alloc->type = type;
+	return alloc;
+}
+
+static inline void free_let_calloc(let_calloc *alloc) {
+	free_decl_type(alloc->type);
+	free(alloc);
+}
+
 typedef struct let_func {
 	token_t type;
 	char *name;
-	size_t size;
+	let_calloc *alloc;
 } let_func;
 
-static inline let_func *init_let_func(token_t type, char *name, size_t size) {
-	let_func *func = malloc(sizeof(*func));
+static inline let_func *init_let_func(token_t type, const char *name, let_calloc *alloc) {
+	let_func *func = calloc(1, sizeof(*func));
 	func->type = type;
 	func->name = strdup(name);
-	func->size = size;
+	func->alloc = alloc;
 	return func;
 }
 
 static inline void free_let_func(let_func *func) {
+	if (func->alloc) {
+		free_let_calloc(func->alloc);
+	}
 	free(func->name);
 	free(func);
 }
@@ -480,7 +522,7 @@ typedef struct let_value {
 } let_value;
 
 static inline let_value *init_let_value(let_func *func, impl_var *var, int is_reference) {
-	let_value *val = malloc(sizeof(*val));
+	let_value *val = calloc(1, sizeof(*val));
 	val->is_reference = is_reference;
 	val->func = func;
 	val->var = var;
@@ -526,10 +568,10 @@ typedef struct set_func {
 	char *name;
 } set_func;
 
-static inline set_func *init_set_func(token_t type, char *name) {
-	set_func *func = malloc(sizeof(*func));
+static inline set_func *init_set_func(token_t type, const char *name) {
+	set_func *func = calloc(1, sizeof(*func));
 	func->type = type;
-	func->name = (char *) strdup((const char *) name);
+	func->name = strdup(name);
 	return func;
 }
 
@@ -544,7 +586,7 @@ typedef struct set_value {
 } set_value;
 
 static inline set_value *init_set_value(set_func *func, decl_vars *vars) {
-	set_value *val = malloc(sizeof(*val));
+	set_value *val = calloc(1, sizeof(*val));
 	val->func = func;
 	val->vars = vars;
 	return val;
@@ -563,7 +605,7 @@ typedef struct set_stmt {
 } set_stmt;
 
 static inline set_stmt *init_set_stmt(impl_var *var, set_value *val) {
-	set_stmt *set = malloc(sizeof(*set));
+	set_stmt *set = calloc(1, sizeof(*set));
 	set->var = var;
 	set->val = val;
 	return set;
@@ -581,7 +623,7 @@ typedef struct return_stmt {
 } return_stmt;
 
 static inline return_stmt *init_return_stmt(set_func *func, decl_var *decl) {
-	return_stmt *ret = malloc(sizeof(*ret));
+	return_stmt *ret = calloc(1, sizeof(*ret));
 	ret->func = func;
 	ret->decl = decl;
 	return ret;
@@ -598,7 +640,7 @@ typedef struct free_stmt {
 } free_stmt;
 
 static inline free_stmt *init_free_stmt(decl_vars *vars) {
-	free_stmt *free_ = malloc(sizeof(*free_));
+	free_stmt *free_ = calloc(1, sizeof(*free_));
 	free_->vars = vars;
 	return free_;
 }
@@ -620,7 +662,7 @@ typedef struct impl_stmt {
 } impl_stmt;
 
 static inline impl_stmt *init_impl_stmt(token_t type, void *ptr) {
-	impl_stmt *stmt = malloc(sizeof(*stmt));
+	impl_stmt *stmt = calloc(1, sizeof(*stmt));
 	stmt->type = type;
 	stmt->s.ptr = ptr;
 	return stmt;
@@ -722,7 +764,7 @@ typedef struct impl {
 } impl;
 
 static inline impl *init_impl(impl_func *func, impl_stmts *stmts) {
-	impl *i = malloc(sizeof(*i));
+	impl *i = calloc(1, sizeof(*i));
 	i->func = func;
 	i->stmts = stmts;
 	return i;
@@ -764,7 +806,7 @@ typedef struct const_type {
 } const_type;
 
 static inline const_type *init_const_type(token_t type, const char *name) {
-	const_type *ct = malloc(sizeof(*ct));
+	const_type *ct = calloc(1, sizeof(*ct));
 	ct->type = type;
 	ct->name = strdup(name);
 	return ct;
@@ -781,8 +823,8 @@ typedef struct constant {
 	impl_def_val *val;
 } constant;
 
-static inline constant *init_constant(const_type *type, char *name, impl_def_val *val) {
-	constant *c = malloc(sizeof(*c));
+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;
@@ -887,7 +929,7 @@ static inline PSI_Token *PSI_TokenAlloc(PSI_Parser *P) {
 
 	token_len = P->cur - P->tok;
 
-	T = malloc(sizeof(*T) + token_len);
+	T = calloc(1, sizeof(*T) + token_len);
 	T->type = P->num;
 	T->line = P->line;
 	T->size = token_len;