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 closures. Refactoring.

Browse Source
This commit is contained in:
Lewis Van Winkle
2016-02-24 22:26:54 -06:00
parent 4f35ab350d
commit b24086b376
3 changed files with 131 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
test.c
View File

@@ -412,6 +412,50 @@ void test_dynamic() {
} }
double clo0(void *context) {
if (context) return *((double*)context) + 6;
return 6;
}
double clo1(void *context, double a) {
if (context) return *((double*)context) + a * 2;
return a * 2;
}
double clo2(void *context, double a, double b) {
if (context) return *((double*)context) + a + b;
return a + b;
}
void test_closure() {
te_variable lookup[] = {
{"c0", clo0, TE_CLOSURE0},
{"c1", clo1, TE_CLOSURE1},
{"c2", clo2, TE_CLOSURE2},
};
test_case cases[] = {
{"c0", 6},
{"c1 4", 8},
{"c2 (10, 20)", 30},
};
double extra = 10;
int i;
for (i = 0; i < sizeof(cases) / sizeof(test_case); ++i) {
const char *expr = cases[i].expr;
const double answer = cases[i].answer;
int err;
te_expr *ex = te_compile(expr, lookup, sizeof(lookup)/sizeof(te_variable), &err);
lok(ex);
lfequal(te_eval(ex), answer);
lfequal(te_eval_closure(ex, &extra), answer + extra);
te_free(ex);
}
}
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
lrun("Results", test_results); lrun("Results", test_results);
@@ -420,6 +464,7 @@ int main(int argc, char *argv[])
lrun("Variables", test_variables); lrun("Variables", test_variables);
lrun("Functions", test_functions); lrun("Functions", test_functions);
lrun("Dynamic", test_dynamic); lrun("Dynamic", test_dynamic);
lrun("Closure", test_closure);
lresults(); lresults();
return lfails != 0; return lfails != 0;

129
tinyexpr.c
View File

