github-mirrors/thirdparty-tinyexpr
1
0
Fork 0
mirror of https://github.com/eledio-devices/thirdparty-tinyexpr.git synced 2025-10-31 08:42:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

Added support for underscore in variable names.

Browse Source
This commit is contained in:
Lewis Van Winkle
2016-11-28 18:20:10 -06:00
parent f0b59d6d48
commit 5bb556038d
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
test.c
View File

@@ -237,7 +237,7 @@ void test_nans() {
void test_variables() { void test_variables() {
double x, y, test; double x, y, test;
te_variable lookup[] = {{"x", &x}, {"y", &y}, {"test", &test}}; te_variable lookup[] = {{"x", &x}, {"y", &y}, {"te_st", &test}};
int err; int err;
@@ -253,7 +253,7 @@ void test_variables() {
lok(expr3); lok(expr3);
lok(!err); lok(!err);
te_expr *expr4 = te_compile("test+5", lookup, 3, &err); te_expr *expr4 = te_compile("te_st+5", lookup, 3, &err);
lok(expr4); lok(expr4);
lok(!err); lok(!err);

2
tinyexpr.c
View File

@@ -207,7 +207,7 @@ void next_token(state *s) {
if (s->next[0] >= 'a' && s->next[0] <= 'z') { if (s->next[0] >= 'a' && s->next[0] <= 'z') {
const char *start; const char *start;
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++; 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_lookup(s, start, s->next - start); const te_variable *var = find_lookup(s, start, s->next - start);
if (!var) var = find_builtin(start, s->next - start); if (!var) var = find_builtin(start, s->next - start);