X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-psi;a=blobdiff_plain;f=src%2Fparser.h;h=8df41eafe50cf95aceba8e8fd9e32a938c809d1f;hp=ff0d4d6f1d1596d48c14c7a5a9622ce42291008a;hb=277d56eeb14cb124042362cb9d5f6e387487748c;hpb=6af43d341ce260ffd7d5d443bc0b535692d5f67e

diff --git a/src/parser.h b/src/parser.h
index ff0d4d6..8df41ea 100644
--- a/src/parser.h
+++ b/src/parser.h
@@ -25,6 +25,7 @@ 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) {
@@ -248,6 +249,54 @@ 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) {
+	free_decl_args(s->args);
+	free(s->name);
+	free(s);
+}
+
+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;
@@ -405,12 +454,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;
 }
 
@@ -461,7 +512,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);
 }
 
@@ -771,6 +824,7 @@ 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; \
@@ -792,6 +846,9 @@ static inline void PSI_DataDtor(PSI_Data *data) {
 	if (data->defs) {
 		free_decl_typedefs(data->defs);
 	}
+	if (data->structs) {
+		free_decl_structs(data->structs);
+	}
 	if (data->decls) {
 		free_decls(data->decls);
 	}