aboutsummaryrefslogtreecommitdiff
path: root/shell/math.c
diff options
context:
space:
mode:
Diffstat (limited to 'shell/math.c')
-rw-r--r--shell/math.c48
1 files changed, 34 insertions, 14 deletions
diff --git a/shell/math.c b/shell/math.c
index 748c3b3ad..f6aa02ac2 100644
--- a/shell/math.c
+++ b/shell/math.c
@@ -157,17 +157,17 @@ typedef unsigned char operator;
157#define fix_assignment_prec(prec) do { if (prec == 3) prec = 2; } while (0) 157#define fix_assignment_prec(prec) do { if (prec == 3) prec = 2; } while (0)
158 158
159/* Ternary conditional operator is right associative too */ 159/* Ternary conditional operator is right associative too */
160// FIXME: 160/*
161// bash documentation says that precedence order is: 161 * bash documentation says that precedence order is:
162// ... 162 * ...
163// expr ? expr1 : expr2 163 * expr ? expr1 : expr2
164// = *= /= %= += -= <<= >>= &= ^= |= 164 * = *= /= %= += -= <<= >>= &= ^= |=
165// exprA , exprB 165 * exprA , exprB
166// but in practice, the rules for expr1 and expr2 are different: 166 * What it omits is that expr1 is parsed as if parenthesized
167// assignments and commas in expr1 have higher precedence than ?:, 167 * (this matches the rules of ?: in C language):
168// but in expr2 they haven't: 168 * "v ? 1,2 : 3,4" is parsed as "(v ? (1,2) : 3),4"
169// "v ? 1,2 : 3,4" is parsed as "(v ? (1,2) : 3),4" 169 * "v ? a=2 : b=4" is parsed as "(v ? (a=1) : b)=4" (thus, this is a syntax error)
170// "v ? a=2 : b=4" is parsed as "(v ? (a=1) : b)=4" (thus, this is a syntax error) 170 */
171#define TOK_CONDITIONAL tok_decl(4,0) 171#define TOK_CONDITIONAL tok_decl(4,0)
172#define TOK_CONDITIONAL_SEP tok_decl(4,1) 172#define TOK_CONDITIONAL_SEP tok_decl(4,1)
173 173
@@ -629,6 +629,7 @@ evaluate_string(arith_state_t *math_state, const char *expr)
629 /* Stack of operator tokens */ 629 /* Stack of operator tokens */
630 operator *const opstack = alloca(expr_len * sizeof(opstack[0])); 630 operator *const opstack = alloca(expr_len * sizeof(opstack[0]));
631 operator *opstackptr = opstack; 631 operator *opstackptr = opstack;
632 operator insert_op = 0xff;
632 633
633 /* Start with a left paren */ 634 /* Start with a left paren */
634 dbg("(%d) op:TOK_LPAREN", (int)(opstackptr - opstack)); 635 dbg("(%d) op:TOK_LPAREN", (int)(opstackptr - opstack));
@@ -751,11 +752,24 @@ evaluate_string(arith_state_t *math_state, const char *expr)
751 goto err; 752 goto err;
752 } 753 }
753 } 754 }
755 /* NB: expr now points past the operator */
754 tok_found: 756 tok_found:
755 op = p[1]; /* fetch TOK_foo value */ 757 op = p[1]; /* fetch TOK_foo value */
756 tok_found1:
757 /* NB: expr now points past the operator */
758 758
759 /* Special rule for "? EXPR :"
760 * "EXPR in the middle of ? : is parsed as if parenthesized"
761 * (this quirk originates in C grammar, I think).
762 */
763 if (op == TOK_CONDITIONAL) {
764 insert_op = TOK_LPAREN;
765 dbg("insert_op=%02x", insert_op);
766 }
767 if (op == TOK_CONDITIONAL_SEP) {
768 insert_op = op;
769 op = TOK_RPAREN;
770 dbg("insert_op=%02x op=%02x", insert_op, op);
771 }
772 tok_found1:
759 /* post grammar: a++ reduce to num */ 773 /* post grammar: a++ reduce to num */
760 if (lasttok == TOK_POST_INC || lasttok == TOK_POST_DEC) 774 if (lasttok == TOK_POST_INC || lasttok == TOK_POST_DEC)
761 lasttok = TOK_NUM; 775 lasttok = TOK_NUM;
@@ -865,9 +879,15 @@ dbg(" numstack:%d val:%lld '%s'", (int)(numstackptr - numstack), numstackptr[
865 /* else: LPAREN or UNARY: push it on opstack */ 879 /* else: LPAREN or UNARY: push it on opstack */
866 push_op: 880 push_op:
867 /* Push this operator to opstack */ 881 /* Push this operator to opstack */
868 dbg("(%d) op:%02x", (int)(opstackptr - opstack), op); 882 dbg("(%d) op:%02x insert_op:%02x", (int)(opstackptr - opstack), op, insert_op);
869 *opstackptr++ = lasttok = op; 883 *opstackptr++ = lasttok = op;
870 next: ; 884 next: ;
885 if (insert_op != 0xff) {
886 op = insert_op;
887 insert_op = 0xff;
888 dbg("inserting %02x", op);
889 goto tok_found1;
890 }
871 } /* while (1) */ 891 } /* while (1) */
872 892
873 err: 893 err: