X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-psi;a=blobdiff_plain;f=src%2Fparser_proc.y;h=b75ac6722cde03d45d2c26ebdf215a7e23502e8a;hp=ac856ede483a5ac3e2d01c7ae1a8256ccb43ced1;hb=d3171526ab7658114cac4ebe1098af4b038e576e;hpb=1c837573a87e0d375768e990a28d1b2706dbaf43

diff --git a/src/parser_proc.y b/src/parser_proc.y
index ac856ed..b75ac67 100644
--- a/src/parser_proc.y
+++ b/src/parser_proc.y
@@ -30,7 +30,6 @@ void psi_error(int, const char *, int, const char *, ...);
 %left PLUS MINUS.
 %left SLASH ASTERISK.
 %fallback NAME TEMP FREE SET LET RETURN LIB STRING.
-%fallback STRUCT UNION.
 
 file ::= blocks.
 
@@ -42,7 +41,7 @@ block ::= EOS.
 
 block ::= LIB(T) QUOTED_STRING(libname) EOS. {
 	if (P->psi.file.ln) {
-		P->error(T, PSI_WARNING, "Extra 'lib %s' statement has no effect", libname->text);
+		P->error(P, T, PSI_WARNING, "Extra 'lib %s' statement has no effect", libname->text);
 	} else {
 		P->psi.file.ln = strndup(libname->text + 1, libname->size - 2);
 	}
@@ -61,6 +60,9 @@ block ::= decl_typedef(def). {
 	if (def->type->strct) {
 		P->structs = add_decl_struct(P->structs, def->type->strct);
 	}
+	if (def->type->enm) {
+		P->enums = add_decl_enum(P->enums, def->type->enm);
+	}
 }
 block ::= constant(constant). {
 	P->consts = add_constant(P->consts, constant);
@@ -68,6 +70,9 @@ block ::= constant(constant). {
 block ::= decl_struct(strct). {
 	P->structs = add_decl_struct(P->structs, strct);
 }
+block ::= decl_union(u). {
+	P->unions = add_decl_union(P->unions, u);
+}
 block ::= decl_enum(e). {
 	P->enums = add_decl_enum(P->enums, e);
 }
@@ -78,6 +83,7 @@ optional_name(n) ::= .{
 optional_name(n) ::= NAME(N). {
 	n = N;
 }
+
 enum_name(n) ::= ENUM(E) optional_name(N). {
 	if (N) {
 		n = N;
@@ -90,7 +96,6 @@ enum_name(n) ::= ENUM(E) optional_name(N). {
 	}
 }
 
-
 %type decl_enum {decl_enum *}
 %destructor decl_enum {free_decl_enum($$);}
 decl_enum(e) ::= enum_name(N) LBRACE decl_enum_items(list) RBRACE. {
@@ -118,6 +123,18 @@ decl_enum_item(i) ::= NAME(N). {
 	i->token = N;
 }
 
+union_name(n) ::= UNION(U) optional_name(N). {
+	if (N) {
+		n = N;
+		free(U);
+	} else {
+		char digest[17];
+
+		PSI_TokenHash(U, digest);
+		n = PSI_TokenTranslit(PSI_TokenAppend(U, 1, digest), " ", "@");
+	}
+}
+
 struct_name(n) ::= STRUCT(S) optional_name(N). {
 	if (N) {
 		n = N;
@@ -147,19 +164,32 @@ decl_struct_args(args_) ::= EOS. {
 
 %type decl_struct {decl_struct*}
 %destructor decl_struct {free_decl_struct($$);}
-decl_struct(strct) ::= struct_name(N) struct_size(size_) decl_struct_args(args). {
+decl_struct(strct) ::= STRUCT NAME(N) align_and_size(as) decl_struct_args(args). {
 	strct = init_decl_struct(N->text, args);
-	strct->size = size_;
+	strct->align = as.a;
+	strct->size = as.s;
 	strct->token = N;
 }
 
-%type struct_size {size_t}
-struct_size(size) ::= . {
-	size = 0;
+%type align_and_size { struct {size_t a; size_t s; } }
+align_and_size(as) ::= . {
+	as.a = 0;
+	as.s = 0;
 }
-struct_size(size) ::= COLON COLON LPAREN NUMBER(SIZ) RPAREN. {
-	size = atol(SIZ->text);
-	free(SIZ);
+align_and_size(as) ::= COLON COLON LPAREN NUMBER(A) COMMA NUMBER(S) RPAREN. {
+	as.a = atol(A->text);
+	as.s = atol(S->text);
+	free(A);
+	free(S);
+}
+
+%type decl_union {decl_union*}
+%destructor decl_union {free_decl_union($$);}
+decl_union(u) ::= UNION NAME(N) align_and_size(as) decl_struct_args(args). {
+	u = init_decl_union(N->text, args);
+	u->align = as.a;
+	u->size = as.s;
+	u->token = N;
 }
 
 %token_class const_type_token BOOL INT FLOAT STRING.
@@ -176,47 +206,87 @@ constant(constant) ::= CONST const_type(type) NSNAME(T) EQUALS impl_def_val(val)
 	free(T);
 }
 
-%type decl_typedef {decl_typedef*}
-%destructor decl_typedef {free_decl_typedef($$);}
-decl_typedef(def) ::= TYPEDEF decl_typedef_body(def_) EOS. {
+%type decl_typedef {decl_arg*}
+%destructor decl_typedef {
+	free_decl_arg($$);
+	if ($$->type->strct) {
+		free_decl_struct($$->type->strct);
+	}
+	if ($$->type->enm) {
+		free_decl_enum($$->type->enm);
+	}
+	if ($$->type->func) {
+		free_decl($$->type->func);
+	}
+}
+decl_typedef(def) ::= TYPEDEF(T) decl_typedef_body(def_) EOS. {
 	def = def_;
+	def->token = T;
 }
-%type decl_typedef_body_ex {decl_typedef*}
-%destructor decl_typedef_body_ex {free_decl_typedef($$);}
-decl_typedef_body_ex(def) ::= struct_name(N) struct_size(size_) decl_struct_args_block(args) NAME(ALIAS). {
-	def = init_decl_typedef(ALIAS->text, init_decl_type(PSI_T_STRUCT, N->text));
-	def->token = ALIAS;
+%type decl_typedef_body_ex {decl_arg*}
+%destructor decl_typedef_body_ex {
+	free_decl_arg($$);
+	if ($$->type->strct) {
+		free_decl_struct($$->type->strct);
+	}
+	if ($$->type->enm) {
+		free_decl_enum($$->type->enm);
+	}
+	if ($$->type->unn) {
+		free_decl_union($$->type->unn);
+	}
+	if ($$->type->func) {
+		free_decl($$->type->func);
+	}
+}
+decl_typedef_body_ex(def) ::= struct_name(N) align_and_size(as) decl_struct_args_block(args) decl_var(var). {
+	def = init_decl_arg(init_decl_type(PSI_T_STRUCT, N->text), var);
 	def->type->token = PSI_TokenCopy(N);
 	def->type->strct = init_decl_struct(N->text, args);
 	def->type->strct->token = N;
-	def->type->strct->size = size_;
+	def->type->strct->align = as.a;
+	def->type->strct->size = as.s;
+}
+decl_typedef_body_ex(def) ::= union_name(N) align_and_size(as) decl_struct_args_block(args) decl_var(var). {
+	def = init_decl_arg(init_decl_type(PSI_T_UNION, N->text), var);
+	def->type->token = PSI_TokenCopy(N);
+	def->type->unn = init_decl_union(N->text, args);
+	def->type->unn->token = N;
+	def->type->unn->align = as.a;
+	def->type->unn->size = as.s;
 }
 decl_typedef_body_ex(def) ::= decl_enum(e) NAME(ALIAS). {
-	def = init_decl_typedef(ALIAS->text, init_decl_type(PSI_T_ENUM, e->name));
+	def = init_decl_arg(init_decl_type(PSI_T_ENUM, e->name), init_decl_var(ALIAS->text, 0, 0));
+	def->var->token = ALIAS;
 	def->type->token = PSI_TokenCopy(e->token);
-	def->token = ALIAS;
 	def->type->enm = e;
 }
-%type decl_typedef_body {decl_typedef*}
-%destructor decl_typedef_body {free_decl_typedef($$);}
+%type decl_typedef_body {decl_arg*}
+%destructor decl_typedef_body {
+	free_decl_arg($$);
+	if ($$->type->strct) {
+		free_decl_struct($$->type->strct);
+	}
+	if ($$->type->enm) {
+		free_decl_enum($$->type->enm);
+	}
+	if ($$->type->unn) {
+		free_decl_union($$->type->unn);
+	}
+	if ($$->type->func) {
+		free_decl($$->type->func);
+	}
+}
 decl_typedef_body(def) ::= decl_typedef_body_ex(def_). {
 	def = def_;
 }
-decl_typedef_body(def) ::= decl_type(type) NAME(ALIAS). {
-	def = init_decl_typedef(ALIAS->text, type);
-	def->token = ALIAS;
+decl_typedef_body(def) ::= decl_func(func_) LPAREN decl_args(args) RPAREN. {
+	def = init_decl_arg(init_decl_type(PSI_T_FUNCTION, func_->var->name), copy_decl_var(func_->var));
+	def->type->token = PSI_TokenCopy(func_->token);
+	def->type->func = init_decl(init_decl_abi("default"), func_, args);
 }
-/* support opaque types */
-decl_typedef_body(def) ::= VOID(V) indirection(i) NAME(ALIAS). {
-	def = init_decl_typedef(ALIAS->text, init_decl_type(i?PSI_T_POINTER:V->type, V->text));
-	def->token = ALIAS;
-	def->type->token = V;
-}
-decl_typedef_body(def) ::= decl_func(func) LPAREN decl_args(args) RPAREN. {
-	def = init_decl_typedef(func->var->name, init_decl_type(PSI_T_FUNCTION, func->var->name));
-	def->type->token = PSI_TokenCopy(func->token);
-	def->type->func = init_decl(init_decl_abi("default"), func, args);
-	def->token = PSI_TokenCopy(func->token);
+decl_typedef_body(def) ::= decl_arg(arg). {
+	def = arg;
 }
 
 %type decl {decl*}
@@ -237,8 +307,8 @@ decl_func(func) ::= VOID(T) NAME(N). {
 		init_decl_var(N->text, 0, 0)
 	);
 	func->type->token = T;
-	//free(T);
-	free(N);
+	func->var->token = N;
+	func->token = N;
 }
 
 %type decl_abi {decl_abi*}
@@ -317,14 +387,26 @@ struct_args(args) ::= struct_args(args_) struct_arg(arg). {
 	args = add_decl_arg(args_, arg);
 }
 %type struct_arg {decl_arg*}
-%destructor struct_arg {free_decl_arg($$);}
+%destructor struct_arg {
+	free_decl_arg($$);
+	if ($$->type->strct) {
+		free_decl_struct($$->type->strct);
+	}
+	if ($$->type->enm) {
+		free_decl_enum($$->type->enm);
+	}
+	if ($$->type->func) {
+		free_decl($$->type->func);
+	}
+}
 struct_arg(arg_) ::= decl_typedef_body_ex(def) EOS. {
-	arg_ = init_decl_arg(def->type, init_decl_var(def->alias, 0, 0));
-	arg_->var->arg = arg_;
-	arg_->token = PSI_TokenCopy(def->type->token);
-	arg_->var->token = def->token;
-	free(def->alias);
-	free(def);
+	arg_ = def;
+	if (def->type->strct) {
+		P->structs = add_decl_struct(P->structs, def->type->strct);
+	}
+	if (def->type->enm) {
+		P->enums = add_decl_enum(P->enums, def->type->enm);
+	}
 }
 struct_arg(arg) ::= decl_arg(arg_) struct_layout(layout_) EOS. {
 	arg_->layout = layout_;
@@ -427,6 +509,11 @@ decl_type(type_) ::= STRUCT(S) NAME(T). {
 	type_->token = T;
 	free(S);
 }
+decl_type(type_) ::= UNION(U) NAME(T). {
+	type_ = init_decl_type(U->type, T->text);
+	type_->token = T;
+	free(U);
+}
 decl_type(type_) ::= ENUM(E) NAME(T). {
 	type_ = init_decl_type(E->type, T->text);
 	type_->token = T;