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

clang-format and minor cleanup of tinyexpr.cpp

Browse Source 
Clarifies some code and fixes some g++ 4.8 warnings.
This commit is contained in:
ridiculousfish
2022-09-20 12:48:26 -07:00
parent 86138db9f5
commit 81c29d8891
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/tinyexpr.cpp
View File

@@ -53,7 +53,7 @@ struct te_fun_t {
bool operator==(fn_2 fn) const { return arity_ == 2 && fun2 == fn; } bool operator==(fn_2 fn) const { return arity_ == 2 && fun2 == fn; }
[[nodiscard]] int arity() const { return arity_; } __warn_unused int arity() const { return arity_; }
double operator()() const { double operator()() const {
assert(arity_ == 0); assert(arity_ == 0);
@@ -112,7 +112,7 @@ struct state {
explicit state(const wchar_t *expr) : start_{expr}, next_{expr} { next_token(); } explicit state(const wchar_t *expr) : start_{expr}, next_{expr} { next_token(); }
double eval() { return expr(); } double eval() { return expr(); }
[[nodiscard]] te_error_t error() const { __warn_unused te_error_t error() const {
if (type_ == TOK_END) return {TE_ERROR_NONE, 0, 0}; if (type_ == TOK_END) return {TE_ERROR_NONE, 0, 0};
// If we have an error position set, use that, // If we have an error position set, use that,
// otherwise the current position. // otherwise the current position.
@@ -315,7 +315,6 @@ void state::next_token() {
error_ = TE_ERROR_UNKNOWN_FUNCTION; error_ = TE_ERROR_UNKNOWN_FUNCTION;
errpos_ = start + 1; errpos_ = start + 1;
errlen_ = next_ - start; errlen_ = next_ - start;
} }
} else { } else {
/* Look for an operator or special character. */ /* Look for an operator or special character. */
@@ -398,8 +397,11 @@ double state::base() {
// The error should be given *between* // The error should be given *between*
// the last two tokens. // the last two tokens.
errpos_ = next + 1; errpos_ = next + 1;
// Go to the end of whitespace. // Go to the end of whitespace and then one more.
while (wcschr(L" \t\n\r", next++[0])); while (wcschr(L" \t\n\r", next[0])) {
next++;
}
next++;
errlen_ = next - errpos_; errlen_ = next - errpos_;
} }
return val; return val;
@@ -434,7 +436,7 @@ double state::base() {
std::vector<double> parameters; std::vector<double> parameters;
int i; int i;
const wchar_t *first_err = nullptr; const wchar_t *first_err = nullptr;
for (i = 0; ; i++) { for (i = 0;; i++) {
if (i == arity) first_err = next_; if (i == arity) first_err = next_;
parameters.push_back(expr()); parameters.push_back(expr());
if (type_ != TOK_SEP) { if (type_ != TOK_SEP) {
@@ -463,7 +465,8 @@ double state::base() {
// a closing parenthesis should be more obvious. // a closing parenthesis should be more obvious.
// //
// Vararg functions need at least one argument. // Vararg functions need at least one argument.
error_ = (i < arity || (arity == -1 && i == 0)) ? TE_ERROR_TOO_FEW_ARGS : TE_ERROR_TOO_MANY_ARGS; error_ = (i < arity || (arity == -1 && i == 0)) ? TE_ERROR_TOO_FEW_ARGS
: TE_ERROR_TOO_MANY_ARGS;
type_ = TOK_ERROR; type_ = TOK_ERROR;
if (first_err) { if (first_err) {
errpos_ = first_err; errpos_ = first_err;