X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-psi;a=blobdiff_plain;f=src%2Fparser.h;h=2ea0ec8f2ce9c88be55e6e75e4269b14dfd26658;hp=4df5354a6759180d1af0d1704284292a4da7d57e;hb=c2dc24a4967dd767fc4a240f93ca0de4600a8c62;hpb=481515f92d2baa83dea51d2effcbde711aa99e3b

diff --git a/src/parser.h b/src/parser.h
index 4df5354..2ea0ec8 100644
--- a/src/parser.h
+++ b/src/parser.h
@@ -21,9 +21,9 @@ size_t psi_t_size(token_t);
 
 typedef struct PSI_Token {
 	token_t type;
-	unsigned line;
-	size_t size;
-	char text[1];
+	unsigned size, *line;
+	char *text, *file;
+	char buf[1];
 } PSI_Token;
 
 typedef union impl_val {
@@ -51,6 +51,7 @@ typedef union impl_val {
 } impl_val;
 
 typedef struct decl_type {
+	PSI_Token *token;
 	char *name;
 	token_t type;
 	struct decl_type *real;
@@ -72,11 +73,15 @@ static inline decl_type *real_decl_type(decl_type *type) {
 }
 
 static inline void free_decl_type(decl_type *type) {
+	if (type->token) {
+		free(type->token);
+	}
 	free(type->name);
 	free(type);
 }
 
 typedef struct decl_typedef {
+	PSI_Token *token;
 	char *alias;
 	decl_type *type;
 } decl_typedef;
@@ -89,6 +94,9 @@ static inline decl_typedef *init_decl_typedef(const char *name, decl_type *type)
 }
 
 static inline void free_decl_typedef(decl_typedef *t) {
+	if (t->token) {
+		free(t->token);
+	}
 	free(t->alias);
 	free_decl_type(t->type);
 	free(t);
@@ -119,6 +127,7 @@ static void free_decl_typedefs(decl_typedefs *defs) {
 }
 
 typedef struct decl_var {
+	PSI_Token *token;
 	char *name;
 	unsigned pointer_level;
 	unsigned array_size;
@@ -134,6 +143,9 @@ static inline decl_var *init_decl_var(const char *name, unsigned pl, unsigned as
 }
 
 static inline void free_decl_var(decl_var *var) {
+	if (var->token) {
+		free(var->token);
+	}
 	free(var->name);
 	free(var);
 }
@@ -156,6 +168,7 @@ static inline void free_decl_struct_layout(decl_struct_layout *l) {
 }
 
 typedef struct decl_arg {
+	PSI_Token *token;
 	decl_type *type;
 	decl_var *var;
 	decl_struct_layout *layout;
@@ -167,6 +180,7 @@ typedef struct decl_arg {
 
 static inline decl_arg *init_decl_arg(decl_type *type, decl_var *var) {
 	decl_arg *arg = calloc(1, sizeof(*arg));
+	arg->token = var->token;
 	arg->type = type;
 	arg->var = var;
 	var->arg = arg;
@@ -217,6 +231,7 @@ 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) {
@@ -246,6 +261,7 @@ static inline void free_decl_args(decl_args *args) {
 }
 
 typedef struct decl_abi {
+	PSI_Token *token;
 	char *convention;
 } decl_abi;
 
@@ -256,20 +272,27 @@ static inline decl_abi *init_decl_abi(const char *convention) {
 }
 
 static inline void free_decl_abi(decl_abi *abi) {
+	if (abi->token) {
+		free(abi->token);
+	}
 	free(abi->convention);
 	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;
 	struct impl *impl;
-	struct {
-		void *sym;
-		void *info;
-		void **args;
-	} call;
+	decl_callinfo call;
 } decl;
 
 static inline decl* init_decl(decl_abi *abi, decl_arg *func, decl_args *args) {
@@ -314,6 +337,7 @@ static inline void free_decls(decls *decls) {
 }
 
 typedef struct decl_struct {
+	PSI_Token *token;
 	char *name;
 	decl_args *args;
 	size_t size;
@@ -327,6 +351,9 @@ static inline decl_struct *init_decl_struct(const char *name, decl_args *args) {
 }
 
 static inline void free_decl_struct(decl_struct *s) {
+	if (s->token) {
+		free(s->token);
+	}
 	if (s->args) {
 		free_decl_args(s->args);
 	}
@@ -377,6 +404,7 @@ static inline void free_impl_type(impl_type *type) {
 }
 
 typedef struct impl_var {
+	PSI_Token *token;
 	char *name;
 	unsigned reference:1;
 } impl_var;
@@ -389,6 +417,9 @@ static inline impl_var *init_impl_var(const char *name, int is_reference) {
 }
 
 static inline void free_impl_var(impl_var *var) {
+	if (var->token) {
+		free(var->token);
+	}
 	free(var->name);
 	free(var);
 }
@@ -497,9 +528,18 @@ static inline void free_impl_arg(impl_arg *arg) {
 	free(arg);
 }
 
+typedef struct impl_vararg {
+	impl_arg *name;
+	struct impl_args *args;
+	token_t *types;
+	impl_val *values;
+	void **free_list;
+} impl_vararg;
+
 typedef struct impl_args {
 	impl_arg **args;
 	size_t count;
+	impl_vararg vararg;
 } impl_args;
 
 static inline impl_args *init_impl_args(impl_arg *arg) {
@@ -524,11 +564,15 @@ static inline void free_impl_args(impl_args *args) {
 	for (i = 0; i < args->count; ++i) {
 		free_impl_arg(args->args[i]);
 	}
+	if (args->vararg.name) {
+		free_impl_arg(args->vararg.name);
+	}
 	free(args->args);
 	free(args);
 }
 
 typedef struct impl_func {
+	PSI_Token *token;
 	char *name;
 	impl_args *args;
 	impl_type *return_type;
@@ -545,6 +589,9 @@ static inline impl_func *init_impl_func(char *name, impl_args *args, impl_type *
 }
 
 static inline void free_impl_func(impl_func *f) {
+	if (f->token) {
+		free(f->token);
+	}
 	free_impl_type(f->return_type);
 	free_impl_args(f->args);
 	free(f->name);
@@ -552,6 +599,7 @@ static inline void free_impl_func(impl_func *f) {
 }
 
 typedef struct num_exp {
+	PSI_Token *token;
 	token_t t;
 	union {
 		char *numb;
@@ -579,6 +627,9 @@ static inline num_exp *init_num_exp(token_t t, void *num) {
 }
 
 static inline void free_num_exp(num_exp *exp) {
+	if (exp->token) {
+		free(exp->token);
+	}
 	switch (exp->t) {
 	case PSI_T_NUMBER:
 		free(exp->u.numb);
@@ -617,57 +668,98 @@ static inline void free_let_calloc(let_calloc *alloc) {
 typedef struct let_func {
 	token_t type;
 	char *name;
-	let_calloc *alloc;
+	impl_var *var;
+	impl_arg *arg;
 } let_func;
 
-static inline let_func *init_let_func(token_t type, const char *name, let_calloc *alloc) {
+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->alloc = alloc;
+	func->var = var;
 	return func;
 }
 
 static inline void free_let_func(let_func *func) {
-	if (func->alloc) {
-		free_let_calloc(func->alloc);
-	}
+	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 = calloc(1, 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;
+	let_val *val;
+
 	void *ptr;
 } 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;
@@ -675,16 +767,20 @@ 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 {
+	PSI_Token *token;
 	token_t type;
 	char *name;
 	void (*handler)(zval *, struct set_value *set, impl_val *ret_val);
@@ -698,6 +794,9 @@ static inline set_func *init_set_func(token_t type, const char *name) {
 }
 
 static inline void free_set_func(set_func *func) {
+	if (func->token) {
+		free(func->token);
+	}
 	free(func->name);
 	free(func);
 }
@@ -723,12 +822,17 @@ static inline set_value *init_set_value(set_func *func, decl_vars *vars) {
 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;
+	inner->outer.set = val;
 	return val;
 }
 
 static inline void free_set_value(set_value *val) {
-	free_set_func(val->func);
-	free_decl_vars(val->vars);
+	if (val->func) {
+		free_set_func(val->func);
+	}
+	if (val->vars) {
+		free_decl_vars(val->vars);
+	}
 	if (val->inner) {
 		size_t i;
 		for (i = 0; i < val->count; ++i) {
@@ -736,6 +840,9 @@ static inline void free_set_value(set_value *val) {
 		}
 		free(val->inner);
 	}
+	if (val->num) {
+		free_num_exp(val->num);
+	}
 	free(val);
 }
 
@@ -759,6 +866,7 @@ static inline void free_set_stmt(set_stmt *set) {
 }
 
 typedef struct return_stmt {
+	PSI_Token *token;
 	set_value *set;
 	decl_arg *decl;
 } return_stmt;
@@ -770,13 +878,15 @@ static inline return_stmt *init_return_stmt(set_value *val) {
 }
 
 static inline void free_return_stmt(return_stmt *ret) {
-	//free_set_func(ret->func);
-	//free_decl_var(ret->decl);
+	if (ret->token) {
+		free(ret->token);
+	}
 	free_set_value(ret->set);
 	free(ret);
 }
 
 typedef struct free_call {
+	PSI_Token *token;
 	char *func;
 	decl_vars *vars;
 	decl *decl;
@@ -790,7 +900,11 @@ static inline free_call *init_free_call(const char *func, decl_vars *vars) {
 }
 
 static inline void free_free_call(free_call *f) {
+	if (f->token) {
+		free(f->token);
+	}
 	free(f->func);
+	free_decl_vars(f->vars);
 	free(f);
 }
 
@@ -1066,7 +1180,7 @@ static inline impl_val *struct_member_ref(decl_arg *set_arg, impl_val *struct_pt
 
 #define PSI_ERROR 16
 #define PSI_WARNING 32
-typedef void (*psi_error_cb)(int type, const char *msg, ...);
+typedef void (*psi_error_cb)(PSI_Token *token, int type, const char *msg, ...);
 
 #define PSI_DATA(D) ((PSI_Data *) (D))
 #define PSI_DATA_MEMBERS \
@@ -1115,41 +1229,63 @@ static inline void PSI_DataDtor(PSI_Data *data) {
 typedef struct PSI_Parser {
 	PSI_DATA_MEMBERS;
 	FILE *fp;
-	unsigned flags;
-	unsigned errors;
-	void *proc;
-	size_t line;
 	token_t num;
+	void *proc;
+	unsigned flags, errors, line, col;
 	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) {
 		return NULL;
 	}
 
+	token_typ = P->num;
 	token_len = P->cur - P->tok;
+	fname_len = strlen(P->psi.file.fn);
 
-	T = calloc(1, sizeof(*T) + token_len);
-	T->type = P->num;
-	T->line = P->line;
+	T = calloc(1, sizeof(*T) + token_len + fname_len + sizeof(unsigned) + 2);
+	T->type = token_typ;
 	T->size = token_len;
-	T->text[token_len] = 0;
+	T->text = &T->buf[0];
+	T->file = &T->buf[token_len + 1];
+	T->line = (void *) &T->buf[fname_len + token_len + 2];
+
 	memcpy(T->text, P->tok, token_len);
+	memcpy(T->file, P->psi.file.fn, fname_len);
+	memcpy(T->line, &P->line, sizeof(unsigned));
 
 	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 + sizeof(unsigned) + 2;
+	PSI_Token *ptr = malloc(strct_len);
+
+	memcpy(ptr, src, strct_len);
+
+	ptr->text = &ptr->buf[0];
+	ptr->file = &ptr->buf[ptr->size + 1];
+
+	return ptr;
+}
+
+static inline const char *PSI_TokenLocation(PSI_Token *t) {
+	return t ? t->file : "<builtin>:0:0";
+}
+
 #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);