Diagnostics

- Added diagnostic token dump to 'calc' in debug mode, after token substitution
  so the new tokens can be seen.
- Added unit tests to look for parser syntax errors.
- Added test for '2--3'.
This commit is contained in:
Paul Beckingham
2014-04-06 23:57:15 -04:00
parent 70ba19fd5e
commit 25b8082fbd
2 changed files with 17 additions and 5 deletions

View File

@@ -106,14 +106,16 @@ void Eval::evaluateInfixExpression (const std::string& e, Variant& v) const
std::string token;
Lexer::Type type;
while (l.token (token, type))
{
tokens.push_back (std::pair <std::string, Lexer::Type> (token, type));
if (_debug)
std::cout << "# token infix '" << token << "' " << Lexer::type_name (type) << "\n";
}
// Parse for syntax checking and operator replacement.
infixParse (tokens);
if (_debug)
{
std::vector <std::pair <std::string, Lexer::Type> >::iterator i;
for (i = tokens.begin (); i != tokens.end (); ++i)
std::cout << "# token infix '" << i->first << "' " << Lexer::type_name (i->second) << "\n";
}
// Convert infix --> postfix.
infixToPostfix (tokens);