xfygogo/exprtk
1
0
Fork 0
mirror of https://github.com/ArashPartow/exprtk.git synced 2025-06-12 16:27:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

C++ Mathematical Expression Library (ExprTk) http://www.partow.net/programming/exprtk/index.html

Browse Source
This commit is contained in:
Arash Partow
2015-04-19 22:44:48 +10:00
parent ba6f782220
commit 2710614e95
2 changed files with 130 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
exprtk.hpp
View File

@ -3736,6 +3736,10 @@ namespace exprtk
: v_(*reinterpret_cast<value_t*>(ts.data))
{}
scalar_view(const type_store_t& ts)
: v_(*reinterpret_cast<value_t*>(const_cast<type_store_t&>(ts).data))
{}
value_t& operator()()
{
return v_;
@ -17566,7 +17570,7 @@ namespace exprtk
lexer::token begin_token;
lexer::token end_token;
for (;;)
for ( ; ; )
{
state_.side_effect_present = false;
@ -18787,7 +18791,7 @@ namespace exprtk
scoped_bool_or_restorer sbr(state_.side_effect_present);
for (;;)
for ( ; ; )
{
state_.side_effect_present = false;
@ -19529,10 +19533,27 @@ namespace exprtk
Sequence<expression_node_ptr,Allocator1> tmp_expression_list;
bool return_node_present = false;
for (std::size_t i = 0; i < (expression_list.size() - 1); ++i)
{
if (is_variable_node(expression_list[i]))
continue;
else if (is_return_node(expression_list[i]))
{
tmp_expression_list.push_back(expression_list[i]);
// Remove all subexpressions after first encountered return node.
for (std::size_t j = i + 1; j < (expression_list.size() - 1); ++j)
{
free_node(node_allocator_,expression_list[j]);
}
return_node_present = true;
break;
}
else if (
is_constant_node(expression_list[i]) ||
is_null_node (expression_list[i]) ||
@ -19546,12 +19567,20 @@ namespace exprtk
tmp_expression_list.push_back(expression_list[i]);
}
tmp_expression_list.push_back(expression_list.back());
expression_list.swap(tmp_expression_list);
if ((expression_list.size() > 1) || side_effect_list.back())
if (
return_node_present ||
side_effect_list.back() ||
(expression_list.size() > 1)
)
state_.side_effect_present = true;
if (!return_node_present)
{
tmp_expression_list.push_back(expression_list.back());
}
expression_list.swap(tmp_expression_list);
if (tmp_expression_list.size() > expression_list.size())
{
exprtk_debug(("simplify() - Reduced subexpressions from %d to %d\n",
@ -19604,7 +19633,7 @@ namespace exprtk
scoped_bool_or_restorer sbr(state_.side_effect_present);
for (;;)
for ( ; ; )
{
state_.side_effect_present = false;
@ -20697,7 +20726,7 @@ namespace exprtk
}
else if (!token_is(token_t::e_rcrlbracket))
{
for (;;)
for ( ; ; )
{
expression_node_ptr initialiser = parse_expression();