diff options
| author | Chet Ramey <chet.ramey@case.edu> | 2018-12-20 11:41:58 -0500 |
|---|---|---|
| committer | Chet Ramey <chet.ramey@case.edu> | 2018-12-20 11:41:58 -0500 |
| commit | f250956cb2a8dca13fc0242affc225f9d6983604 (patch) | |
| tree | 2df8e15963af786dc8efed1c91c4d823a3bf05bb /expr.c | |
| parent | 2ae59c1134a75d5778997b7202b15b0586283042 (diff) | |
| download | bash-5.0-testing.tar.gz | |
bash-5.0-rc1 releasebash-5.0-rc1bash-5.0-testing
Diffstat (limited to 'expr.c')
| -rw-r--r-- | expr.c | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -214,7 +214,7 @@ static intmax_t exp5 __P((void)); static intmax_t exp4 __P((void)); static intmax_t expshift __P((void)); static intmax_t exp3 __P((void)); -static intmax_t exp2 __P((void)); +static intmax_t expmuldiv __P((void)); static intmax_t exppower __P((void)); static intmax_t exp1 __P((void)); static intmax_t exp0 __P((void)); @@ -342,7 +342,7 @@ expr_bind_variable (lhs, rhs) #if defined (ARRAY_VARS) /* This is similar to the logic in arrayfunc.c:valid_array_subscript when you pass VA_NOEXPAND. */ -static char * +static int expr_skipsubscript (vp, cp) char *vp, *cp; { @@ -858,14 +858,14 @@ exp3 () { register intmax_t val1, val2; - val1 = exp2 (); + val1 = expmuldiv (); while ((curtok == PLUS) || (curtok == MINUS)) { int op = curtok; readtok (); - val2 = exp2 (); + val2 = expmuldiv (); if (op == PLUS) val1 += val2; @@ -877,7 +877,7 @@ exp3 () } static intmax_t -exp2 () +expmuldiv () { register intmax_t val1, val2; #if defined (HAVE_IMAXDIV) |