Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2024-12-29 06:13:20 +00:00
Code Issues Projects Releases Packages Wiki Activity

tinyexpr: report errors for extra args in parens correctly.

Browse source 
Usages like `math (1 1)` should report too many arguments,
same as `math 1 1`. Check for these cases and add tests.

Fixes #8511
This commit is contained in:
Aaron Gyes 2021-12-01 04:38:42 -08:00
parent abf119918f
commit de0cbd2984
2 changed files with 21 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/tinyexpr.cpp
View file

@ -449,8 +449,11 @@ static te_expr *base(state *s) {
case TOK_OPEN: case TOK_OPEN:
next_token(s); next_token(s);
ret = expr(s); ret = expr(s);
if (s->type == TOK_CLOSE) { if (s->type == TOK_CLOSE)
next_token(s); next_token(s);
else if (s->type != TOK_ERROR && s->type != TOK_END && s->error == TE_ERROR_NONE) {
s->type = TOK_ERROR;
s->error = TE_ERROR_TOO_MANY_ARGS;
} else if (s->type != TOK_ERROR || s->error == TE_ERROR_UNKNOWN) { } else if (s->type != TOK_ERROR || s->error == TE_ERROR_UNKNOWN) {
s->type = TOK_ERROR; s->type = TOK_ERROR;
s->error = TE_ERROR_MISSING_CLOSING_PAREN; s->error = TE_ERROR_MISSING_CLOSING_PAREN;

17
tests/checks/math.fish
View file

@ -129,6 +129,18 @@ not math '2 + 2 4'
# CHECKERR: math: Error: Too many arguments # CHECKERR: math: Error: Too many arguments
# CHECKERR: '2 + 2 4' # CHECKERR: '2 + 2 4'
# CHECKERR: ^ # CHECKERR: ^
not math '(1 2)'
# CHECKERR: math: Error: Too many arguments
# CHECKERR: '(1 2)'
# CHECKERR: ^
not math '(1 pi)'
# CHECKERR: math: Error: Too many arguments
# CHECKERR: '(1 pi)'
# CHECKERR: ^
not math '(1 pow 1,2)'
# CHECKERR: math: Error: Too many arguments
# CHECKERR: '(1 pow 1,2)'
# CHECKERR: ^
not math not math
# CHECKERR: math: expected >= 1 arguments; got 0 # CHECKERR: math: expected >= 1 arguments; got 0
not math -s 12 not math -s 12
@ -182,6 +194,11 @@ math 'log(16'
# CHECKERR: 'log(16' # CHECKERR: 'log(16'
# CHECKERR: ^ # CHECKERR: ^
math '(2'
# CHECKERR: math: Error: Missing closing parenthesis
# CHECKERR: '(2'
# CHECKERR: ^
math --base=16 255 / 15 math --base=16 255 / 15
# CHECK: 0x11 # CHECK: 0x11
math -bhex 16 x 2 math -bhex 16 x 2