Apple-2gs-SW/hush
1
0
Fork 0
mirror of https://github.com/sheumann/hush.git synced 2024-09-12 00:55:11 +00:00
Code Issues Projects Releases Wiki Activity

shell: small code shrink

Browse Source 
function                                             old     new   delta
arith                                                680     675      -5

Signed-off-by: Denys Vlasenko <dvlasenk@redhat.com>
This commit is contained in:
Denys Vlasenko 2010-09-13 01:09:11 +02:00
parent b771c654ca
commit 51850c818c
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
shell/math.c
View File

@ -635,28 +635,29 @@ arith(const char *expr, int *perrcode, a_e_h_t *math_hooks)
goto err; goto err;
} }
while (stackptr != stack) { while (stackptr != stack) {
operator prev_op = *--stackptr;
if (op == TOK_RPAREN) { if (op == TOK_RPAREN) {
/* The algorithm employed here is simple: while we don't /* The algorithm employed here is simple: while we don't
* hit an open paren nor the bottom of the stack, pop * hit an open paren nor the bottom of the stack, pop
* tokens and apply them */ * tokens and apply them */
if (stackptr[-1] == TOK_LPAREN) { if (prev_op == TOK_LPAREN) {
--stackptr;
/* Any operator directly after a */ /* Any operator directly after a */
lasttok = TOK_NUM; lasttok = TOK_NUM;
/* close paren should consider itself binary */ /* close paren should consider itself binary */
goto next; goto next;
} }
} else { } else {
operator prev_prec = PREC(stackptr[-1]); operator prev_prec = PREC(prev_op);
convert_prec_is_assign(prec); convert_prec_is_assign(prec);
convert_prec_is_assign(prev_prec); convert_prec_is_assign(prev_prec);
if (prev_prec < prec) if (prev_prec < prec
break; || (prev_prec == prec && is_right_associativity(prec))
/* check right assoc */ ) {
if (prev_prec == prec && is_right_associativity(prec)) stackptr++;
break; break;
}
} }
errcode = arith_apply(*--stackptr, numstack, &numstackptr, math_hooks); errcode = arith_apply(prev_op, numstack, &numstackptr, math_hooks);
if (errcode) if (errcode)
goto ret; goto ret;
} }