validate: fix type stack and leaks

[m6w6/ext-psi] / src / parser_proc_grammar.y

diff --git a/src/parser_proc_grammar.y b/src/parser_proc_grammar.y
index d2a16b6d2211d04bb787a57e8f21c4ec79f0fba3..56b261248a03403da1be4ed7cc85e629914a9326 100644 (file)
--- a/src/parser_proc_grammar.y
+++ b/src/parser_proc_grammar.y
@@ -39,12 +39,37 @@ static inline void psi_parser_proc_add_enum(struct psi_parser *P, struct psi_dec
        }
        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) {
@@ -325,8 +350,8 @@ struct psi_parser;
 %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
+%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
 
 %type          <struct psi_layout>                                     align_and_size
 %destructor    {}                                                                      align_and_size
@@ -1235,10 +1260,16 @@ decl_args[args]:
 |      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);
 }
 ;
@@ -1512,6 +1543,7 @@ sizeof_body[sizeof]:
        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);
        }
@@ -1628,6 +1660,7 @@ array_size[as]:
        } else {
                $as = 0;
        }
+       psi_num_exp_free(&$num_exp);
 }
 ;
 
@@ -1834,8 +1867,8 @@ let_calloc[calloc]:
 ;
 
 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 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);
 }