gergely/taskwarrior-2.x
1
0
Fork 0
Code Issues Actions Packages Projects Releases 1 Wiki Activity

Eval

Browse Source 
- Better error message for malformed expressions, ie when a binary operator
  expects two values, and sees less then two or when a unary operator sees
  less than one.
This commit is contained in:
Paul Beckingham
2014-09-27 17:08:26 -04:00
parent 071cf55c00
commit 9e0ea1cb4a
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/Eval.cpp
View File

@@ -243,6 +243,9 @@ void Eval::evaluatePostfixStack (
if (token->second == Lexer::typeOperator && if (token->second == Lexer::typeOperator &&
token->first == "!") token->first == "!")
{ {
if (values.size () < 1)
throw std::string (STRING_EVAL_NO_EVAL);
Variant right = values.back (); Variant right = values.back ();
values.pop_back (); values.pop_back ();
if (_debug) if (_debug)
@@ -256,6 +259,9 @@ void Eval::evaluatePostfixStack (
else if (token->second == Lexer::typeOperator && else if (token->second == Lexer::typeOperator &&
token->first == "_neg_") token->first == "_neg_")
{ {
if (values.size () < 1)
throw std::string (STRING_EVAL_NO_EVAL);
Variant right = values.back (); Variant right = values.back ();
values.pop_back (); values.pop_back ();
if (_debug) if (_debug)
@@ -279,6 +285,9 @@ void Eval::evaluatePostfixStack (
// Binary operators. // Binary operators.
else if (token->second == Lexer::typeOperator) else if (token->second == Lexer::typeOperator)
{ {
if (values.size () < 2)
throw std::string (STRING_EVAL_NO_EVAL);
Variant right = values.back (); Variant right = values.back ();
values.pop_back (); values.pop_back ();