emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bc: unbreak "z function" macro machinery

Browse Source 
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2018-12-22 18:24:19 +01:00
parent badf683b0a
commit 5cf0b2d466
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
miscutils/bc.c
View File

@ -2902,6 +2902,8 @@ static bool bc_lex_more_input(BcLex *l)
IF_BC(static BC_STATUS zbc_lex_token(BcLex *l);) IF_BC(static BC_STATUS zbc_lex_token(BcLex *l);)
IF_DC(static BC_STATUS zdc_lex_token(BcLex *l);) IF_DC(static BC_STATUS zdc_lex_token(BcLex *l);)
#define zbc_lex_token(...) (zbc_lex_token(__VA_ARGS__) COMMA_SUCCESS)
#define zdc_lex_token(...) (zdc_lex_token(__VA_ARGS__) COMMA_SUCCESS)
static BC_STATUS zbc_lex_next(BcLex *l) static BC_STATUS zbc_lex_next(BcLex *l)
{ {
@ -3100,6 +3102,7 @@ static BC_STATUS zbc_lex_comment(BcLex *l)
} }
#define zbc_lex_comment(...) (zbc_lex_comment(__VA_ARGS__) COMMA_SUCCESS) #define zbc_lex_comment(...) (zbc_lex_comment(__VA_ARGS__) COMMA_SUCCESS)
#undef zbc_lex_token
static BC_STATUS zbc_lex_token(BcLex *l) static BC_STATUS zbc_lex_token(BcLex *l)
{ {
BcStatus s = BC_STATUS_SUCCESS; BcStatus s = BC_STATUS_SUCCESS;
@ -3290,6 +3293,7 @@ static BC_STATUS zbc_lex_token(BcLex *l)
RETURN_STATUS(s); RETURN_STATUS(s);
} }
#define zbc_lex_token(...) (zbc_lex_token(__VA_ARGS__) COMMA_SUCCESS)
#endif // ENABLE_BC #endif // ENABLE_BC
#if ENABLE_DC #if ENABLE_DC
@ -3356,6 +3360,7 @@ static BC_STATUS zdc_lex_string(BcLex *l)
} }
#define zdc_lex_string(...) (zdc_lex_string(__VA_ARGS__) COMMA_SUCCESS) #define zdc_lex_string(...) (zdc_lex_string(__VA_ARGS__) COMMA_SUCCESS)
#undef zdc_lex_token
static BC_STATUS zdc_lex_token(BcLex *l) static BC_STATUS zdc_lex_token(BcLex *l)
{ {
static const //BcLexType - should be this type, but narrower type saves size: static const //BcLexType - should be this type, but narrower type saves size:
@ -3500,6 +3505,7 @@ static BC_STATUS zdc_lex_token(BcLex *l)
RETURN_STATUS(s); RETURN_STATUS(s);
} }
#define zdc_lex_token(...) (zdc_lex_token(__VA_ARGS__) COMMA_SUCCESS)
#endif // ENABLE_DC #endif // ENABLE_DC
static void bc_parse_push(BcParse *p, char i) static void bc_parse_push(BcParse *p, char i)