cpp: fix relative includes

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

diff --git a/src/parser_proc_grammar.y b/src/parser_proc_grammar.y
index 22733b78c6c19bae89eb6c547973b5cf8e28a0ad..4b099632ca04385684b975c305dc05d69378739b 100644 (file)
--- a/src/parser_proc_grammar.y
+++ b/src/parser_proc_grammar.y
@@ -37,24 +37,6 @@ 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_add_from_typedef(struct psi_parser *P, struct psi_decl_arg *def)
-{
-       if (def->type->real.def) {
-               switch (def->type->type) {
-               case PSI_T_STRUCT:
-                       psi_parser_proc_add_struct(P, def->type->real.strct);
-                       break;
-               case PSI_T_UNION:
-                       psi_parser_proc_add_union(P, def->type->real.unn);
-                       break;
-               case PSI_T_ENUM:
-                       psi_parser_proc_add_enum(P, def->type->real.enm);
-                       break;
-               default:
-                       break;
-               }
-       }
-}
 static inline void psi_parser_proc_add_typedef(struct psi_parser *P, struct psi_decl_arg *def)
 {
        assert(def);
@@ -62,7 +44,6 @@ static inline void psi_parser_proc_add_typedef(struct psi_parser *P, struct psi_
                P->types = psi_plist_init((psi_plist_dtor) psi_decl_arg_free);
        }
        P->types = psi_plist_add(P->types, &def);
-       psi_parser_proc_add_from_typedef(P, def);
 }
 static inline void psi_parser_proc_add_const(struct psi_parser *P, struct psi_const *cnst) {
        assert(cnst);
@@ -578,7 +559,13 @@ cpp_macro_sig[sig]:
        %empty {
        $sig = psi_plist_init(NULL);
 }
+|      ELLIPSIS {
+       $sig = psi_plist_init(NULL); /* FIXME */
+}
 |      cpp_macro_sig_args
+|      cpp_macro_sig_args[args] COMMA ELLIPSIS {
+       $sig = $args;
+}
 ;
 
 cpp_macro_sig_args[args]:
@@ -763,6 +750,15 @@ decl_typedef[def]:
        TYPEDEF typedef[def_] EOS {
        $def = $def_;
 }
+|      TYPEDEF VOID name_token EOS {
+       $def = psi_decl_arg_init(
+               psi_decl_type_init(PSI_T_VOID, $VOID->text),
+               psi_decl_var_init($name_token->text, 0, 0)
+       );
+       $def->token = psi_token_copy($VOID);
+       $def->type->token = psi_token_copy($VOID);
+       $def->var->token = psi_token_copy($name_token);
+}
 |      CPP_EXTENSION TYPEDEF typedef[def_] EOS {
        $def = $def_;
 }
@@ -787,6 +783,7 @@ typedef[def]:
        $def->var->token = psi_token_copy($name_token);
        $def->type->token = psi_token_copy($enum->token);
        $def->type->real.enm = $enum;
+       psi_parser_proc_add_enum(P, $enum);
 }
 |      struct_name[struct] align_and_size[as] struct_args_block[args] decl_var[var] {
        $def = psi_decl_arg_init(psi_decl_type_init(PSI_T_STRUCT, $struct->text), $var);
@@ -795,6 +792,7 @@ typedef[def]:
        $def->type->real.strct->token = psi_token_copy($struct);
        $def->type->real.strct->align = $as.pos;
        $def->type->real.strct->size = $as.len;
+       psi_parser_proc_add_struct(P, $def->type->real.strct);
 }
 |      union_name[union] align_and_size[as] struct_args_block[args] decl_var[var] {
        $def = psi_decl_arg_init(psi_decl_type_init(PSI_T_UNION, $union->text), $var);
@@ -803,6 +801,7 @@ typedef[def]:
        $def->type->real.unn->token = psi_token_copy($union);
        $def->type->real.unn->align = $as.pos;
        $def->type->real.unn->size = $as.len;
+       psi_parser_proc_add_union(P, $def->type->real.unn);
 }
 |      const_decl_type[type] decl_stdint_type[stdint] {
        $stdint->type = PSI_T_NAME;
@@ -1465,6 +1464,9 @@ array_size[as]:
        %empty {
        $as = 0;
 }
+|      LBRACKET RBRACKET {
+       $as = 0;
+}
 |      LBRACKET NUMBER RBRACKET {
        $as = atol($NUMBER->text);
 }
@@ -1487,14 +1489,19 @@ pointers[p]:
 ;
 
 asterisks[a]:
-       ASTERISK {
+       asterisk {
        $a = 1;
 }
-|      asterisks[a_] ASTERISK {
+|      asterisks[a_] asterisk {
        $a = $a_ + 1;
 }
 ;
 
+asterisk:
+       ASTERISK
+|      ASTERISK CONST
+;
+
 /*
  *
  * impl