GothenburgBitFactory/taskwarrior
1
0
Fork 0
mirror of https://github.com/GothenburgBitFactory/taskwarrior.git synced 2025-06-26 10:54:26 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Eval

Browse source 
- Reduced the verbosity of Eval under rc.debug.parser=3, improving readability.
- Updated unit tests regarding modified debug output.
This commit is contained in:
Paul Beckingham 2014-12-28 11:33:24 -05:00
parent fe2f5de230
commit 8de2a1030e
3 changed files with 68 additions and 74 deletions
Download patch file Download diff file Expand all files Collapse all files

100
src/Eval.cpp
View file

@ -179,7 +179,7 @@ void Eval::compileExpression (const std::string& e)
while (l.token (token, type)) while (l.token (token, type))
{ {
if (_debug) if (_debug)
context.debug ("evaluateInfixExpression token '" + token + "' " + Lexer::type_name (type)); context.debug ("Lexer '" + token + "' " + Lexer::type_name (type));
_compiled.push_back (std::pair <std::string, Lexer::Type> (token, type)); _compiled.push_back (std::pair <std::string, Lexer::Type> (token, type));
} }
@ -257,13 +257,10 @@ void Eval::evaluatePostfixStack (
Variant right = values.back (); Variant right = values.back ();
values.pop_back (); values.pop_back ();
Variant result = ! right;
values.push_back (result);
if (_debug) if (_debug)
{ context.debug (format ("Eval {1} ↓'{2}' → ↑'{3}'", token->first, (std::string) right, (std::string) result));
context.debug (format ("[{1}] eval pop '{2}'", values.size () + 1, (std::string) right));
context.debug (format ("[{1}] eval operator '{2}'", values.size (), token->first));
context.debug (format ("[{1}] eval result push '{2}'", values.size (), (bool) !right));
}
values.push_back (! right);
} }
else if (token->second == Lexer::typeOperator && else if (token->second == Lexer::typeOperator &&
token->first == "_neg_") token->first == "_neg_")
@ -276,23 +273,17 @@ void Eval::evaluatePostfixStack (
Variant result (0); Variant result (0);
result -= right; result -= right;
values.push_back (result);
if (_debug) if (_debug)
{ context.debug (format ("Eval {1} ↓'{2}' → ↑'{3}'", token->first, (std::string) right, (std::string) result));
context.debug (format ("[{1}] eval pop '{2}'", values.size () + 1, (std::string) right));
context.debug (format ("[{1}] eval operator '{2}'", values.size (), token->first));
context.debug (format ("[{1}] eval result push '{2}'", values.size (), (std::string) result));
}
values.push_back (result);
} }
else if (token->second == Lexer::typeOperator && else if (token->second == Lexer::typeOperator &&
token->first == "_pos_") token->first == "_pos_")
{ {
// NOP? // The _pos_ operator is a NOP.
if (_debug) if (_debug)
{ context.debug (format ("[{1}] eval op {2} NOP", values.size (), token->first));
context.debug (format ("[{1}] eval operator '{2}'", values.size (), token->first));
}
} }
// Binary operators. // Binary operators.
@ -307,43 +298,38 @@ void Eval::evaluatePostfixStack (
Variant left = values.back (); Variant left = values.back ();
values.pop_back (); values.pop_back ();
if (_debug)
{
context.debug (format ("[{1}] eval pop '{2}'", values.size () + 2, (std::string) right));
context.debug (format ("[{1}] eval pop '{2}'", values.size () + 1, (std::string) left));
context.debug (format ("[{1}] eval operator '{2}'", values.size (), token->first));
}
// Ordering these by anticipation frequency of use is a good idea. // Ordering these by anticipation frequency of use is a good idea.
if (token->first == "and") left = left && right; Variant result;
else if (token->first == "or") left = left || right; if (token->first == "and") result = left && right;
else if (token->first == "&&") left = left && right; else if (token->first == "or") result = left || right;
else if (token->first == "||") left = left || right; else if (token->first == "&&") result = left && right;
else if (token->first == "<") left = left < right; else if (token->first == "||") result = left || right;
else if (token->first == "<=") left = left <= right; else if (token->first == "<") result = left < right;
else if (token->first == ">") left = left > right; else if (token->first == "<=") result = left <= right;
else if (token->first == ">=") left = left >= right; else if (token->first == ">") result = left > right;
else if (token->first == "==") left = left.operator== (right); else if (token->first == ">=") result = left >= right;
else if (token->first == "!==") left = left.operator!= (right); else if (token->first == "==") result = left.operator== (right);
else if (token->first == "=") left = left.operator_partial (right); else if (token->first == "!==") result = left.operator!= (right);
else if (token->first == "!=") left = left.operator_nopartial (right); else if (token->first == "=") result = left.operator_partial (right);
else if (token->first == "+") left += right; else if (token->first == "!=") result = left.operator_nopartial (right);
else if (token->first == "-") left -= right; else if (token->first == "+") result = left + right;
else if (token->first == "*") left *= right; else if (token->first == "-") result = left - right;
else if (token->first == "/") left /= right; else if (token->first == "*") result = left * right;
else if (token->first == "^") left ^= right; else if (token->first == "/") result = left / right;
else if (token->first == "%") left %= right; else if (token->first == "^") result = left ^ right;
else if (token->first == "xor") left = left.operator_xor (right); else if (token->first == "%") result = left % right;
else if (token->first == "~") left = left.operator_match (right, contextTask); else if (token->first == "xor") result = left.operator_xor (right);
else if (token->first == "!~") left = left.operator_nomatch (right, contextTask); else if (token->first == "~") result = left.operator_match (right, contextTask);
else if (token->first == "_hastag_") left = left.operator_hastag (right, contextTask); else if (token->first == "!~") result = left.operator_nomatch (right, contextTask);
else if (token->first == "_notag_") left = left.operator_notag (right, contextTask); else if (token->first == "_hastag_") result = left.operator_hastag (right, contextTask);
else if (token->first == "_notag_") result = left.operator_notag (right, contextTask);
else else
throw format (STRING_EVAL_UNSUPPORTED, token->first); throw format (STRING_EVAL_UNSUPPORTED, token->first);
values.push_back (result);
if (_debug) if (_debug)
context.debug (format ("[{1}] eval result push '{2}'", values.size (), (std::string) left)); context.debug (format ("Eval ↓'{1}' {2} ↓'{3}' → ↑'{4}'", (std::string) left, token->first, (std::string) right, (std::string) result));
values.push_back (left);
} }
// Literals and identifiers. // Literals and identifiers.
@ -355,10 +341,14 @@ void Eval::evaluatePostfixStack (
case Lexer::typeNumber: case Lexer::typeNumber:
case Lexer::typeHex: case Lexer::typeHex:
v.cast (Variant::type_integer); v.cast (Variant::type_integer);
if (_debug)
context.debug (format ("Eval literal number ↑'{1}'", (std::string) v));
break; break;
case Lexer::typeDecimal: case Lexer::typeDecimal:
v.cast (Variant::type_real); v.cast (Variant::type_real);
if (_debug)
context.debug (format ("Eval literal decimal ↑'{1}'", (std::string) v));
break; break;
case Lexer::typeOperator: case Lexer::typeOperator:
@ -374,7 +364,7 @@ void Eval::evaluatePostfixStack (
if ((*source) (token->first, v)) if ((*source) (token->first, v))
{ {
if (_debug) if (_debug)
context.debug (format ("[{1}] eval source '{2}' --> '{3}'", values.size (), token->first, (std::string) v)); context.debug (format ("Eval identifier source '{1}' → ↑'{2}'", token->first, (std::string) v));
found = true; found = true;
break; break;
} }
@ -385,27 +375,31 @@ void Eval::evaluatePostfixStack (
{ {
v.cast (Variant::type_string); v.cast (Variant::type_string);
if (_debug) if (_debug)
context.debug (format ("[{1}] eval source failed '{2}'", values.size (), token->first)); context.debug (format ("Eval identifier source failed '{1}'", token->first));
} }
} }
break; break;
case Lexer::typeDate: case Lexer::typeDate:
v.cast (Variant::type_date); v.cast (Variant::type_date);
if (_debug)
context.debug (format ("Eval literal date ↑'{1}'", (std::string) v));
break; break;
case Lexer::typeDuration: case Lexer::typeDuration:
v.cast (Variant::type_duration); v.cast (Variant::type_duration);
if (_debug)
context.debug (format ("Eval literal duration ↑'{1}'", (std::string) v));
break; break;
// Nothing to do. // Nothing to do.
case Lexer::typeString: case Lexer::typeString:
default: default:
if (_debug)
context.debug (format ("Eval literal string ↑'{1}'", (std::string) v));
break; break;
} }
if (_debug)
context.debug (format ("[{1}] eval push '{2}'", values.size (), (std::string) v));
values.push_back (v); values.push_back (v);
} }
} }

