%extra_argument {PSI_Parser *P}
/* TOKEN is defined inside syntax_error */
%syntax_error {
- PSI_ParserSyntaxError(P, P->psi.file.fn, P->line, "Unexpected token '%s'", TOKEN->text);
+ if (TOKEN && TOKEN->type != PSI_T_EOF) {
+ PSI_ParserSyntaxError(P, P->psi.file.fn, P->line, "Unexpected token '%s'", TOKEN->text);
+ } else {
+ PSI_ParserSyntaxError(P, P->psi.file.fn, P->line, "Unexpected end of input");
+ }
}
%nonassoc NAME.
-%fallback NAME FREE SET LET RETURN LIB.
+%fallback NAME FREE SET LET RETURN LIB INT UNSIGNED.
file ::= blocks.
blocks ::= block.
blocks ::= blocks block.
-block ::= COMMENT.
+block ::= EOF.
block ::= LIB(T) QUOTED_STRING(libname) EOS. {
if (P->psi.file.ln) {
%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($$);}
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);
%type decl_arg {decl_arg*}
%destructor decl_arg {free_decl_arg($$);}
-decl_arg(arg_) ::= decl_type(type) decl_var(var). {
- arg_ = var->arg = init_decl_arg(type, var);
+decl_arg(arg_) ::= const_decl_type(type) decl_var(var). {
+ arg_ = init_decl_arg(type, var);
}
/* void pointers need a specific rule */
decl_arg(arg_) ::= VOID(T) pointers(p) NAME(N). {
init_decl_type(T->type, T->text),
init_decl_var(N->text, p, 0)
);
- arg_->var->arg = arg_;
+ 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)
+ );
free(T);
free(N);
}
}
%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*}
type_ = init_decl_type(T->type, T->text);
free(T);
}
+/* unsigned, urgh */
+decl_type(type_) ::= UNSIGNED NAME(T). {
+ type_ = init_decl_type(T->type, T->text);
+ type_->name = realloc(type_->name, T->size + sizeof("unsigned"));
+ memmove(type_->name + sizeof("unsigned"), type_->name, T->size);
+ memcpy(type_->name, "unsigned", sizeof("unsigned")-1);
+ type_->name[sizeof("unsigned")] = ' ';
+ type_->name[T->size + sizeof("unsigned")] = 0;
+}
/* we have to support plain int here because we have it in our lexer rules */
decl_type(type_) ::= INT(T). {
type_ = init_decl_type(PSI_T_NAME, T->text);
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. {