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);
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);
}
-enum_name(n) ::= ENUM NAME(N). {
+optional_name(n) ::= .{
+ n = NULL;
+}
+optional_name(n) ::= NAME(N). {
n = N;
}
+enum_name(n) ::= ENUM(E) optional_name(N). {
+ if (N) {
+ n = N;
+ free(E);
+ } else {
+ char digest[17];
+
+ PSI_TokenHash(E, digest);
+ n = PSI_TokenTranslit(PSI_TokenAppend(E, 1, digest), " ", "@");
+ }
+}
+
%type decl_enum {decl_enum *}
%destructor decl_enum {free_decl_enum($$);}
decl_enum(e) ::= enum_name(N) LBRACE decl_enum_items(list) RBRACE. {
i->token = N;
}
-struct_name(n) ::= STRUCT NAME(N). {
- n = 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;
+ free(S);
+ } else {
+ char digest[17];
+
+ PSI_TokenHash(S, digest);
+ n = PSI_TokenTranslit(PSI_TokenAppend(S, 1, digest), " ", "@");
+ }
}
+%type decl_struct_args_block {decl_args*}
+%destructor decl_struct_args_block {free_decl_args($$);}
+decl_struct_args_block(args_) ::= LBRACE struct_args(args) RBRACE. {
+ args_ = args;
+}
%type decl_struct_args {decl_args*}
%destructor decl_struct_args {free_decl_args($$);}
-decl_struct_args(args_) ::= LBRACE struct_args(args) RBRACE. {
+decl_struct_args(args_) ::= decl_struct_args_block(args). {
args_ = args;
}
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) struct_size(size_) decl_struct_args(args). {
strct = init_decl_struct(N->text, args);
strct->size = size_;
strct->token = N;
free(SIZ);
}
+%type decl_union {decl_union*}
+%destructor decl_union {free_decl_union($$);}
+decl_union(u) ::= UNION NAME(N) struct_size(size_) decl_struct_args(args). {
+ u = init_decl_union(N->text, args);
+ u->size = size_;
+ u->token = N;
+}
+
%token_class const_type_token BOOL INT FLOAT STRING.
%type const_type {const_type*}
%destructor const_type {free_const_type($$);}
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 {decl_typedef*}
-%destructor decl_typedef_body {free_decl_typedef($$);}
-decl_typedef_body(def) ::= decl_type(type) NAME(ALIAS). {
- def = init_decl_typedef(ALIAS->text, type);
- 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);
+ }
}
-
-/* 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_ex(def) ::= struct_name(N) struct_size(size_) 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_;
+}
+decl_typedef_body_ex(def) ::= union_name(N) struct_size(size_) 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->size = size_;
+}
+decl_typedef_body_ex(def) ::= decl_enum(e) NAME(ALIAS). {
+ 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->type->enm = e;
+}
+%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_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);
+}
+decl_typedef_body(def) ::= decl_arg(arg). {
+ def = arg;
}
%type decl {decl*}
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*}
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_ = 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_;
arg = arg_;
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;
projects / m6w6 / ext-psi / blobdiff