X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-psi;a=blobdiff_plain;f=src%2Fparser.h;h=7faa43b712f74a54b20cad9b657f89ac55ecf0ef;hp=1321f6cc8b4292948f2a793cba4f8184b9be33ea;hb=43f9e142088705cc003bb021a32ecd4d4d3b3d2b;hpb=70136a34090807976d66b361fbc8963c0c91f17e

diff --git a/src/parser.h b/src/parser.h
index 1321f6c..7faa43b 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 */
@@ -20,19 +21,44 @@ size_t psi_t_size(token_t);
 
 typedef struct PSI_Token {
 	token_t type;
-	unsigned line;
-	size_t size;
-	char text[1];
+	size_t size, line, col;
+	char *text, *file;
+	char buf[1];
 } PSI_Token;
 
+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 {
+		zend_bool bval;
+		zend_long lval;
+		zend_string *str;
+	} zend;
+	void *ptr;
+	uint8_t _dbg[sizeof(void *)];
+} impl_val;
+
 typedef struct decl_type {
+	PSI_Token *token;
 	char *name;
 	token_t type;
 	struct decl_type *real;
 	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);
@@ -56,8 +82,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;
@@ -100,8 +126,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;
@@ -113,23 +139,48 @@ static inline void free_decl_var(decl_var *var) {
 	free(var);
 }
 
+typedef struct decl_struct_layout {
+	size_t pos;
+	size_t len;
+} decl_struct_layout;
+
+static inline decl_struct_layout *init_decl_struct_layout(size_t pos, size_t len) {
+	decl_struct_layout *l = calloc(1, sizeof(*l));
+
+	l->pos = pos;
+	l->len = len;
+	return l;
+}
+
+static inline void free_decl_struct_layout(decl_struct_layout *l) {
+	free(l);
+}
+
 typedef struct decl_arg {
 	decl_type *type;
 	decl_var *var;
+	decl_struct_layout *layout;
 	struct let_stmt *let;
+	impl_val val;
+	void *ptr;
+	void *mem;
 } 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;
+	var->arg = arg;
+	arg->ptr = &arg->val;
 	return arg;
 }
 
 static inline void free_decl_arg(decl_arg *arg) {
 	free_decl_type(arg->type);
 	free_decl_var(arg->var);
+	if (arg->layout) {
+		free_decl_struct_layout(arg->layout);
+	}
 	free(arg);
 }
 
@@ -139,10 +190,12 @@ typedef struct decl_vars {
 } decl_vars;
 
 static inline decl_vars *init_decl_vars(decl_var *var) {
-	decl_vars *vars = malloc(sizeof(*vars));
-	vars->count = 1;
-	vars->vars = malloc(sizeof(*vars->vars));
-	vars->vars[0] = var;
+	decl_vars *vars = calloc(1, sizeof(*vars));
+	if (var) {
+		vars->count = 1;
+		vars->vars = calloc(1, sizeof(*vars->vars));
+		vars->vars[0] = var;
+	}
 	return vars;
 }
 
@@ -165,13 +218,16 @@ static inline void free_decl_vars(decl_vars *vars) {
 typedef struct decl_args {
 	decl_arg **args;
 	size_t count;
+	unsigned varargs:1;
 } decl_args;
 
 static inline decl_args *init_decl_args(decl_arg *arg) {
-	decl_args *args = malloc(sizeof(*args));
-	args->count = 1;
-	args->args = malloc(sizeof(*args->args));
-	args->args[0] = arg;
+	decl_args *args = calloc(1, sizeof(*args));
+	if (arg) {
+		args->count = 1;
+		args->args = calloc(1, sizeof(*args->args));
+		args->args[0] = arg;
+	}
 	return args;
 }
 
@@ -195,8 +251,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;
 }
@@ -206,15 +262,24 @@ static inline void free_decl_abi(decl_abi *abi) {
 	free(abi);
 }
 
+typedef struct decl_callinfo {
+	void *sym;
+	void *info;
+	size_t argc;
+	void **args;
+	void *rval;
+} decl_callinfo;
+
 typedef struct decl {
 	decl_abi *abi;
 	decl_arg *func;
 	decl_args *args;
-	void *dlptr;
+	struct impl *impl;
+	decl_callinfo call;
 } 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;
@@ -254,18 +319,13 @@ static inline void free_decls(decls *decls) {
 	free(decls);
 }
 
-typedef struct decl_struct_layout {
-	size_t pos;
-	size_t len;
-} decl_struct_layout;
-
 typedef struct decl_struct {
 	char *name;
 	decl_args *args;
-	decl_struct_layout *layout;
+	size_t size;
 } 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;
@@ -276,19 +336,10 @@ 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;
@@ -313,37 +364,16 @@ static inline void free_decl_structs(decl_structs *ss) {
 	free(ss);
 }
 
