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

Changed error handling a bit. te_interp returns NaN for bad expressions.

Browse Source
This commit is contained in:
Lewis Van Winkle
2016-01-23 12:09:38 -06:00
parent b7af2e3751
commit 1ee637afef
5 changed files with 63 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
tinyexpr.c
View File

@@ -56,6 +56,7 @@ static te_expr *new_expr(te_expr *l, te_expr *r) {
void te_free(te_expr *n) {
if (!n) return;
if (n->left) te_free(n->left);
if (n->right) te_free(n->right);
free(n);
@@ -232,7 +233,7 @@ static te_expr *base(state *s) {
default:
ret = new_expr(0, 0);
s->type = TOK_ERROR;
ret->value = 1.0/0.0;
ret->value = 0.0/0.0;
break;
}
@@ -358,24 +359,30 @@ te_expr *te_compile(const char *expression, const te_variable *lookup, int looku
next_token(&s);
te_expr *root = expr(&s);
if (s.type != TOK_END) {
if (error) *error = (s.next - s.start);
if (*error == 0) *error = 1;
te_free(root);
if (error) {
*error = (s.next - s.start);
if (*error == 0) *error = 1;
}
return 0;
} else {
optimize(root);
if (error) *error = 0;
return root;
}
return root;
}
double te_interp(const char *expression, int *error) {
te_expr *n = te_compile(expression, 0, 0, error);
double ret = te_eval(n);
free(n);
double ret;
if (n) {
ret = te_eval(n);
free(n);
} else {
ret = 0.0/0.0;
}
return ret;
}