- Added support for compiled expressions that are compiled once and
  evaluated multiple times in different contexts.
This commit is contained in:
Paul Beckingham
2014-04-27 10:07:11 -07:00
parent fe2634b472
commit e3a1789b3f
2 changed files with 38 additions and 0 deletions

View File

@@ -159,6 +159,41 @@ void Eval::evaluatePostfixExpression (const std::string& e, Variant& v) const
evaluatePostfixStack (tokens, v);
}
////////////////////////////////////////////////////////////////////////////////
void Eval::compileExpression (const std::string& e)
{
// Reduce e to a vector of tokens.
Lexer l (e);
l.ambiguity (_ambiguity);
std::string token;
Lexer::Type type;
while (l.token (token, type))
{
_compiled.push_back (std::pair <std::string, Lexer::Type> (token, type));
if (_debug)
std::cout << "# token postfix '" << token << "' " << Lexer::type_name (type) << "\n";
}
// Parse for syntax checking and operator replacement.
infixParse (_compiled);
if (_debug)
{
std::vector <std::pair <std::string, Lexer::Type> >::iterator i;
for (i = _compiled.begin (); i != _compiled.end (); ++i)
std::cout << "# token infix '" << i->first << "' " << Lexer::type_name (i->second) << "\n";
}
// Convert infix --> postfix.
infixToPostfix (_compiled);
}
////////////////////////////////////////////////////////////////////////////////
void Eval::evaluateCompiledExpression (Variant& v)
{
// Call the postfix evaluator.
evaluatePostfixStack (_compiled, v);
}
////////////////////////////////////////////////////////////////////////////////
void Eval::ambiguity (bool value)
{