-typedef union impl_val {
-	unsigned char bval;
-	char cval;
-	short sval;
-	int ival;
-	float fval;
-	double dval;
-	zend_long lval;
-	zend_string *str;
-	void *ptr;
-} impl_val;
-
-static inline impl_val *deref_impl_val(unsigned level, impl_val *ret_val, decl_arg *darg) {
-	unsigned i;
-
-	for (i = level; i < darg->var->pointer_level && ret_val->ptr; ++i) {
-		ret_val = *(void **)ret_val;
-	}
-	return ret_val;
-}
-
 typedef struct impl_type {
 	char *name;
 	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;
 }
 
@@ -357,9 +387,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;
 }
@@ -374,10 +404,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;
 }
 
@@ -386,6 +416,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;
@@ -395,7 +487,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;
@@ -414,17 +506,15 @@ static inline void free_impl_arg(impl_arg *arg) {
 typedef struct impl_args {
 	impl_arg **args;
 	size_t count;
+	impl_arg *vararg;
 } 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));
 	if (arg) {
 		args->count = 1;
+		args->args = calloc(1, sizeof(*args->args));
 		args->args[0] = arg;
-	} else {
-		args->count = 0;
-		args->args = NULL;
 	}
 	return args;
 }
@@ -453,7 +543,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;
@@ -468,59 +558,164 @@ static inline void free_impl_func(impl_func *f) {
 	free(f);
 }
 
+typedef struct num_exp {
+	token_t t;
+	union {
+		char *numb;
+		constant *cnst;
+		decl_var *dvar;
+	} u;
+	token_t operator;
+	int (*calculator)(int t1, impl_val *v1, int t2, impl_val *v2, impl_val *res);
+	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:
+	case PSI_T_NSNAME:
+		exp->u.numb = 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:
+		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 {
+	num_exp *nmemb;
+	num_exp *size;
+} let_calloc;
+
+static inline let_calloc *init_let_calloc(num_exp *nmemb, num_exp *size) {
+	let_calloc *alloc = calloc(1, sizeof(*alloc));
+	alloc->nmemb = nmemb;
+	alloc->size = size;
+	return alloc;
+}
+
+static inline void free_let_calloc(let_calloc *alloc) {
+	free_num_exp(alloc->nmemb);
+	free_num_exp(alloc->size);
+	free(alloc);
+}
+
 typedef struct let_func {
 	token_t type;
 	char *name;
-	size_t size;
+	impl_var *var;
+	impl_arg *arg;
 } 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, impl_var *var) {
+	let_func *func = calloc(1, sizeof(*func));
 	func->type = type;
 	func->name = strdup(name);
-	func->size = size;
+	func->var = var;
 	return func;
 }
 
 static inline void free_let_func(let_func *func) {
+	free_impl_var(func->var);
 	free(func->name);
 	free(func);
 }
 
