Skip to content

Commit 1364383

Browse files
committed
Updates to ExprTk
1 parent c06f525 commit 1364383

File tree

2 files changed

+14
-4
lines changed

2 files changed

+14
-4
lines changed

exprtk/exprtk.hpp

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20590,8 +20590,8 @@ namespace exprtk
2059020590
details::is_return_node(right_branch)
2059120591
)
2059220592
{
20593-
free_node(node_allocator_, expression);
20594-
free_node(node_allocator_,right_branch);
20593+
free_node(node_allocator_, expression);
20594+
free_node(node_allocator_, right_branch);
2059520595

2059620596
set_error(
2059720597
make_error(parser_error::e_syntax,
@@ -20623,7 +20623,8 @@ namespace exprtk
2062320623
exprtk_error_location));
2062420624
}
2062520625

20626-
free_node(node_allocator_,expression);
20626+
free_node(node_allocator_, expression);
20627+
free_node(node_allocator_, right_branch);
2062720628

2062820629
return error_node();
2062920630
}

exprtk/exprtk_test.cpp

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2811,7 +2811,16 @@ inline bool run_test03()
28112811
"1 v x",
28122812
"1 v y",
28132813
"x v 1",
2814-
"y v 1"
2814+
"y v 1",
2815+
2816+
"(x == 'a string' )",
2817+
"(x == 'a string'[1:2] )",
2818+
"(x == 'a string' + 'b string' )",
2819+
"(x == ('a string' + 'b string')[3:5])",
2820+
"('a string' == x )",
2821+
"('a string'[1:2] == x )",
2822+
"('a string' + 'b string' == x )",
2823+
"(('a string' + 'b string')[3:5] == x)"
28152824
};
28162825

28172826
const std::size_t invalid_expr_size = sizeof(invalid_expr) / sizeof(std::string);

0 commit comments

Comments
 (0)