ahp/busybox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

shell/math: simpler insertion of "fake" last RPAREN

Browse source 
Skip one pass through token table, since we know the result.

function                                             old     new   delta
evaluate_string                                     1095    1097      +2

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2023-06-15 09:19:48 +02:00
parent 2ff01bb699
commit 3829d8b675
1 changed files with 6 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

13
shell/math.c
View file

@ -518,7 +518,7 @@ static const char op_tokens[] ALIGN1 = {
'(', 0, TOK_LPAREN, '(', 0, TOK_LPAREN,
0 0
}; };
#define ptr_to_rparen (&op_tokens[sizeof(op_tokens)-7]) #define END_POINTER (&op_tokens[sizeof(op_tokens)-1])
#if ENABLE_FEATURE_SH_MATH_BASE #if ENABLE_FEATURE_SH_MATH_BASE
static arith_t strto_arith_t(const char *nptr, char **endptr) static arith_t strto_arith_t(const char *nptr, char **endptr)
@ -653,13 +653,13 @@ evaluate_string(arith_state_t *math_state, const char *expr)
* are to be applied in order. At the end, there should be a final * are to be applied in order. At the end, there should be a final
* result on the integer stack */ * result on the integer stack */
if (expr != ptr_to_rparen + 1) { if (expr != END_POINTER) {
/* If we haven't done so already, /* If we haven't done so already,
* append a closing right paren * append a closing right paren
* and let the loop process it */ * and let the loop process it */
expr = ptr_to_rparen; expr = END_POINTER;
//bb_error_msg("expr=')'"); op = TOK_RPAREN;
goto tok_find; goto tok_found1;
} }
/* At this point, we're done with the expression */ /* At this point, we're done with the expression */
if (numstackptr != numstack + 1) { if (numstackptr != numstack + 1) {
@ -725,7 +725,7 @@ evaluate_string(arith_state_t *math_state, const char *expr)
} }
} }
} }
tok_find:
p = op_tokens; p = op_tokens;
while (1) { while (1) {
/* Compare expr to current op_tokens[] element */ /* Compare expr to current op_tokens[] element */
@ -792,7 +792,6 @@ evaluate_string(arith_state_t *math_state, const char *expr)
* "applied" in this way. * "applied" in this way.
*/ */
prec = PREC(op); prec = PREC(op);
//bb_error_msg("prec:%02x", prec);
if ((prec > 0 && prec < UNARYPREC) || prec == SPEC_PREC) { if ((prec > 0 && prec < UNARYPREC) || prec == SPEC_PREC) {
/* not left paren or unary */ /* not left paren or unary */
if (lasttok != TOK_NUM) { if (lasttok != TOK_NUM) {