#define ALLOC_ITEM_DECLSPEC(ptr) ALLOC_ITEM(ptr, declspec, next)
#define ALLOC_ITEM_DECL(ptr) ALLOC_ITEM(ptr, decl, next)
-#define ALLOC_FUNCTION(ptr, parameters_, variadic_) do { \
+#define ALLOC_FUNCTION_(ptr, parameters_) do { \
ALLOC_ITEM_DECLARATOR(ptr); \
(ptr)->type = CDECL_DECL_FUNCTION; \
(ptr)->u.function.parameters = parameters_; \
+} while (0)
+
+#define ALLOC_FUNCTION(ptr, parameters_, variadic_) do { \
+ ALLOC_FUNCTION_(ptr, parameters_); \
(ptr)->u.function.variadic = variadic_; \
} while (0)
varargs: { $$ = false; } | T_COMMA T_ELLIPSIS { $$ = true; }
-parameter_type_list: parameter varargs {
- ALLOC_FUNCTION($$, $1, $2);
-} | parameter T_COMMA parameter_type_list {
- $$ = $3;
- $1->next = $$->u.function.parameters;
- $$->u.function.parameters = $1;
+parameter_type_list: parameter {
+ ALLOC_FUNCTION_($$, $1);
+} | parameter_type_list T_COMMA parameter {
+ $$ = $1;
+ $3->next = $$->u.function.parameters;
+ $$->u.function.parameters = $3;
}
-parens: T_LPAREN parameter_type_list T_RPAREN {
+parens: T_LPAREN parameter_type_list varargs T_RPAREN {
+ $2->u.function.parameters = reverse_decls($2->u.function.parameters);
+ $2->u.function.variadic = $3;
$$ = $2;
} | T_LPAREN declarator_ish T_RPAREN {
struct cdecl *fake_params;
ALLOC_DECL(fake_params, NULL, $2);
- ALLOC_FUNCTION($$, fake_params, false);
+ ALLOC_FUNCTION_($$, fake_params);
}
pointer: T_ASTERISK qualifiers direct_declarator {
english_function: T_FUNCTION T_RETURNING {
ALLOC_FUNCTION($$, NULL, false);
-} | T_FUNCTION T_LPAREN english_parameter_list T_RPAREN T_RETURNING {
+} | T_FUNCTION T_LPAREN english_parameter_list varargs T_RPAREN T_RETURNING {
+ $3->u.function.parameters = reverse_decls($3->u.function.parameters);
+ $3->u.function.variadic = $4;
$$ = $3;
}
-english_parameter_list: english_parameter varargs {
- ALLOC_FUNCTION($$, $1, $2);
-} | english_parameter T_COMMA english_parameter_list {
- $$ = $3;
- $1->next = $$->u.function.parameters;
- $$->u.function.parameters = $1;
+english_parameter_list: english_parameter {
+ ALLOC_FUNCTION_($$, $1);
+} | english_parameter_list T_COMMA english_parameter {
+ $$ = $1;
+ $3->next = $$->u.function.parameters;
+ $$->u.function.parameters = $3;
}
typedef_name_qual: T_IDENT qualifiers {