4
test/bug.calc.t
View file

@ -36,8 +36,8 @@ my $output = qx{../src/calc --debug --noambiguous 15min};
unlike ($output, qr/token infix '15' Date/, "$ut: Misinterpretation: 15min -> 15"); unlike ($output, qr/token infix '15' Date/, "$ut: Misinterpretation: 15min -> 15");
unlike ($output, qr/token infix 'min' Identifier/, "$ut: Misinterpretation: 15min -> m"); unlike ($output, qr/token infix 'min' Identifier/, "$ut: Misinterpretation: 15min -> m");
unlike ($output, qr/Error: Unexpected stack size: 2/, "$ut: Unexpected stack size"); unlike ($output, qr/Error: Unexpected stack size: 2/, "$ut: Unexpected stack size");
like ($output, qr/\[0\] eval push 'PT15M'/, "$ut: 15min -> push PT15M"); like ($output, qr/Eval literal duration ↑'PT15M'/, "$ut: 15min -> push PT15M");
like ($output, qr/^PT15M$/ms, "$ut: 15min -> PT15M"); like ($output, qr/^PT15M$/ms, "$ut: 15min -> PT15M");
exit 0; exit 0;

38
test/calc.t
View file

@ -31,29 +31,29 @@ use Test::More tests => 19;
# '15min' is seen as '15', 'min', not '15min' duration. # '15min' is seen as '15', 'min', not '15min' duration.
my $output = qx{../src/calc --debug --noambiguous '12 * 3600 + 34 * 60 + 56'}; my $output = qx{../src/calc --debug --noambiguous '12 * 3600 + 34 * 60 + 56'};
like ($output, qr/eval push '12'/, 'Number 12'); like ($output, qr/Eval literal number ↑'12'/, 'Number 12');
like ($output, qr/eval push '3600'/, 'Number 3600'); like ($output, qr/Eval literal number ↑'3600'/, 'Number 3600');
like ($output, qr/eval push '34'/, 'Number 60'); like ($output, qr/Eval literal number ↑'60'/, 'Number 60');
like ($output, qr/eval push '60'/, 'Number 60'); like ($output, qr/Eval literal number ↑'60'/, 'Number 60');
like ($output, qr/eval push '56'/, 'Number 56'); like ($output, qr/Eval literal number ↑'56'/, 'Number 56');
like ($output, qr/^45296$/ms, 'Result 45296'); like ($output, qr/^45296$/ms, 'Result 45296');
unlike ($output, qr/Error/, 'No errors'); unlike ($output, qr/Error/, 'No errors');
$output = qx{../src/calc --debug --noambiguous --postfix '12 3600 * 34 60 * 56 + +'}; $output = qx{../src/calc --debug --noambiguous --postfix '12 3600 * 34 60 * 56 + +'};
like ($output, qr/eval push '12'/, 'Number 12'); like ($output, qr/Eval literal number ↑'12'/, 'Number 12');
like ($output, qr/eval push '3600'/, 'Number 3600'); like ($output, qr/Eval literal number ↑'3600'/, 'Number 3600');
like ($output, qr/eval push '34'/, 'Number 60'); like ($output, qr/Eval literal number ↑'60'/, 'Number 60');
like ($output, qr/eval push '60'/, 'Number 60'); like ($output, qr/Eval literal number ↑'60'/, 'Number 60');
like ($output, qr/eval push '56'/, 'Number 56'); like ($output, qr/Eval literal number ↑'56'/, 'Number 56');
like ($output, qr/^45296$/ms, 'Result 45296'); like ($output, qr/^45296$/ms, 'Result 45296');
unlike ($output, qr/Error/, 'No errors'); unlike ($output, qr/Error/, 'No errors');
$output = qx{../src/calc --debug --noambiguous '2--3'}; $output = qx{../src/calc --debug --noambiguous '2--3'};
like ($output, qr/eval push '2'/ms, 'Number 2'); like ($output, qr/Eval literal number ↑'2'/ms, 'Number 2');
like ($output, qr/eval operator '-'/ms, 'Operator -'); like ($output, qr/Eval _neg_ ↓'3' → ↑'-3'/ms, 'Operator -');
like ($output, qr/eval push '3'/ms, 'Number 3'); like ($output, qr/Eval literal number ↑'2'/ms, 'Number 3');
like ($output, qr/^5$/ms, 'Result 5'); like ($output, qr/^5$/ms, 'Result 5');
unlike ($output, qr/Error/, 'No errors'); unlike ($output, qr/Error/, 'No errors');
exit 0; exit 0;