X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-psi;a=blobdiff_plain;f=src%2Fparser.h;h=5ec0b95e6354875c2f4fa7aa881df78c9b11c67b;hp=28913f6dbcd84015f9652120fd63629988fc345c;hb=14c98cac21b8102d1d4c2a57744f6976ea3a0849;hpb=d60f4bbdd315ddf42dbafeff0fd3d87d2e7a51f7

diff --git a/src/parser.h b/src/parser.h
index 28913f6..5ec0b95 100644
--- a/src/parser.h
+++ b/src/parser.h
@@ -32,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);
@@ -56,7 +56,7 @@ typedef struct decl_typedef {
 	decl_type *type;
 } decl_typedef;
 
-static inline decl_typedef *init_decl_typedef(char *name, decl_type *type) {
+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;
@@ -100,7 +100,7 @@ typedef struct decl_var {
 	struct decl_arg *arg;
 } decl_var;
 
-static inline decl_var *init_decl_var(char *name, unsigned pl, unsigned as) {
+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;
@@ -113,9 +113,27 @@ 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;
 } decl_arg;
 
@@ -123,13 +141,16 @@ 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;
-	arg->let = NULL;
+	var->arg = arg;
 	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);
 }
 
@@ -140,9 +161,11 @@ typedef struct decl_vars {
 
 static inline decl_vars *init_decl_vars(decl_var *var) {
 	decl_vars *vars = calloc(1, sizeof(*vars));
-	vars->count = 1;
-	vars->vars = calloc(1, sizeof(*vars->vars));
-	vars->vars[0] = var;
+	if (var) {
+		vars->count = 1;
+		vars->vars = calloc(1, sizeof(*vars->vars));
+		vars->vars[0] = var;
+	}
 	return vars;
 }
 
@@ -169,9 +192,11 @@ typedef struct decl_args {
 
 static inline decl_args *init_decl_args(decl_arg *arg) {
 	decl_args *args = calloc(1, sizeof(*args));
-	args->count = 1;
-	args->args = calloc(1, sizeof(*args->args));
-	args->args[0] = arg;
+	if (arg) {
+		args->count = 1;
+		args->args = calloc(1, sizeof(*args->args));
+		args->args[0] = arg;
+	}
 	return args;
 }
 
@@ -195,7 +220,7 @@ typedef struct decl_abi {
 	char *convention;
 } decl_abi;
 
-static inline decl_abi *init_decl_abi(char *convention) {
+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 +235,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) {
@@ -254,18 +284,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 +301,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;
@@ -316,12 +332,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 {
@@ -336,22 +356,37 @@ typedef union impl_val {
 static inline impl_val *deref_impl_val(impl_val *ret_val, decl_var *var) {
 	unsigned i;
 
-	for (i = 0; i < var->arg->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;
 } impl_type;
 
-static inline impl_type *init_impl_type(token_t type, char *name) {
+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;
 }
 
@@ -365,9 +400,9 @@ typedef struct impl_var {
 	unsigned reference:1;
 } impl_var;
 
-static inline impl_var *init_impl_var(char *name, int is_reference) {
+static inline impl_var *init_impl_var(const char *name, int is_reference) {
 	impl_var *var = calloc(1, sizeof(*var));
-	var->name = (char *) strdup((const char *) name);
+	var->name = strdup(name);
 	var->reference = is_reference;
 	return var;
 }
@@ -382,10 +417,10 @@ typedef struct impl_def_val {
 	char *text;
 } impl_def_val;
 
-static inline impl_def_val *init_impl_def_val(PSI_Token *T) {
+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->type;
-	def->text = strdup(T->text);
+	def->type = t;
+	def->text = strdup(text);
 	return def;
 }
 
@@ -426,13 +461,10 @@ typedef struct impl_args {
 
 static inline impl_args *init_impl_args(impl_arg *arg) {
 	impl_args *args = calloc(1, sizeof(*args));
-	args->args = calloc(1, sizeof(*args->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;
 }
@@ -499,7 +531,7 @@ typedef struct let_func {
 	let_calloc *alloc;
 } let_func;
 
-static inline let_func *init_let_func(token_t type, char *name, let_calloc *alloc) {
+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);
@@ -563,15 +595,18 @@ 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, char *name) {
+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;
 }
 
@@ -583,6 +618,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) {
@@ -591,10 +632,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);
 }
 
@@ -618,36 +671,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 {
@@ -823,7 +925,7 @@ typedef struct constant {
 	impl_def_val *val;
 } constant;
 
-static inline constant *init_constant(const_type *type, char *name, impl_def_val *val) {
+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);
@@ -866,22 +968,67 @@ static inline void free_constants(constants *c) {
 #define PSI_WARNING 32
 typedef void (*psi_error_cb)(int type, const char *msg, ...);
 
+typedef struct decl_file {
+	char *ln;
+	char *fn;
+} decl_file;
+
+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));
+}
+
+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));
+}
+
+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;
+}
+
+#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) {
@@ -900,12 +1047,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 {
@@ -923,7 +1065,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;
 	}