X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-psi;a=blobdiff_plain;f=src%2Fparser.h;h=f56f278eaf86257b91b8ebe973ea581d18999765;hp=8506acde1d4a638b6040d941f1ac831fa32ddfb4;hb=bcd9e150292290ce2951fdca61fad526c478e787;hpb=9c72f6584bd95dd6e9c7dcb314a6583f7130362f

diff --git a/src/parser.h b/src/parser.h
index 8506acd..f56f278 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,13 +29,13 @@ 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);
-	t->real = NULL;
 	return t;
 }
 
@@ -70,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));
 	}
@@ -92,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) {
+static inline decl_var *init_decl_var(char *name, unsigned pl, unsigned as) {
 	decl_var *v = malloc(sizeof(*v));
 	v->name = (char *) strdup((const char *) name);
 	v->pointer_level = pl;
+	v->array_size = as;
 	return v;
 }
 
@@ -217,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);
 }
 
@@ -245,6 +254,83 @@ 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);
+	}
+	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 {
+	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;
@@ -297,16 +383,6 @@ static inline void free_impl_def_val(impl_def_val *def) {
 	free(def);
 }
 
-typedef union impl_val {
-	unsigned char bval;
-	zend_long lval;
-	double dval;
-	struct {
-		char *val;
-		size_t len;
-	} str;
-} impl_val;
-
 typedef struct impl_arg {
 	impl_type *type;
 	impl_var *var;
@@ -370,13 +446,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) {
+static inline impl_func *init_impl_func(char *name, impl_args *args, impl_type *type, int ret_reference) {
 	impl_func *func = malloc(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;
 }
 
@@ -390,12 +468,14 @@ static inline void free_impl_func(impl_func *f) {
 typedef struct let_func {
 	token_t type;
 	char *name;
+	size_t size;
 } let_func;
 
-static inline let_func *init_let_func(token_t type, char *name) {
+static inline let_func *init_let_func(token_t type, char *name, size_t size) {
 	let_func *func = malloc(sizeof(*func));
 	func->type = type;
-	func->name = (char *) strdup((const char *) name);
+	func->name = strdup(name);
+	func->size = size;
 	return func;
 }
 
@@ -432,19 +512,23 @@ 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;
-	let->arg = NULL;
 	return let;
 }
 
 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);
 }
 
@@ -486,6 +570,7 @@ 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) {
@@ -501,30 +586,46 @@ 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 = malloc(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_ = malloc(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;
@@ -544,8 +645,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);
@@ -553,7 +657,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 {
@@ -564,6 +668,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) {
@@ -574,7 +682,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:
@@ -583,7 +691,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;
 }
 
@@ -600,13 +712,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);
 }
 
@@ -634,7 +750,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));
 	}
@@ -653,18 +769,82 @@ 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 = malloc(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 = malloc(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, ...);
 
-typedef struct PSI_Data {
 #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 {
 	PSI_DATA_MEMBERS;
 } PSI_Data;
 
@@ -674,9 +854,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);
 	}