h/fish-shell
1
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2026-06-30 15:21:16 -03:00
Code Issues Packages Projects Releases Wiki Activity

math: Make function parentheses optional (#7877)

Browse Source 
* math: Make function parentheses optional

It's a bit annoying to use parentheses here because that requires
quoting or escaping.

This allows the parens to be omitted, so

math sin pi

is the same as

math 'sin(pi)'

Function calls have the lowest precedence, so

math sin 2 + 6

is the same as

math 'sin(2 + 6)'

* Add more tests

* Add a note to the docs

* even moar docs

Moar docca

* moar tests

Call me Nikola Testla
This commit is contained in:
Fabian Homborg
2021-03-30 17:21:28 +02:00
committed by GitHub
parent d5cba5fe12
commit ed9268f99c
3 changed files with 61 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
src/tinyexpr.cpp
View File

@@ -396,41 +396,52 @@ static te_expr *base(state *s) {
case TE_FUNCTION1:
case TE_FUNCTION2:
case TE_FUNCTION3:
case TE_FUNCTION3: {
arity = get_arity(s->type);
ret = new_expr(s->type, nullptr);
ret->function = s->function;
next_token(s);
bool have_open = false;
if (s->type == TOK_OPEN) {
int i;
for (i = 0; i < arity; i++) {
next_token(s);
ret->parameters[i] = expr(s);
if (s->type != TOK_SEP) {
break;
}
// If we *have* an opening parenthesis,
// we need to consume it and
// expect a closing one.
have_open = true;
next_token(s);
}
int i;
for (i = 0; i < arity; i++) {
ret->parameters[i] = expr(s);
if (s->type != TOK_SEP) {
break;
}
if (s->type == TOK_CLOSE && i == arity - 1) {
next_token(s);
} else if (s->type != TOK_ERROR || s->error == TE_ERROR_UNEXPECTED_TOKEN) {
// If we had the right number of arguments, we're missing a closing paren.
if (i == arity - 1 && s->type != TOK_ERROR) {
s->error = TE_ERROR_MISSING_CLOSING_PAREN;
} else {
// Otherwise we complain about the number of arguments *first*,
// a closing parenthesis should be more obvious.
s->error = i < arity ? TE_ERROR_TOO_FEW_ARGS : TE_ERROR_TOO_MANY_ARGS;
}
s->type = TOK_ERROR;
next_token(s);
}
if (!have_open && i == arity - 1) {
break;
}
if (have_open && s->type == TOK_CLOSE && i == arity - 1) {
// We have an opening and a closing paren, consume the closing one and done.
next_token(s);
} else if (s->type != TOK_ERROR || s->error == TE_ERROR_UNEXPECTED_TOKEN) {
// If we had the right number of arguments, we're missing a closing paren.
if (have_open && i == arity - 1 && s->type != TOK_ERROR) {
s->error = TE_ERROR_MISSING_CLOSING_PAREN;
} else {
// Otherwise we complain about the number of arguments *first*,
// a closing parenthesis should be more obvious.
s->error = i < arity ? TE_ERROR_TOO_FEW_ARGS : TE_ERROR_TOO_MANY_ARGS;
}
} else if (s->type != TOK_ERROR || s->error == TE_ERROR_UNKNOWN) {
s->type = TOK_ERROR;
s->error = TE_ERROR_MISSING_OPENING_PAREN;
}
break;
}
case TOK_OPEN:
next_token(s);