djsundog/circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

py: Change macro var args in parser to be C99 compliant.

Browse Source
This commit is contained in:
Damien George 2014-01-23 00:00:53 +00:00
parent 0d028743aa
commit 00208ce194
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
py/compile.c
View File

@ -23,7 +23,7 @@
typedef enum { typedef enum {
PN_none = 0, PN_none = 0,
#define DEF_RULE(rule, comp, kind, arg...) PN_##rule, #define DEF_RULE(rule, comp, kind, ...) PN_##rule,
#include "grammar.h" #include "grammar.h"
#undef DEF_RULE #undef DEF_RULE
PN_maximum_number_of, PN_maximum_number_of,

8
py/parse.c
View File

@ -40,7 +40,7 @@ typedef struct _rule_t {
enum { enum {
RULE_none = 0, RULE_none = 0,
#define DEF_RULE(rule, comp, kind, arg...) RULE_##rule, #define DEF_RULE(rule, comp, kind, ...) RULE_##rule,
#include "grammar.h" #include "grammar.h"
#undef DEF_RULE #undef DEF_RULE
RULE_maximum_number_of, RULE_maximum_number_of,
@ -56,9 +56,9 @@ enum {
#define opt_tok(t) (RULE_ARG_OPT_TOK | MP_TOKEN_##t) #define opt_tok(t) (RULE_ARG_OPT_TOK | MP_TOKEN_##t)
#define opt_rule(r) (RULE_ARG_OPT_RULE | RULE_##r) #define opt_rule(r) (RULE_ARG_OPT_RULE | RULE_##r)
#ifdef USE_RULE_NAME #ifdef USE_RULE_NAME
#define DEF_RULE(rule, comp, kind, arg...) static const rule_t rule_##rule = { RULE_##rule, kind, #rule, { arg } }; #define DEF_RULE(rule, comp, kind, ...) static const rule_t rule_##rule = { RULE_##rule, kind, #rule, { __VA_ARGS__ } };
#else #else
#define DEF_RULE(rule, comp, kind, arg...) static const rule_t rule_##rule = { RULE_##rule, kind, { arg } }; #define DEF_RULE(rule, comp, kind, ...) static const rule_t rule_##rule = { RULE_##rule, kind, { __VA_ARGS__ } };
#endif #endif
#include "grammar.h" #include "grammar.h"
#undef or #undef or
@ -74,7 +74,7 @@ enum {
static const rule_t *rules[] = { static const rule_t *rules[] = {
NULL, NULL,
#define DEF_RULE(rule, comp, kind, arg...) &rule_##rule, #define DEF_RULE(rule, comp, kind, ...) &rule_##rule,
#include "grammar.h" #include "grammar.h"
#undef DEF_RULE #undef DEF_RULE
}; };