Skip to content

Commit 00208ce

Browse files
dpgeorgedpgeorge
committed
py: Change macro var args in parser to be C99 compliant.
1 parent 0d02874 commit 00208ce

2 files changed

Lines changed: 5 additions & 5 deletions

File tree

‎py/compile.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323

2424
typedef enum {
2525
PN_none = 0,
26-
#define DEF_RULE(rule, comp, kind, arg...) PN_##rule,
26+
#define DEF_RULE(rule, comp, kind, ...) PN_##rule,
2727
#include "grammar.h"
2828
#undef DEF_RULE
2929
PN_maximum_number_of,

‎py/parse.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ typedef struct _rule_t {
4040

4141
enum {
4242
RULE_none = 0,
43-
#define DEF_RULE(rule, comp, kind, arg...) RULE_##rule,
43+
#define DEF_RULE(rule, comp, kind, ...) RULE_##rule,
4444
#include "grammar.h"
4545
#undef DEF_RULE
4646
RULE_maximum_number_of,
@@ -56,9 +56,9 @@ enum {
5656
#define opt_tok(t) (RULE_ARG_OPT_TOK | MP_TOKEN_##t)
5757
#define opt_rule(r) (RULE_ARG_OPT_RULE | RULE_##r)
5858
#ifdef USE_RULE_NAME
59-
#define DEF_RULE(rule, comp, kind, arg...) static const rule_t rule_##rule = { RULE_##rule, kind, #rule, { arg } };
59+
#define DEF_RULE(rule, comp, kind, ...) static const rule_t rule_##rule = { RULE_##rule, kind, #rule, { __VA_ARGS__ } };
6060
#else
61-
#define DEF_RULE(rule, comp, kind, arg...) static const rule_t rule_##rule = { RULE_##rule, kind, { arg } };
61+
#define DEF_RULE(rule, comp, kind, ...) static const rule_t rule_##rule = { RULE_##rule, kind, { __VA_ARGS__ } };
6262
#endif
6363
#include "grammar.h"
6464
#undef or
@@ -74,7 +74,7 @@ enum {
7474

7575
static const rule_t *rules[] = {
7676
NULL,
77-
#define DEF_RULE(rule, comp, kind, arg...) &rule_##rule,
77+
#define DEF_RULE(rule, comp, kind, ...) &rule_##rule,
7878
#include "grammar.h"
7979
#undef DEF_RULE
8080
};

0 commit comments

Comments
 (0)