X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-psi;a=blobdiff_plain;f=src%2Fparser_proc.y;h=345ab226271fe0b12e419936298a764886a36bc1;hp=69d69555884964e6edecfe7d17649c889efb3b12;hb=3137da963d298c73ce3bc858874fdfc87fa941b7;hpb=596f215b67dd267284df4fe0e11f0ca4d197bfc1

diff --git a/src/parser_proc.y b/src/parser_proc.y
index 69d6955..345ab22 100644
--- a/src/parser_proc.y
+++ b/src/parser_proc.y
@@ -19,15 +19,13 @@
 }
 
 %nonassoc NAME.
-%fallback NAME FREE SET LET RETURN LIB.
+%fallback NAME FREE SET LET RETURN LIB INT.
 
 file ::= blocks.
 
 blocks ::= block.
 blocks ::= blocks block.
 
-block ::= COMMENT.
-
 block ::= LIB(T) QUOTED_STRING(libname) EOS. {
 	if (P->psi.file.ln) {
 		PSI_ParserSyntaxError(P, P->psi.file.ln, T->line, "Extra 'lib %s' statement has no effect", libname->text);
@@ -59,11 +57,21 @@ block ::= decl_struct(strct). {
 
 %type decl_struct {decl_struct*}
 %destructor decl_struct {free_decl_struct($$);}
-decl_struct(strct) ::= STRUCT NAME(N) LBRACE struct_args(args) RBRACE. {
+decl_struct(strct) ::= STRUCT NAME(N) struct_size(size_) LBRACE struct_args(args) RBRACE. {
 	strct = init_decl_struct(N->text, args);
+	strct->size = size_;
 	free(N);
 }
 
+%type struct_size {size_t}
+struct_size(size) ::= . {
+	size = 0;
+}
+struct_size(size) ::= COLON COLON LPAREN NUMBER(SIZ) RPAREN. {
+	size = atol(SIZ->text);
+	free(SIZ);
+}
+
 %token_class const_type_token BOOL INT FLOAT STRING.
 %type const_type {const_type*}
 %destructor const_type {free_const_type($$);}
@@ -84,6 +92,12 @@ decl_typedef(def) ::= TYPEDEF decl_type(type) NAME(ALIAS) EOS. {
 	def = init_decl_typedef(ALIAS->text, type);
 	free(ALIAS);
 }
+/* support opaque types */
+decl_typedef(def) ::= TYPEDEF VOID(V) NAME(ALIAS) EOS. {
+	def = init_decl_typedef(ALIAS->text, init_decl_type(V->type, V->text));
+	free(V);
+	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);
@@ -147,7 +161,7 @@ decl_vars(vars) ::= decl_vars(vars_) COMMA decl_var(var). {
 
 %type decl_arg {decl_arg*}
 %destructor decl_arg {free_decl_arg($$);}
-decl_arg(arg_) ::= decl_type(type) decl_var(var). {
+decl_arg(arg_) ::= const_decl_type(type) decl_var(var). {
 	arg_ = var->arg = init_decl_arg(type, var);
 }
 /* void pointers need a specific rule */
@@ -160,6 +174,15 @@ decl_arg(arg_) ::= VOID(T) pointers(p) NAME(N). {
 	free(T);
 	free(N);
 }
+decl_arg(arg_) ::= CONST VOID(T) pointers(p) NAME(N). {
+	arg_ = init_decl_arg(
+		init_decl_type(T->type, T->text),
+		init_decl_var(N->text, p, 0)
+	);
+	arg_->var->arg = arg_;
+	free(T);
+	free(N);
+}
 
 %type decl_args {decl_args*}
 %destructor decl_args {free_decl_args($$);}
@@ -173,12 +196,29 @@ decl_args(args) ::= decl_args(args_) COMMA decl_arg(arg). {
 }
 %type struct_args {decl_args*}
 %destructor struct_args {free_decl_args($$);}
-struct_args(args) ::= decl_arg(arg) EOS. {
+struct_args(args) ::= struct_arg(arg). {
 	args = init_decl_args(arg);
 }
-struct_args(args) ::= struct_args(args_) decl_arg(arg) EOS. {
+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($$);}
+struct_arg(arg) ::= decl_arg(arg_) struct_layout(layout_) EOS. {
+	arg_->layout = layout_;
+	arg = arg_;
+}
+
+%type struct_layout {decl_struct_layout*}
+%destructor struct_layout {free_decl_struct_layout($$);}
+struct_layout(layout) ::= . {
+	layout = NULL;
+}
+struct_layout(layout) ::= COLON COLON LPAREN NUMBER(POS) COMMA NUMBER(SIZ) RPAREN. {
+	layout = init_decl_struct_layout(atol(POS->text), atol(SIZ->text));
+	free(POS);
+	free(SIZ);
+}
 
 %token_class decl_type_token FLOAT DOUBLE INT8 UINT8 INT16 UINT16 INT32 UINT32 INT64 UINT64 NAME.
 %type decl_type {decl_type*}
@@ -199,6 +239,15 @@ decl_type(type_) ::= STRUCT(S) NAME(T). {
 	free(T);
 }
 
+%type const_decl_type {decl_type*}
+%destructor const_decl_type {free_decl_type($$);}
+const_decl_type(type) ::= decl_type(type_). {
+	type = type_;
+}
+const_decl_type(type) ::= CONST decl_type(type_). {
+	type = type_;
+}
+
 %type impl {impl*}
 %destructor impl {free_impl($$);}
 impl(impl) ::= impl_func(func) LBRACE impl_stmts(stmts) RBRACE. {