@@ -28,24 +28,15 @@
#include <string.h> #include <string.h>
#include <stdio.h> #include <stdio.h>
typedef double (*te_fun0)(void);
typedef double (*te_fun1)(double);
typedef double (*te_fun2)(double, double); typedef double (*te_fun2)(double, double);
typedef double (*te_fun3)(double, double, double);
typedef double (*te_fun4)(double, double, double, double);
typedef double (*te_fun5)(double, double, double, double, double);
typedef double (*te_fun6)(double, double, double, double, double, double);
typedef double (*te_fun7)(double, double, double, double, double, double, double);
enum { enum {
TOK_NULL, TOK_ERROR, TOK_END, TOK_SEP, TOK_NULL = TE_CLOSURE7+1, TOK_ERROR, TOK_END, TOK_SEP,
TOK_OPEN, TOK_CLOSE, TOK_NUMBER, TOK_VARIABLE, TOK_INFIX, TOK_OPEN, TOK_CLOSE, TOK_NUMBER, TOK_VARIABLE, TOK_INFIX
TOK_FUNCTION0, TOK_FUNCTION1, TOK_FUNCTION2, TOK_FUNCTION3,
TOK_FUNCTION4, TOK_FUNCTION5, TOK_FUNCTION6, TOK_FUNCTION7
}; };
enum { TE_CONSTANT = TE_FUNCTION7+1};
enum {TE_CONSTANT = 1};
typedef struct state { typedef struct state {
@@ -59,7 +50,11 @@ typedef struct state {
} state; } state;
#define ARITY(TYPE) (((TYPE) < TE_FUNCTION0 || (TYPE) > TE_FUNCTION7) ? 0 : ((TYPE)-TE_FUNCTION0))
#define ARITY_CLO(TYPE) ( ((TYPE) >= TE_CLOSURE0 && (TYPE) <= TE_CLOSURE7) ? ((TYPE)-TE_CLOSURE0) : 0 )
#define ARITY(TYPE) ( ((TYPE) >= TE_FUNCTION0 && (TYPE) <= TE_FUNCTION7) ? ((TYPE)-TE_FUNCTION0) : ARITY_CLO(TYPE) )
#define NEW_EXPR(type, ...) new_expr((type), (const te_expr*[]){__VA_ARGS__})
static te_expr *new_expr(const int type, const te_expr *parameters[]) { static te_expr *new_expr(const int type, const te_expr *parameters[]) {
const int arity = ARITY(type); const int arity = ARITY(type);
@@ -77,13 +72,13 @@ static te_expr *new_expr(const int type, const te_expr *parameters[]) {
void te_free(te_expr *n) { void te_free(te_expr *n) {
if (!n) return; if (!n) return;
switch (n->type) { switch (n->type) {
case TE_FUNCTION7: te_free(n->parameters[6]); case TE_FUNCTION7: case TE_CLOSURE7: te_free(n->parameters[6]);
case TE_FUNCTION6: te_free(n->parameters[5]); case TE_FUNCTION6: case TE_CLOSURE6: te_free(n->parameters[5]);
case TE_FUNCTION5: te_free(n->parameters[4]); case TE_FUNCTION5: case TE_CLOSURE5: te_free(n->parameters[4]);
case TE_FUNCTION4: te_free(n->parameters[3]); case TE_FUNCTION4: case TE_CLOSURE4: te_free(n->parameters[3]);
case TE_FUNCTION3: te_free(n->parameters[2]); case TE_FUNCTION3: case TE_CLOSURE3: te_free(n->parameters[2]);
case TE_FUNCTION2: te_free(n->parameters[1]); case TE_FUNCTION2: case TE_CLOSURE2: te_free(n->parameters[1]);
case TE_FUNCTION1: te_free(n->parameters[0]); case TE_FUNCTION1: case TE_CLOSURE1: te_free(n->parameters[0]);
} }
free(n); free(n);
} }
@@ -190,11 +185,16 @@ void next_token(state *s) {
{ {
case TE_VARIABLE: case TE_VARIABLE:
s->type = TOK_VARIABLE; s->type = TOK_VARIABLE;
s->bound = var->address; break; s->bound = var->address;
break;
case TE_FUNCTION0: case TE_FUNCTION1: case TE_FUNCTION2: case TE_FUNCTION3: case TE_FUNCTION0: case TE_FUNCTION1: case TE_FUNCTION2: case TE_FUNCTION3:
case TE_FUNCTION4: case TE_FUNCTION5: case TE_FUNCTION6: case TE_FUNCTION7: case TE_FUNCTION4: case TE_FUNCTION5: case TE_FUNCTION6: case TE_FUNCTION7:
s->type = TOK_FUNCTION0 + ARITY(var->type); case TE_CLOSURE0: case TE_CLOSURE1: case TE_CLOSURE2: case TE_CLOSURE3:
case TE_CLOSURE4: case TE_CLOSURE5: case TE_CLOSURE6: case TE_CLOSURE7:
s->type = var->type;
s->function = var->address; s->function = var->address;
break;
} }
} }
@@ -241,8 +241,9 @@ static te_expr *base(state *s) {
next_token(s); next_token(s);
break; break;
case TOK_FUNCTION0: case TE_FUNCTION0:
ret = new_expr(TE_FUNCTION0, 0); case TE_CLOSURE0:
ret = new_expr(s->type, 0);
ret->function = s->function; ret->function = s->function;
next_token(s); next_token(s);
if (s->type == TOK_OPEN) { if (s->type == TOK_OPEN) {
@@ -255,18 +256,21 @@ static te_expr *base(state *s) {
} }
break; break;
case TOK_FUNCTION1: case TE_FUNCTION1:
ret = new_expr(TE_FUNCTION1, 0); case TE_CLOSURE1:
ret = new_expr(s->type, 0);
ret->function = s->function; ret->function = s->function;
next_token(s); next_token(s);
ret->parameters[0] = power(s); ret->parameters[0] = power(s);
break; break;
case TOK_FUNCTION2: case TOK_FUNCTION3: case TOK_FUNCTION4: case TE_FUNCTION2: case TE_FUNCTION3: case TE_FUNCTION4:
case TOK_FUNCTION5: case TOK_FUNCTION6: case TOK_FUNCTION7: case TE_FUNCTION5: case TE_FUNCTION6: case TE_FUNCTION7:
arity = s->type - TOK_FUNCTION0; case TE_CLOSURE2: case TE_CLOSURE3: case TE_CLOSURE4:
case TE_CLOSURE5: case TE_CLOSURE6: case TE_CLOSURE7:
arity = ARITY(s->type);
ret = new_expr(TE_FUNCTION0 + arity, 0); ret = new_expr(s->type, 0);
ret->function = s->function; ret->function = s->function;
next_token(s); next_token(s);
@@ -281,7 +285,7 @@ static te_expr *base(state *s) {
break; break;
} }
} }
if(s->type != TOK_CLOSE || i < arity - 1) { if(s->type != TOK_CLOSE || i != arity - 1) {
s->type = TOK_ERROR; s->type = TOK_ERROR;
} else { } else {
next_token(s); next_token(s);
@@ -324,7 +328,7 @@ static te_expr *power(state *s) {
if (sign == 1) { if (sign == 1) {
ret = base(s); ret = base(s);
} else { } else {
ret = new_expr(TE_FUNCTION1, (const te_expr*[]){base(s)}); ret = NEW_EXPR(TE_FUNCTION1, base(s));
ret->function = negate; ret->function = negate;
} }
@@ -339,7 +343,7 @@ static te_expr *factor(state *s) {
while (s->type == TOK_INFIX && (s->function == pow)) { while (s->type == TOK_INFIX && (s->function == pow)) {
te_fun2 t = s->function; te_fun2 t = s->function;
next_token(s); next_token(s);
ret = new_expr(TE_FUNCTION2, (const te_expr*[]){ret, power(s)}); ret = NEW_EXPR(TE_FUNCTION2, ret, power(s));
ret->function = t; ret->function = t;
} }
@@ -354,7 +358,7 @@ static te_expr *term(state *s) {
while (s->type == TOK_INFIX && (s->function == mul || s->function == divide || s->function == fmod)) { while (s->type == TOK_INFIX && (s->function == mul || s->function == divide || s->function == fmod)) {
te_fun2 t = s->function; te_fun2 t = s->function;
next_token(s); next_token(s);
ret = new_expr(TE_FUNCTION2, (const te_expr*[]){ret, factor(s)}); ret = NEW_EXPR(TE_FUNCTION2, ret, factor(s));
ret->function = t; ret->function = t;
} }
@@ -369,7 +373,7 @@ static te_expr *expr(state *s) {
while (s->type == TOK_INFIX && (s->function == add || s->function == sub)) { while (s->type == TOK_INFIX && (s->function == add || s->function == sub)) {
te_fun2 t = s->function; te_fun2 t = s->function;
next_token(s); next_token(s);
ret = new_expr(TE_FUNCTION2, (const te_expr*[]){ret, term(s)}); ret = NEW_EXPR(TE_FUNCTION2, ret, term(s));
ret->function = t; ret->function = t;
} }
@@ -383,7 +387,7 @@ static te_expr *list(state *s) {
while (s->type == TOK_SEP) { while (s->type == TOK_SEP) {
next_token(s); next_token(s);
ret = new_expr(TE_FUNCTION2, (const te_expr*[]){ret, expr(s)}); ret = NEW_EXPR(TE_FUNCTION2, ret, expr(s));
ret->function = comma; ret->function = comma;
} }
@@ -392,28 +396,53 @@ static te_expr *list(state *s) {
double te_eval(const te_expr *n) { double te_eval(const te_expr *n) {
return te_eval_closure(n, 0);
}
double te_eval_closure(const te_expr *n, void *context) {
if (!n) return 0.0/0.0; if (!n) return 0.0/0.0;
#define TE_FUN(...) ((double(*)(__VA_ARGS__))n->function)
#define M(e) te_eval(n->parameters[e])
switch(n->type) { switch(n->type) {
case TE_CONSTANT: return n->value; case TE_CONSTANT: return n->value;
case TE_VARIABLE: return *n->bound; case TE_VARIABLE: return *n->bound;
case TE_FUNCTION0: case TE_FUNCTION1: case TE_FUNCTION2: case TE_FUNCTION3: case TE_FUNCTION0: case TE_FUNCTION1: case TE_FUNCTION2: case TE_FUNCTION3:
case TE_FUNCTION4: case TE_FUNCTION5: case TE_FUNCTION6: case TE_FUNCTION7: case TE_FUNCTION4: case TE_FUNCTION5: case TE_FUNCTION6: case TE_FUNCTION7:
switch(ARITY(n->type)) { switch(ARITY(n->type)) {
#define m(e) te_eval(n->parameters[e]) case 0: return TE_FUN(void)();
case 0: return ((te_fun0)(n->function))(); case 1: return TE_FUN(double)(M(0));
case 1: return ((te_fun1)(n->function))(m(0)); case 2: return TE_FUN(double, double)(M(0), M(1));
case 2: return ((te_fun2)(n->function))(m(0), m(1)); case 3: return TE_FUN(double, double, double)(M(0), M(1), M(2));
case 3: return ((te_fun3)(n->function))(m(0), m(1), m(2)); case 4: return TE_FUN(double, double, double, double)(M(0), M(1), M(2), M(3));
case 4: return ((te_fun4)(n->function))(m(0), m(1), m(2), m(3)); case 5: return TE_FUN(double, double, double, double, double)(M(0), M(1), M(2), M(3), M(4));
case 5: return ((te_fun5)(n->function))(m(0), m(1), m(2), m(3), m(4)); case 6: return TE_FUN(double, double, double, double, double, double)(M(0), M(1), M(2), M(3), M(4), M(5));
case 6: return ((te_fun6)(n->function))(m(0), m(1), m(2), m(3), m(4), m(5)); case 7: return TE_FUN(double, double, double, double, double, double, double)(M(0), M(1), M(2), M(3), M(4), M(5), M(6));
case 7: return ((te_fun7)(n->function))(m(0), m(1), m(2), m(3), m(4), m(5), m(6)); default: return 0.0/0.0;
default: return 0.0/0.0; }
#undef m
} case TE_CLOSURE0: case TE_CLOSURE1: case TE_CLOSURE2: case TE_CLOSURE3:
case TE_CLOSURE4: case TE_CLOSURE5: case TE_CLOSURE6: case TE_CLOSURE7:
switch(ARITY(n->type)) {
case 0: return TE_FUN(void*)(context);
case 1: return TE_FUN(void*, double)(context, M(0));
case 2: return TE_FUN(void*, double, double)(context, M(0), M(1));
case 3: return TE_FUN(void*, double, double, double)(context, M(0), M(1), M(2));
case 4: return TE_FUN(void*, double, double, double, double)(context, M(0), M(1), M(2), M(3));
case 5: return TE_FUN(void*, double, double, double, double, double)(context, M(0), M(1), M(2), M(3), M(4));
case 6: return TE_FUN(void*, double, double, double, double, double, double)(context, M(0), M(1), M(2), M(3), M(4), M(5));
case 7: return TE_FUN(void*, double, double, double, double, double, double, double)(context, M(0), M(1), M(2), M(3), M(4), M(5), M(6));
default: return 0.0/0.0;
}
default: return 0.0/0.0; default: return 0.0/0.0;
} }
#undef TE_FUN
#undef M
} }

9
tinyexpr.h
View File

@@ -41,8 +41,10 @@ typedef struct te_expr {
enum { enum {
TE_VARIABLE = 0, TE_VARIABLE = 0,
TE_FUNCTION0, TE_FUNCTION1, TE_FUNCTION2, TE_FUNCTION3, TE_FUNCTION0 = 2, TE_FUNCTION1, TE_FUNCTION2, TE_FUNCTION3,
TE_FUNCTION4, TE_FUNCTION5, TE_FUNCTION6, TE_FUNCTION7 TE_FUNCTION4, TE_FUNCTION5, TE_FUNCTION6, TE_FUNCTION7,
TE_CLOSURE0, TE_CLOSURE1, TE_CLOSURE2, TE_CLOSURE3,
TE_CLOSURE4, TE_CLOSURE5, TE_CLOSURE6, TE_CLOSURE7
}; };
typedef struct te_variable { typedef struct te_variable {
@@ -64,6 +66,9 @@ te_expr *te_compile(const char *expression, const te_variable *variables, int va
/* Evaluates the expression. */ /* Evaluates the expression. */
double te_eval(const te_expr *n); double te_eval(const te_expr *n);
/* Evaluates the expression while passing a closure to any bound closure functions. */
double te_eval_closure(const te_expr *n, void *context);
/* Prints debugging information on the syntax tree. */ /* Prints debugging information on the syntax tree. */
void te_print(const te_expr *n); void te_print(const te_expr *n);