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: Rename te_variable to te_builtin

Browse source 
Variables aren't a thing here anymore.
This commit is contained in:
Fabian Homborg 2018-11-03 19:41:51 +01:00
parent a433868363
commit b8697e7795
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/tinyexpr.cpp
View file

@ -60,11 +60,11 @@ typedef struct te_expr {
} te_expr; } te_expr;
// TODO: Rename since variables have been removed. // TODO: Rename since variables have been removed.
typedef struct te_variable { typedef struct te_builtin {
const char *name; const char *name;
const void *address; const void *address;
int type; int type;
} te_variable; } te_builtin;
typedef struct state { typedef struct state {
const char *start; const char *start;
@ -157,7 +157,7 @@ static double ncr(double n, double r) {
static double npr(double n, double r) {return ncr(n, r) * fac(r);} static double npr(double n, double r) {return ncr(n, r) * fac(r);}
static const te_variable functions[] = { static const te_builtin functions[] = {
/* must be in alphabetical order */ /* must be in alphabetical order */
{"abs", (const void *)(te_fun1)fabs, TE_FUNCTION1}, {"abs", (const void *)(te_fun1)fabs, TE_FUNCTION1},
{"acos", (const void *)(te_fun1)acos, TE_FUNCTION1}, {"acos", (const void *)(te_fun1)acos, TE_FUNCTION1},
@ -186,10 +186,10 @@ static const te_variable functions[] = {
{"tanh", (const void *)(te_fun1)tanh, TE_FUNCTION1} {"tanh", (const void *)(te_fun1)tanh, TE_FUNCTION1}
}; };
static const te_variable *find_builtin(const char *name, int len) { static const te_builtin *find_builtin(const char *name, int len) {
const auto end = std::end(functions); const auto end = std::end(functions);
const te_variable *found = std::lower_bound(std::begin(functions), end, name, const te_builtin *found = std::lower_bound(std::begin(functions), end, name,
[len](const te_variable &lhs, const char *rhs) { [len](const te_builtin &lhs, const char *rhs) {
// The length is important because that's where the parens start // The length is important because that's where the parens start
return strncmp(lhs.name, rhs, len) < 0; return strncmp(lhs.name, rhs, len) < 0;
}); });
@ -224,7 +224,7 @@ void next_token(state *s) {
start = s->next; start = s->next;
while ((s->next[0] >= 'a' && s->next[0] <= 'z') || (s->next[0] >= '0' && s->next[0] <= '9') || (s->next[0] == '_')) s->next++; while ((s->next[0] >= 'a' && s->next[0] <= 'z') || (s->next[0] >= '0' && s->next[0] <= '9') || (s->next[0] == '_')) s->next++;
const te_variable *var = find_builtin(start, s->next - start); const te_builtin *var = find_builtin(start, s->next - start);
if (var) { if (var) {
switch(var->type) { switch(var->type) {