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

Bug fix in list grammar.

Browse Source
This commit is contained in:
Lewis Van Winkle
2016-02-24 13:52:42 -06:00
parent 3f1d5d2553
commit 31782a849f
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
test.c
View File

@@ -116,9 +116,11 @@ void test_results() {
{"sqrt (100 * 100)", 100}, {"sqrt (100 * 100)", 100},
{"1,2", 2}, {"1,2", 2},
{"1,2+1", 3},
{"1,2,3", 3}, {"1,2,3", 3},
{"(1,2),3", 3}, {"(1,2),3", 3},
{"1,(2,3)", 3}, {"1,(2,3)", 3},
{"-(1,(2,3))", -3},
{"2^2", 4}, {"2^2", 4},
{"pow(2,2)", 4}, {"pow(2,2)", 4},
@@ -358,6 +360,7 @@ void test_dynamic() {
{"f+f", 10}, {"f+f", 10},
{"f+test0", 11}, {"f+test0", 11},
{"test0+test0", 12}, {"test0+test0", 12},
{"test0()+test0", 12},
{"test1 test0", 12}, {"test1 test0", 12},
{"test1 f", 10}, {"test1 f", 10},
{"test1 x", 4}, {"test1 x", 4},

2
tinyexpr.c
View File

@@ -361,7 +361,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, ret, term(s)); ret = new_expr(TE_FUNCTION2, ret, expr(s));
ret->f2 = comma; ret->f2 = comma;
} }