-typedef struct let_value {
-	let_func *func;
-	impl_var *var;
-	unsigned is_reference:1;
-} let_value;
-
-static inline let_value *init_let_value(let_func *func, impl_var *var, int is_reference) {
-	let_value *val = malloc(sizeof(*val));
-	val->is_reference = is_reference;
-	val->func = func;
-	val->var = var;
-	return val;
+#define PSI_LET_REFERENCE 0x1;
+typedef struct let_val {
+	enum let_val_kind {
+		PSI_LET_NULL,
+		PSI_LET_NUMEXP,
+		PSI_LET_CALLOC,
+		PSI_LET_FUNC,
+		PSI_LET_TMP,
+	} kind;
+	union {
+		num_exp *num;
+		let_calloc *alloc;
+		let_func *func;
+		decl_var *var;
+	} data;
+	union {
+		struct {
+			unsigned is_reference:1;
+		} one;
+		unsigned all;
+	} flags;
+} let_val;
+
+static inline let_val *init_let_val(enum let_val_kind kind, void *data) {
+	let_val *let = calloc(1, sizeof(*let));
+	switch (let->kind = kind) {
+	case PSI_LET_NULL:
+		break;
+	case PSI_LET_NUMEXP:
+		let->data.num = data;
+		break;
+	case PSI_LET_CALLOC:
+		let->data.alloc = data;
+		break;
+	case PSI_LET_FUNC:
+		let->data.func = data;
+		break;
+	case PSI_LET_TMP:
+		let->data.var = data;
+		break;
+	EMPTY_SWITCH_DEFAULT_CASE();
+	}
+	return let;
 }
 
-static inline void free_let_value(let_value *val) {
-	if (val->func) {
-		free_let_func(val->func);
-	}
-	if (val->var) {
-		free_impl_var(val->var);
+static inline void free_let_val(let_val *let) {
+	switch (let->kind) {
+	case PSI_LET_NULL:
+		break;
+	case PSI_LET_NUMEXP:
+		free_num_exp(let->data.num);
+		break;
+	case PSI_LET_CALLOC:
+		free_let_calloc(let->data.alloc);
+		break;
+	case PSI_LET_FUNC:
+		free_let_func(let->data.func);
+		break;
+	case PSI_LET_TMP:
+		free_decl_var(let->data.var);
+		break;
+	EMPTY_SWITCH_DEFAULT_CASE();
 	}
-	free(val);
+	free(let);
 }
 
 typedef struct let_stmt {
 	decl_var *var;
-	let_value *val;
-	impl_arg *arg;
-	impl_val out;
+	let_val *val;
+
 	void *ptr;
-	void *mem;
 } let_stmt;
 
-static inline let_stmt *init_let_stmt(decl_var *var, let_value *val) {
+static inline let_stmt *init_let_stmt(decl_var *var, let_val *val) {
 	let_stmt *let = calloc(1, sizeof(*let));
 	let->var = var;
 	let->val = val;
@@ -528,22 +723,28 @@ static inline let_stmt *init_let_stmt(decl_var *var, let_value *val) {
 }
 
 static inline void free_let_stmt(let_stmt *stmt) {
-	free_decl_var(stmt->var);
 	if (stmt->val) {
-		free_let_value(stmt->val);
+		if (stmt->val->kind == PSI_LET_TMP && stmt->var->arg) {
+			free_decl_arg(stmt->var->arg);
+		}
+		free_let_val(stmt->val);
 	}
+	free_decl_var(stmt->var);
 	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, 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;
 }
 
@@ -555,18 +756,40 @@ static inline void free_set_func(set_func *func) {
 typedef struct set_value {
 	set_func *func;
 	decl_vars *vars;
+	num_exp *num;
+	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) {
-	set_value *val = malloc(sizeof(*val));
+	set_value *val = calloc(1, sizeof(*val));
 	val->func = func;
 	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);
+	}
+	if (val->num) {
+		free_num_exp(val->num);
+	}
 	free(val);
 }
 
@@ -577,7 +800,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;
@@ -590,36 +813,86 @@ 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) {
-	return_stmt *ret = malloc(sizeof(*ret));
-	ret->func = func;
-	ret->decl = decl;
+static inline return_stmt *init_return_stmt(set_value *val) {
+	return_stmt *ret = calloc(1, sizeof(*ret));
+	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_decl_vars(f->vars);
+	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_ = malloc(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 {
@@ -634,7 +907,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;
@@ -736,7 +1009,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;
@@ -772,88 +1045,107 @@ static void free_impls(impls *impls) {
 	free(impls);
 }
 
-typedef struct const_type {
-	token_t type;
-	char *name;
-} const_type;
+typedef struct decl_file {
+	char *ln;
+	char *fn;
+} decl_file;
 
-static inline const_type *init_const_type(token_t type, const char *name) {
-	const_type *ct = malloc(sizeof(*ct));
-	ct->type = type;
-	ct->name = strdup(name);
-	return ct;
+static inline void free_decl_file(decl_file *file) {
+	if (file->ln) {
+		free(file->ln);
+	}
+	if (file->fn) {
+		free(file->fn);
+	}
+	memset(file, 0, sizeof(*file));
 }
 
-static inline void free_const_type(const_type *type) {
-	free(type->name);
-	free(type);
+typedef struct decl_libs {
+	void **dl;
+	size_t count;
+} decl_libs;
+
+static inline void free_decl_libs(decl_libs *libs) {
+	if (libs->dl) {
+		size_t i;
+		for (i = 0; i < libs->count; ++i) {
+			if (libs->dl[i]) {
+				dlclose(libs->dl[i]);
+			}
+		}
+		free(libs->dl);
+	}
+	memset(libs, 0, sizeof(*libs));
 }
 
-typedef struct constant {
-	const_type *type;
-	char *name;
-	impl_def_val *val;
-} constant;
-
-static inline constant *init_constant(const_type *type, char *name, impl_def_val *val) {
-	constant *c = malloc(sizeof(*c));
-	c->type = type;
-	c->name = strdup(name);
-	c->val = val;
-	return c;
+static inline void add_decl_lib(decl_libs *libs, void *dlopened) {
+	libs->dl = realloc(libs->dl, ++libs->count * sizeof(*libs->dl));
+	libs->dl[libs->count-1] = dlopened;
 }
 
-static inline void free_constant(constant *constant) {
-	free_const_type(constant->type);
-	free(constant->name);
-	free_impl_def_val(constant->val);
-	free(constant);
+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) {
+		ret_val = *(void **) ret_val;
+	}
+	return ret_val;
 }
 
-typedef struct constants {
-	size_t count;
-	constant **list;
-} constants;
+static inline impl_val *enref_impl_val(void *ptr, decl_var *var) {
+	impl_val *val, *val_ptr;
+	unsigned i;
 
-static inline constants *add_constant(constants *constants, constant *constant) {
-	if (!constants) {
-		constants = calloc(1, sizeof(*constants));
+	if (!var->pointer_level && real_decl_type(var->arg->type)->type != PSI_T_STRUCT) {
+		return ptr;
 	}
-	constants->list = realloc(constants->list, ++constants->count * sizeof(*constants->list));
-	constants->list[constants->count-1] = constant;
-	return constants;
+	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;
 }
 
-static inline void free_constants(constants *c) {
-	size_t i;
+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);
 
-	for (i = 0; i < c->count; ++i) {
-		free_constant(c->list[i]);
+	if (val != ptr) {
+		*to_free = val;
 	}
-	free(c->list);
-	free(c);
+
+	return val;
 }
 
 #define PSI_ERROR 16
 #define PSI_WARNING 32
 typedef void (*psi_error_cb)(int type, const char *msg, ...);
 
+#define PSI_DATA(D) ((PSI_Data *) (D))
 #define PSI_DATA_MEMBERS \
 	constants *consts; \
 	decl_typedefs *defs; \
 	decl_structs *structs; \
 	decls *decls; \
 	impls *impls; \
-	char *lib; \
-	char *fn; \
+	union { \
+		decl_file file; \
+		decl_libs libs; \
+	} psi; \
 	psi_error_cb error
 typedef struct PSI_Data {
 	PSI_DATA_MEMBERS;
 } PSI_Data;
 
-static inline void PSI_DataExchange(PSI_Data *dest, PSI_Data *src) {
+static inline PSI_Data *PSI_DataExchange(PSI_Data *dest, PSI_Data *src) {
+	if (!dest) {
+		dest = malloc(sizeof(*dest));
+	}
 	memcpy(dest, src, sizeof(*dest));
 	memset(src, 0, sizeof(*src));
+	return dest;
 }
 
 static inline void PSI_DataDtor(PSI_Data *data) {
@@ -872,12 +1164,7 @@ static inline void PSI_DataDtor(PSI_Data *data) {
 	if (data->impls) {
 		free_impls(data->impls);
 	}
-	if (data->lib) {
-		free(data->lib);
-	}
-	if (data->fn) {
-		free(data->fn);
-	}
+	free_decl_file(&data->psi.file);
 }
 
 typedef struct PSI_Parser {
@@ -886,38 +1173,58 @@ typedef struct PSI_Parser {
 	unsigned flags;
 	unsigned errors;
 	void *proc;
-	size_t line;
+	size_t line, col;
 	token_t num;
 	char *cur, *tok, *lim, *eof, *ctx, *mrk, buf[BSIZE];
 } PSI_Parser;
 
 static inline PSI_Token *PSI_TokenAlloc(PSI_Parser *P) {
 	PSI_Token *T;
-	size_t token_len;
+	size_t token_len, fname_len;
+	token_t token_typ;
 
-	if (P->cur <= P->tok) {
+	if (P->cur < P->tok) {
 		return NULL;
 	}
 
+	token_typ = P->num;
 	token_len = P->cur - P->tok;
+	fname_len = strlen(P->psi.file.fn);
 
-	T = malloc(sizeof(*T) + token_len);
-	T->type = P->num;
-	T->line = P->line;
+	T = calloc(1, sizeof(*T) + token_len + fname_len + 1);
+	T->type = token_typ;
 	T->size = token_len;
-	T->text[token_len] = 0;
+	T->line = P->line;
+	T->col = P->col;
+	T->file = &T->buf[0];
+	T->text = &T->buf[fname_len + 1];
+
+	memcpy(T->file, P->psi.file.fn, fname_len);
 	memcpy(T->text, P->tok, token_len);
 
 	return T;
 }
 
+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 + 1;
+	PSI_Token *ptr = malloc(strct_len);
+
+	memcpy(ptr, src, strct_len);
+
+	ptr->file = &ptr->buf[0];
+	ptr->text = &ptr->buf[fname_len + 1];
+
+	return ptr;
+}
+
 #define PSI_PARSER_DEBUG 0x1
 
 PSI_Parser *PSI_ParserInit(PSI_Parser *P, const char *filename, psi_error_cb error, unsigned flags);
 void PSI_ParserSyntaxError(PSI_Parser *P, const char *fn, size_t ln, const char *msg, ...);
 size_t PSI_ParserFill(PSI_Parser *P, size_t n);
 token_t PSI_ParserScan(PSI_Parser *P);
-void PSI_ParserParse(PSI_Parser *P, PSI_Token *T);
+void PSI_ParserParse(PSI_Parser *P, PSI_Token *src);
 void PSI_ParserDtor(PSI_Parser *P);
 void PSI_ParserFree(PSI_Parser **P);