}
P->enums = psi_plist_add(P->enums, &e);
}
+static inline void psi_parser_proc_deanon_typedef(struct psi_decl_arg *def)
+{
+ switch (def->type->type) {
+ case PSI_T_STRUCT:
+ if (!psi_decl_type_is_anon(def->type->name, "struct")) {
+ return;
+ }
+ break;
+ case PSI_T_UNION:
+ if (!psi_decl_type_is_anon(def->type->name, "union")) {
+ return;
+ }
+ break;
+ case PSI_T_ENUM:
+ if (!psi_decl_type_is_anon(def->type->name, "enum")) {
+ return;
+ }
+ break;
+ default:
+ return;
+ }
+ free(def->type->name);
+ def->type->name = strdup(def->var->name);
+}
static inline void psi_parser_proc_add_typedef(struct psi_parser *P, struct psi_decl_arg *def)
{
assert(def);
if (!P->types) {
P->types = psi_plist_init((psi_plist_dtor) psi_decl_arg_free);
}
+ psi_parser_proc_deanon_typedef(def);
P->types = psi_plist_add(P->types, &def);
}
static inline void psi_parser_proc_add_const(struct psi_parser *P, struct psi_const *cnst) {
}
P->decls = psi_plist_add(P->decls, &decl);
}
+static inline void psi_parser_proc_add_decl_extvars(struct psi_parser *P, struct psi_plist *list) {
+ assert(list);
+ if (!P->vars) {
+ P->vars = psi_plist_init((psi_plist_dtor) psi_decl_extvar_free);
+ }
+ P->vars = psi_plist_add_r(P->vars, psi_plist_count(list), psi_plist_eles(list));
+ free(list);
+}
static inline void psi_parser_proc_add_impl(struct psi_parser *P, struct psi_impl *impl) {
assert(impl);
if (!P->impls) {
%destructor {psi_decl_enum_free(&$$);} decl_enum
%type <struct psi_decl_enum_item *> decl_enum_item
%destructor {psi_decl_enum_item_free(&$$);} decl_enum_item
-%type <struct psi_plist *> decl_args decl_struct_args struct_args_block struct_args struct_arg_var_list decl_enum_items decl_vars decl_vars_with_layout call_decl_vars
-%destructor {psi_plist_free($$);} decl_args decl_struct_args struct_args_block struct_args struct_arg_var_list decl_enum_items decl_vars decl_vars_with_layout call_decl_vars
+%type <struct psi_plist *> decl_args decl_arg_list decl_struct_args struct_args_block struct_args struct_arg_var_list decl_enum_items decl_vars decl_vars_with_layout call_decl_vars decl_extvar_stmt decl_extvar_list
+%destructor {psi_plist_free($$);} decl_args decl_arg_list decl_struct_args struct_args_block struct_args struct_arg_var_list decl_enum_items decl_vars decl_vars_with_layout call_decl_vars decl_extvar_stmt decl_extvar_list
%type <struct psi_layout> align_and_size
%destructor {} align_and_size
| decl_stmt {
psi_parser_proc_add_decl(P, $decl_stmt);
}
+| decl_extvar_stmt[list] {
+ psi_parser_proc_add_decl_extvars(P, $list);
+}
| ignored_decl
-| decl_ext_var_stmt
| decl_typedef[def] {
psi_parser_proc_add_typedef(P, $def);
}
$val = NULL;
}
| num_exp[num] %dprec 1 {
+ /* FIXME */
if (psi_num_exp_validate(PSI_DATA(P), $num, NULL, NULL, NULL, NULL, NULL)) {
impl_val res = {0};
token_t type = psi_num_exp_exec($num, &res, NULL, &P->preproc->defs);
| ignored_quoted_strings QUOTED_STRING
;
-decl_ext_var_stmt:
- decl_ext_var EOS
-;
-
-decl_ext_var:
- NAME decl_arg decl_ext_var_list {
- psi_decl_arg_free(&$decl_arg);
+decl_extvar_stmt[list]:
+ NAME decl_arg decl_extvar_list[vars] EOS {
+ struct psi_plist *list = psi_plist_init((psi_plist_dtor) psi_decl_extvar_free);
+
+ if ($vars) {
+ size_t i = 0;
+ struct psi_decl_var *var;
+
+ while (psi_plist_get($vars, i++, &var)) {
+ if (psi_decl_extvar_is_blacklisted(var->name)) {
+ psi_decl_var_free(&var);
+ } else {
+ list = psi_plist_add(list, psi_decl_extvar_init(
+ psi_decl_arg_init(psi_decl_type_copy($decl_arg->type), var)));
+ }
+ }
+ free($vars);
+ }
+
+ if (psi_decl_extvar_is_blacklisted($decl_arg->var->name)) {
+ psi_decl_arg_free(&$decl_arg);
+ } else {
+ struct psi_decl_extvar *evar = psi_decl_extvar_init($decl_arg);
+ list = psi_plist_add(list, &evar);
+ }
+
+ $list = list;
}
;
-decl_ext_var_list:
- %empty
+decl_extvar_list[list]:
+ %empty {
+ $list = NULL;
+}
| COMMA decl_vars {
- psi_plist_free($decl_vars);
+ $list = $decl_vars;
}
;
| VOID {
$args = NULL;
}
-| decl_anon_arg[arg] {
+| decl_arg_list[args_] {
+ $args = $args_;
+}
+;
+
+decl_arg_list[args]:
+ decl_anon_arg[arg] {
$args = psi_plist_add(psi_plist_init((psi_plist_dtor) psi_decl_arg_free), &$arg);
}
-| decl_args[args_] COMMA decl_anon_arg[arg] {
+| decl_arg_list[args_] COMMA decl_anon_arg[arg] {
$args = psi_plist_add($args_, &$arg);
}
;
;
decl_enum[enum]:
- enum_name LBRACE decl_enum_items[list] RBRACE {
+ enum_name LBRACE decl_enum_items[list] optional_comma RBRACE {
$enum = psi_decl_enum_init($enum_name->text, $list);
$enum->token = $enum_name;
}
if ($indirection) {
int8_t sizeof_void_p = sizeof(void *);
$sizeof = psi_number_init(PSI_T_INT8, &sizeof_void_p, 0);
+ psi_decl_type_free(&$decl_type);
} else {
$sizeof = psi_number_init(PSI_T_SIZEOF, $decl_type, 0);
}
}
;
+optional_comma:
+ %empty
+| COMMA
+;
+
decl_layout[l]:
%empty {
$l = NULL;
| LBRACKET RBRACKET {
$as = 0;
}
+| LBRACKET CPP_RESTRICT RBRACKET {
+ $as = 0;
+}
| LBRACKET num_exp RBRACKET {
if (psi_num_exp_validate(PSI_DATA(P), $num_exp, NULL, NULL, NULL, NULL, NULL)) {
$as = psi_long_num_exp($num_exp, NULL, &P->preproc->defs);
} else {
$as = 0;
}
+ psi_num_exp_free(&$num_exp);
}
;
let_callback[callback]:
CALLBACK callback_rval[func] LPAREN impl_var[var] LPAREN callback_arg_list[args] RPAREN RPAREN {
- $callback = psi_let_callback_init(psi_let_func_init($func->type, $func->text, $var), $args);
+ $callback = psi_let_callback_init(psi_let_func_init($func->type, $func->text, $var), $args, NULL);
+ $callback->func->token = psi_token_copy($func);
+ $callback->token = psi_token_copy($CALLBACK);
+}
+| CALLBACK LPAREN call_decl_vars[cb_args] RPAREN AS callback_rval[func] LPAREN impl_var[var] LPAREN callback_arg_list[args] RPAREN RPAREN {
+ $callback = psi_let_callback_init(psi_let_func_init($func->type, $func->text, $var), $args, $cb_args);
$callback->func->token = psi_token_copy($func);
$callback->token = psi_token_copy($CALLBACK);
}
projects / m6w6 / ext-psi / blobdiff