X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-psi;a=blobdiff_plain;f=src%2Fparser.h;h=cd1e0d4b253fa489fd368eb6a83eb01123aa4305;hp=d4909dd9fa496456c5c790eb18e95e91b66c4cbd;hb=7474b3e23338ea03bcd65551959e2582cc455f9f;hpb=f1a387482a9270a34ae684109ad8be7c104148d6

diff --git a/src/parser.h b/src/parser.h
index d4909dd..cd1e0d4 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;
@@ -25,15 +29,23 @@ typedef struct decl_type {
 	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) {
-	decl_type *t = malloc(sizeof(*t));
+	decl_type *t = calloc(1, sizeof(*t));
 	t->type = type;
 	t->name = strdup(name);
 	return t;
 }
 
+static inline decl_type *real_decl_type(decl_type *type) {
+	while (type->real) {
+		type = type->real;
+	}
+	return type;
+}
+
 static inline void free_decl_type(decl_type *type) {
 	free(type->name);
 	free(type);
@@ -45,7 +57,7 @@ typedef struct decl_typedef {
 } decl_typedef;
 
 static inline decl_typedef *init_decl_typedef(char *name, decl_type *type) {
-	decl_typedef *t = malloc(sizeof(*t));
+	decl_typedef *t = calloc(1, sizeof(*t));
 	t->alias = strdup(name);
 	t->type = type;
 	return t;
@@ -62,7 +74,7 @@ typedef struct decl_typedefs {
 	decl_typedef **list;
 } decl_typedefs;
 
-static decl_typedefs *add_decl_typedef(decl_typedefs *defs, decl_typedef *def) {
+static inline decl_typedefs *add_decl_typedef(decl_typedefs *defs, decl_typedef *def) {
 	if (!defs) {
 		defs = calloc(1, sizeof(*defs));
 	}
@@ -84,12 +96,15 @@ static void free_decl_typedefs(decl_typedefs *defs) {
 typedef struct decl_var {
 	char *name;
 	unsigned pointer_level;
+	unsigned array_size;
+	struct decl_arg *arg;
 } decl_var;
 
-static inline decl_var *init_decl_var(char *name, unsigned pl) {
-	decl_var *v = malloc(sizeof(*v));
+static inline decl_var *init_decl_var(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;
 	return v;
 }
 
@@ -101,12 +116,14 @@ static inline void free_decl_var(decl_var *var) {
 typedef struct decl_arg {
 	decl_type *type;
 	decl_var *var;
+	struct let_stmt *let;
 } 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;
 	return arg;
 }
 
@@ -122,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;
 }
@@ -151,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;
 }
@@ -179,7 +196,7 @@ typedef struct decl_abi {
 } decl_abi;
 
 static inline decl_abi *init_decl_abi(char *convention) {
-	decl_abi *abi = malloc(sizeof(*abi));
+	decl_abi *abi = calloc(1, sizeof(*abi));
 	abi->convention = strdup(convention);
 	return abi;
 }
@@ -197,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;
@@ -207,7 +224,9 @@ static inline decl* init_decl(decl_abi *abi, decl_arg *func, decl_args *args) {
 static inline void free_decl(decl *d) {
 	free_decl_abi(d->abi);
 	free_decl_arg(d->func);
-	free_decl_args(d->args);
+	if (d->args) {
+		free_decl_args(d->args);
+	}
 	free(d);
 }
 
@@ -235,13 +254,101 @@ 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;
+} decl_struct;
+
+static inline decl_struct *init_decl_struct(char *name, decl_args *args) {
+	decl_struct *s = calloc(1, sizeof(*s));
+	s->name = strdup(name);
+	s->args = args;
+	return s;
+}
+
+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;
+} decl_structs;
+
+static inline decl_structs *add_decl_struct(decl_structs *ss, decl_struct *s) {
+	if (!ss) {
+		ss = calloc(1, sizeof(*ss));
+	}
+	ss->list = realloc(ss->list, ++ss->count * sizeof(*ss->list));
+	ss->list[ss->count-1] = s;
+	return ss;
+}
+
+static inline void free_decl_structs(decl_structs *ss) {
+	size_t i;
+
+	for (i = 0; i < ss->count; ++i) {
+		free_decl_struct(ss->list[i]);
+	}
+	free(ss->list);
+	free(ss);
+}
+
+typedef union impl_val {
+	char cval;
+	int8_t i8;
+	short sval;
+	int16_t i16;
+	int ival;
+	int32_t i32;
+	long lval;
+	int64_t i64;
+	float fval;
+	double dval;
+	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(impl_val *ret_val, decl_var *var) {
+	unsigned i;
+
+	if (var->arg->var != var) for (i = 0; i < var->pointer_level; ++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));
+	impl_type *t = calloc(1, sizeof(*t));
 
 	t->type = type;
 	t->name = (char *) strdup((const char *) name);
@@ -259,7 +366,7 @@ typedef struct impl_var {
 } impl_var;
 
 static inline impl_var *init_impl_var(char *name, int is_reference) {
-	impl_var *var = malloc(sizeof(*var));
+	impl_var *var = calloc(1, sizeof(*var));
 	var->name = (char *) strdup((const char *) name);
 	var->reference = is_reference;
 	return var;
@@ -276,7 +383,7 @@ typedef struct impl_def_val {
 } impl_def_val;
 
 static inline impl_def_val *init_impl_def_val(PSI_Token *T) {
-	impl_def_val *def = malloc(sizeof(*def));
+	impl_def_val *def = calloc(1, sizeof(*def));
 	def->type = T->type;
 	def->text = strdup(T->text);
 	return def;
@@ -291,19 +398,12 @@ typedef struct impl_arg {
 	impl_type *type;
 	impl_var *var;
 	impl_def_val *def;
-	union {
-		unsigned char bval;
-		zend_long lval;
-		double dval;
-		struct {
-			char *val;
-			size_t len;
-		} str;
-	} val;
+	impl_val val;
+	zval *_zv;
 } 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;
@@ -325,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;
@@ -357,13 +457,15 @@ typedef struct impl_func {
 	char *name;
 	impl_args *args;
 	impl_type *return_type;
+	unsigned return_reference:1;
 } impl_func;
 
-static inline impl_func *init_impl_func(char *name, impl_args *args, impl_type *type) {
-	impl_func *func = malloc(sizeof(*func));
+static inline impl_func *init_impl_func(char *name, impl_args *args, impl_type *type, int ret_reference) {
+	impl_func *func = calloc(1, sizeof(*func));
 	func->name = strdup(name);
 	func->args = args ? args : init_impl_args(NULL);
 	func->return_type = type;
+	func->return_reference = ret_reference;
 	return func;
 }
 
@@ -374,19 +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;
+	let_calloc *alloc;
 } let_func;
 
-static inline let_func *init_let_func(token_t type, char *name) {
-	let_func *func = malloc(sizeof(*func));
+static inline let_func *init_let_func(token_t type, char *name, let_calloc *alloc) {
+	let_func *func = calloc(1, sizeof(*func));
 	func->type = type;
-	func->name = (char *) strdup((const char *) name);
+	func->name = strdup(name);
+	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);
 }
@@ -394,12 +518,12 @@ static inline void free_let_func(let_func *func) {
 typedef struct let_value {
 	let_func *func;
 	impl_var *var;
-	unsigned null_pointer_ref:1;
+	unsigned is_reference:1;
 } let_value;
 
-static inline let_value *init_let_value(let_func *func, impl_var *var, int null_pointer_ref) {
-	let_value *val = malloc(sizeof(*val));
-	val->null_pointer_ref = null_pointer_ref;
+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;
@@ -418,10 +542,14 @@ static inline void free_let_value(let_value *val) {
 typedef struct let_stmt {
 	decl_var *var;
 	let_value *val;
+	impl_arg *arg;
+	impl_val out;
+	void *ptr;
+	void *mem;
 } let_stmt;
 
 static inline let_stmt *init_let_stmt(decl_var *var, let_value *val) {
-	let_stmt *let = malloc(sizeof(*let));
+	let_stmt *let = calloc(1, sizeof(*let));
 	let->var = var;
 	let->val = val;
 	return let;
@@ -429,7 +557,9 @@ 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);
-	free_let_value(stmt->val);
+	if (stmt->val) {
+		free_let_value(stmt->val);
+	}
 	free(stmt);
 }
 
@@ -439,7 +569,7 @@ typedef struct set_func {
 } set_func;
 
 static inline set_func *init_set_func(token_t type, char *name) {
-	set_func *func = malloc(sizeof(*func));
+	set_func *func = calloc(1, sizeof(*func));
 	func->type = type;
 	func->name = (char *) strdup((const char *) name);
 	return func;
@@ -456,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;
@@ -471,10 +601,11 @@ static inline void free_set_value(set_value *val) {
 typedef struct set_stmt {
 	impl_var *var;
 	set_value *val;
+	impl_arg *arg;
 } 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;
@@ -486,36 +617,52 @@ static inline void free_set_stmt(set_stmt *set) {
 	free(set);
 }
 
-typedef struct ret_stmt {
+typedef struct return_stmt {
 	set_func *func;
 	decl_var *decl;
-} ret_stmt;
+} return_stmt;
 
-static inline ret_stmt *init_ret_stmt(set_func *func, decl_var *decl) {
-	ret_stmt *ret = malloc(sizeof(*ret));
+static inline return_stmt *init_return_stmt(set_func *func, decl_var *decl) {
+	return_stmt *ret = calloc(1, sizeof(*ret));
 	ret->func = func;
 	ret->decl = decl;
 	return ret;
 }
 
-static inline void free_ret_stmt(ret_stmt *ret) {
+static inline void free_return_stmt(return_stmt *ret) {
 	free_set_func(ret->func);
 	free_decl_var(ret->decl);
 	free(ret);
 }
 
+typedef struct free_stmt {
+	decl_vars *vars;
+} 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 void free_free_stmt(free_stmt *free_) {
+	free_decl_vars(free_->vars);
+	free(free_);
+}
+
 typedef struct impl_stmt {
 	token_t type;
 	union {
 		let_stmt *let;
 		set_stmt *set;
-		ret_stmt *ret;
+		return_stmt *ret;
+		free_stmt *fre;
 		void *ptr;
 	} s;
 } 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;
@@ -529,8 +676,11 @@ static inline void free_impl_stmt(impl_stmt *stmt) {
 	case PSI_T_SET:
 		free_set_stmt(stmt->s.set);
 		break;
-	case PSI_T_RET:
-		free_ret_stmt(stmt->s.ret);
+	case PSI_T_RETURN:
+		free_return_stmt(stmt->s.ret);
+		break;
+	case PSI_T_FREE:
+		free_free_stmt(stmt->s.fre);
 		break;
 	}
 	free(stmt);
@@ -538,7 +688,7 @@ static inline void free_impl_stmt(impl_stmt *stmt) {
 
 typedef struct impl_stmts {
 	struct {
-		ret_stmt **list;
+		return_stmt **list;
 		size_t count;
 	} ret;
 	struct {
@@ -549,6 +699,10 @@ typedef struct impl_stmts {
 		set_stmt **list;
 		size_t count;
 	} set;
+	struct {
+		free_stmt **list;
+		size_t count;
+	} fre;
 } impl_stmts;
 
 static inline void *add_impl_stmt_ex(void *list, size_t count, void *stmt) {
@@ -559,7 +713,7 @@ static inline void *add_impl_stmt_ex(void *list, size_t count, void *stmt) {
 
 static inline impl_stmts *add_impl_stmt(impl_stmts *stmts, impl_stmt *stmt) {
 	switch (stmt->type) {
-	case PSI_T_RET:
+	case PSI_T_RETURN:
 		stmts->ret.list = add_impl_stmt_ex(stmts->ret.list, ++stmts->ret.count, stmt->s.ret);
 		break;
 	case PSI_T_LET:
@@ -568,7 +722,11 @@ static inline impl_stmts *add_impl_stmt(impl_stmts *stmts, impl_stmt *stmt) {
 	case PSI_T_SET:
 		stmts->set.list = add_impl_stmt_ex(stmts->set.list, ++stmts->set.count, stmt->s.set);
 		break;
+	case PSI_T_FREE:
+		stmts->fre.list = add_impl_stmt_ex(stmts->fre.list, ++stmts->fre.count, stmt->s.fre);
+		break;
 	}
+	free(stmt);
 	return stmts;
 }
 
@@ -585,13 +743,17 @@ static inline void free_impl_stmts(impl_stmts *stmts) {
 	}
 	free(stmts->let.list);
 	for (i = 0; i < stmts->ret.count; ++i) {
-		free_ret_stmt(stmts->ret.list[i]);
+		free_return_stmt(stmts->ret.list[i]);
 	}
 	free(stmts->ret.list);
 	for (i = 0; i < stmts->set.count; ++i) {
 		free_set_stmt(stmts->set.list[i]);
 	}
 	free(stmts->set.list);
+	for (i = 0; i < stmts->fre.count; ++i) {
+		free_free_stmt(stmts->fre.list[i]);
+	}
+	free(stmts->fre.list);
 	free(stmts);
 }
 
@@ -602,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;
@@ -619,7 +781,7 @@ typedef struct impls {
 	impl **list;
 } impls;
 
-static impls *add_impl(impls *impls, impl *impl) {
+static inline impls *add_impl(impls *impls, impl *impl) {
 	if (!impls) {
 		impls = calloc(1, sizeof(*impls));
 	}
@@ -638,12 +800,83 @@ 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, 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
+typedef void (*psi_error_cb)(int type, const char *msg, ...);
+
+#define PSI_DATA_MEMBERS \
+	constants *consts; \
+	decl_typedefs *defs; \
+	decl_structs *structs; \
+	decls *decls; \
+	impls *impls; \
+	char *lib; \
+	char *fn; \
+	psi_error_cb error
 typedef struct PSI_Data {
-	decl_typedefs *defs;
-	decls *decls;
-	impls *impls;
-	char *lib;
-	char *fn;
+	PSI_DATA_MEMBERS;
 } PSI_Data;
 
 static inline void PSI_DataExchange(PSI_Data *dest, PSI_Data *src) {
@@ -652,9 +885,15 @@ static inline void PSI_DataExchange(PSI_Data *dest, PSI_Data *src) {
 }
 
 static inline void PSI_DataDtor(PSI_Data *data) {
+	if (data->consts) {
+		free_constants(data->consts);
+	}
 	if (data->defs) {
 		free_decl_typedefs(data->defs);
 	}
+	if (data->structs) {
+		free_decl_structs(data->structs);
+	}
 	if (data->decls) {
 		free_decls(data->decls);
 	}
@@ -670,11 +909,7 @@ static inline void PSI_DataDtor(PSI_Data *data) {
 }
 
 typedef struct PSI_Parser {
-	decl_typedefs *defs;
-	decls *decls;
-	impls *impls;
-	char *lib;
-	char *fn;
+	PSI_DATA_MEMBERS;
 	FILE *fp;
 	unsigned flags;
 	unsigned errors;
@@ -694,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;
@@ -706,7 +941,7 @@ static inline PSI_Token *PSI_TokenAlloc(PSI_Parser *P) {
 
 #define PSI_PARSER_DEBUG 0x1
 
-PSI_Parser *PSI_ParserInit(PSI_Parser *P, const char *filename, unsigned flags);
+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);
@@ -715,3 +950,4 @@ void PSI_ParserDtor(PSI_Parser *P);
 void PSI_ParserFree(PSI_Parser **P);
 
 #endif
+