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

bc: move zbc_lex_next() out of zdc_parse_string() and zdc_parse_mem()

Browse Source 
function                                             old     new   delta
zdc_parse_mem                                         99      93      -6
zdc_parse_expr                                       586     569     -17
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 0/2 up/down: 0/-23)             Total: -23 bytes

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2018-12-22 16:40:38 +01:00
parent 7c1c9dc86b
commit 5daa1a0adf
1 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
miscutils/bc.c
View File

@ -4809,7 +4809,7 @@ static BC_STATUS zdc_parse_register(BcParse *p)
} }
#define zdc_parse_register(...) (zdc_parse_register(__VA_ARGS__) COMMA_SUCCESS) #define zdc_parse_register(...) (zdc_parse_register(__VA_ARGS__) COMMA_SUCCESS)
static BC_STATUS zdc_parse_string(BcParse *p) static void dc_parse_string(BcParse *p)
{ {
char *str; char *str;
size_t len = G.prog.strs.len; size_t len = G.prog.strs.len;
@ -4826,10 +4826,7 @@ static BC_STATUS zdc_parse_string(BcParse *p)
p->func = bc_program_func(p->fidx); p->func = bc_program_func(p->fidx);
dbg_lex_done("%s:%d done", __func__, __LINE__); dbg_lex_done("%s:%d done", __func__, __LINE__);
RETURN_STATUS(zbc_lex_next(&p->l));
} }
#define zdc_parse_string(...) (zdc_parse_string(__VA_ARGS__) COMMA_SUCCESS)
static BC_STATUS zdc_parse_mem(BcParse *p, uint8_t inst, bool name, bool store) static BC_STATUS zdc_parse_mem(BcParse *p, uint8_t inst, bool name, bool store)
{ {
@ -4847,7 +4844,7 @@ static BC_STATUS zdc_parse_mem(BcParse *p, uint8_t inst, bool name, bool store)
bc_parse_push(p, BC_INST_POP); bc_parse_push(p, BC_INST_POP);
} }
RETURN_STATUS(zbc_lex_next(&p->l)); RETURN_STATUS(BC_STATUS_SUCCESS);
} }
#define zdc_parse_mem(...) (zdc_parse_mem(__VA_ARGS__) COMMA_SUCCESS) #define zdc_parse_mem(...) (zdc_parse_mem(__VA_ARGS__) COMMA_SUCCESS)
@ -4877,11 +4874,13 @@ static BC_STATUS zdc_parse_cond(BcParse *p, uint8_t inst)
static BC_STATUS zdc_parse_token(BcParse *p, BcLexType t) static BC_STATUS zdc_parse_token(BcParse *p, BcLexType t)
{ {
BcStatus s = BC_STATUS_SUCCESS; BcStatus s;
uint8_t inst; uint8_t inst;
bool assign, get_token = false; bool assign, get_token;
dbg_lex_enter("%s:%d entered", __func__, __LINE__); dbg_lex_enter("%s:%d entered", __func__, __LINE__);
s = BC_STATUS_SUCCESS;
get_token = true;
switch (t) { switch (t) {
case BC_LEX_OP_REL_EQ: case BC_LEX_OP_REL_EQ:
case BC_LEX_OP_REL_LE: case BC_LEX_OP_REL_LE:
@ -4890,6 +4889,7 @@ static BC_STATUS zdc_parse_token(BcParse *p, BcLexType t)
case BC_LEX_OP_REL_LT: case BC_LEX_OP_REL_LT:
case BC_LEX_OP_REL_GT: case BC_LEX_OP_REL_GT:
s = zdc_parse_cond(p, t - BC_LEX_OP_REL_EQ + BC_INST_REL_EQ); s = zdc_parse_cond(p, t - BC_LEX_OP_REL_EQ + BC_INST_REL_EQ);
get_token = false;
break; break;
case BC_LEX_SCOLON: case BC_LEX_SCOLON:
case BC_LEX_COLON: case BC_LEX_COLON:
@ -4897,7 +4897,7 @@ static BC_STATUS zdc_parse_token(BcParse *p, BcLexType t)
break; break;
case BC_LEX_STR: case BC_LEX_STR:
dbg_lex("%s:%d LEX_STR", __func__, __LINE__); dbg_lex("%s:%d LEX_STR", __func__, __LINE__);
s = zdc_parse_string(p); dc_parse_string(p);
break; break;
case BC_LEX_NEG: case BC_LEX_NEG:
case BC_LEX_NUMBER: case BC_LEX_NUMBER:
@ -4910,11 +4910,9 @@ static BC_STATUS zdc_parse_token(BcParse *p, BcLexType t)
} }
bc_parse_pushNUM(p); bc_parse_pushNUM(p);
if (t == BC_LEX_NEG) bc_parse_push(p, BC_INST_NEG); if (t == BC_LEX_NEG) bc_parse_push(p, BC_INST_NEG);
get_token = true;
break; break;
case BC_LEX_KEY_READ: case BC_LEX_KEY_READ:
bc_parse_push(p, BC_INST_READ); bc_parse_push(p, BC_INST_READ);
get_token = true;
break; break;
case BC_LEX_OP_ASSIGN: case BC_LEX_OP_ASSIGN:
case BC_LEX_STORE_PUSH: case BC_LEX_STORE_PUSH:
@ -4934,9 +4932,8 @@ static BC_STATUS zdc_parse_token(BcParse *p, BcLexType t)
s = zdc_parse_mem(p, inst, false, true); s = zdc_parse_mem(p, inst, false, true);
break; break;
default: default:
s = bc_error_bad_token(); dbg_lex_done("%s:%d done (bad token)", __func__, __LINE__);
get_token = true; RETURN_STATUS(bc_error_bad_token());
break;
} }
if (!s && get_token) s = zbc_lex_next(&p->l); if (!s && get_token) s = zbc_lex_next(&p->l);