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

Eval: Eliminated string def

Browse Source
This commit is contained in:
Paul Beckingham
2018-02-03 14:06:53 +01:00
parent 7af6db4c17
commit 51ae097388
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/Eval.cpp
View File

@@ -34,8 +34,6 @@
#include <shared.h> #include <shared.h>
#include <format.h> #include <format.h>
#define STRING_EVAL_NO_EVAL "The expression could not be evaluated."
extern Task& contextTask; extern Task& contextTask;
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
@@ -232,7 +230,7 @@ void Eval::evaluatePostfixStack (
token.first == "!") token.first == "!")
{ {
if (values.size () < 1) if (values.size () < 1)
throw std::string (STRING_EVAL_NO_EVAL); throw std::string ("The expression could not be evaluated.");
Variant right = values.back (); Variant right = values.back ();
values.pop_back (); values.pop_back ();
@@ -245,7 +243,7 @@ void Eval::evaluatePostfixStack (
token.first == "_neg_") token.first == "_neg_")
{ {
if (values.size () < 1) if (values.size () < 1)
throw std::string (STRING_EVAL_NO_EVAL); throw std::string ("The expression could not be evaluated.");
Variant right = values.back (); Variant right = values.back ();
values.pop_back (); values.pop_back ();
@@ -269,7 +267,7 @@ void Eval::evaluatePostfixStack (
else if (token.second == Lexer::Type::op) else if (token.second == Lexer::Type::op)
{ {
if (values.size () < 2) if (values.size () < 2)
throw std::string (STRING_EVAL_NO_EVAL); throw std::string ("The expression could not be evaluated.");
Variant right = values.back (); Variant right = values.back ();
values.pop_back (); values.pop_back ();