X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-psi;a=blobdiff_plain;f=src%2Fparser_proc.y;h=43ae161d96bc5bc07848575c95d9064d60e69365;hp=fb7f53b0d4553011ca80d0dadcf5f820322e576e;hb=70136a34090807976d66b361fbc8963c0c91f17e;hpb=9f381458672347c0f303dc3b309dc299f998f4f6

diff --git a/src/parser_proc.y b/src/parser_proc.y
index fb7f53b..43ae161 100644
--- a/src/parser_proc.y
+++ b/src/parser_proc.y
@@ -42,10 +42,21 @@ block ::= impl(impl). {
 }
 block ::= decl_typedef(def). {
 	P->defs = add_decl_typedef(P->defs, def);
+	if (def->type->strct) {
+		P->structs = add_decl_struct(P->structs, def->type->strct);
+	}
 }
 block ::= constant(constant). {
 	P->consts = add_constant(P->consts, constant);
 }
+block ::= decl_struct(strct). {
+	P->structs = add_decl_struct(P->structs, strct);
+}
+
+%type decl_struct {decl_struct*}
+decl_struct(strct) ::= STRUCT NAME(N) LBRACE struct_args(args) RBRACE. {
+	strct = init_decl_struct(N->text, args);
+}
 
 %type const_type {const_type*}
 const_type(type_) ::= BOOL(T). {
@@ -71,10 +82,21 @@ constant(constant) ::= CONST const_type(type) NSNAME(T) EQUALS impl_def_val(val)
 }
 
 %type decl_typedef {decl_typedef*}
-decl_typedef(def) ::= TYPEDEF NAME(ALIAS) decl_type(type) EOS. {
+decl_typedef(def) ::= TYPEDEF decl_type(type) NAME(ALIAS) EOS. {
 	def = init_decl_typedef(ALIAS->text, type);
 	free(ALIAS);
 }
+decl_typedef(def) ::= TYPEDEF STRUCT(S) NAME(N) NAME(ALIAS) EOS. {
+	def = init_decl_typedef(ALIAS->text, init_decl_type(S->type, N->text));
+	free(ALIAS);
+	free(S);
+	free(N);
+}
+decl_typedef(def) ::= TYPEDEF decl_struct(s) NAME(ALIAS) EOS. {
+	def = init_decl_typedef(ALIAS->text, init_decl_type(PSI_T_STRUCT, s->name));
+	def->type->strct = s;
+	free(ALIAS);
+}
 
 %type decl {decl*}
 decl(decl) ::= decl_abi(abi) decl_arg(func) LPAREN decl_args(args) RPAREN EOS. {
@@ -101,7 +123,7 @@ decl_var(var) ::= NAME(T) LBRACKET NUMBER(D) RBRACKET. {
 	free(T);
 	free(D);
 }
-decl_var(var) ::= pointers(p) NAME(T) LBRACKET DIGITS(D) RBRACKET. {
+decl_var(var) ::= pointers(p) NAME(T) LBRACKET NUMBER(D) RBRACKET. {
 	var = init_decl_var(T->text, p+1, atol(D->text));
 	free(T);
 	free(D);
@@ -128,6 +150,13 @@ decl_args(args) ::= decl_arg(arg). {
 decl_args(args) ::= decl_args(args_) COMMA decl_arg(arg). {
 	args = add_decl_arg(args_, arg);
 }
+%type struct_args {decl_args*}
+struct_args(args) ::= decl_arg(arg) EOS. {
+	args = init_decl_args(arg);
+}
+struct_args(args) ::= struct_args(args_) decl_arg(arg) EOS. {
+	args = add_decl_arg(args_, arg);
+}
 
 %type decl_type {decl_type*}
 decl_type(type_) ::= VOID(T). {
@@ -158,6 +187,10 @@ decl_type(type_) ::= DOUBLE(T). {
 	type_ = init_decl_type(T->type, T->text);
 	free(T);
 }
+decl_type(type_) ::= SIZE_T(T). {
+	type_ = init_decl_type(T->type, T->text);
+	free(T);
+}
 decl_type(type_) ::= SINT8(T). {
 	type_ = init_decl_type(T->type, T->text);
 	free(T);
@@ -343,6 +376,10 @@ let_func(func) ::= BOOLVAL(T). {
 	func = init_let_func(T->type, T->text, 0);
 	free(T);
 }
+let_func(func) ::= ARRVAL(T). {
+	func = init_let_func(T->type, T->text, 0);
+	free(T);
+}
 
 %type set_stmt {set_stmt*}
 set_stmt(set) ::= SET impl_var(var) EQUALS set_value(val) EOS. {