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

Using fmod function for modulus.

Browse Source
This commit is contained in:
Lewis Van Winkle
2016-01-26 14:02:19 -06:00
parent 8c7839ef23
commit 11b8e0e647
1 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
tinyexpr.c
View File

@@ -130,11 +130,6 @@ static double add(double a, double b) {return a + b;}
static double sub(double a, double b) {return a - b;} static double sub(double a, double b) {return a - b;}
static double mul(double a, double b) {return a * b;} static double mul(double a, double b) {return a * b;}
static double divide(double a, double b) {return a / b;} static double divide(double a, double b) {return a / b;}
static double mod(double a, double b) {
if (a!=a || b!=b) return 0.0/0.0;
if (((long long)b) == 0) return 0.0/0.0;
return ((long long)a % (long long)b);
}
static double negate(double a) {return -a;} static double negate(double a) {return -a;}
@@ -185,7 +180,7 @@ void next_token(state *s) {
case '*': s->type = TOK_FUNCTION2; s->f2 = mul; break; case '*': s->type = TOK_FUNCTION2; s->f2 = mul; break;
case '/': s->type = TOK_FUNCTION2; s->f2 = divide; break; case '/': s->type = TOK_FUNCTION2; s->f2 = divide; break;
case '^': s->type = TOK_FUNCTION2; s->f2 = pow; break; case '^': s->type = TOK_FUNCTION2; s->f2 = pow; break;
case '%': s->type = TOK_FUNCTION2; s->f2 = mod; break; case '%': s->type = TOK_FUNCTION2; s->f2 = fmod; break;
case '(': s->type = TOK_OPEN; break; case '(': s->type = TOK_OPEN; break;
case ')': s->type = TOK_CLOSE; break; case ')': s->type = TOK_CLOSE; break;
case ' ': case '\t': case '\n': case '\r': break; case ' ': case '\t': case '\n': case '\r': break;
@@ -285,7 +280,7 @@ static te_expr *term(state *s) {
/* <term> = <factor> {("*" | "/" | "%") <factor>} */ /* <term> = <factor> {("*" | "/" | "%") <factor>} */
te_expr *ret = factor(s); te_expr *ret = factor(s);
while (s->type == TOK_FUNCTION2 && (s->f2 == mul || s->f2 == divide || s->f2 == mod)) { while (s->type == TOK_FUNCTION2 && (s->f2 == mul || s->f2 == divide || s->f2 == fmod)) {
te_fun2 t = s->f2; te_fun2 t = s->f2;
next_token(s); next_token(s);
ret = new_expr(ret, factor(s)); ret = new_expr(ret, factor(s));