calc: Removed Eval::disambiguity.

This commit is contained in:
Paul Beckingham
2015-07-01 17:52:51 -04:00
parent b7519bb550
commit a0fbde294a

View File

@@ -57,7 +57,6 @@ int main (int argc, char** argv)
try try
{ {
bool infix = true; bool infix = true;
bool ambiguous = false;
// Add a source for constants. // Add a source for constants.
Eval e; Eval e;
@@ -77,8 +76,6 @@ int main (int argc, char** argv)
<< " -d|--debug Debug mode\n" << " -d|--debug Debug mode\n"
<< " -i|--infix Infix expression (default)\n" << " -i|--infix Infix expression (default)\n"
<< " -p|--postfix Postfix expression\n" << " -p|--postfix Postfix expression\n"
<< " -a|--ambiguous Choose dates over numbers when ambiguous\n"
<< " -n|--noambiguous Choose numbers over dates when ambiguous (default)\n"
<< "\n"; << "\n";
exit (1); exit (1);
} }
@@ -125,15 +122,9 @@ int main (int argc, char** argv)
infix = true; infix = true;
else if (!strcmp (argv[i], "-p") || !strcmp (argv[i], "--postfix")) else if (!strcmp (argv[i], "-p") || !strcmp (argv[i], "--postfix"))
infix = false; infix = false;
else if (!strcmp (argv[i], "-a") || !strcmp (argv[i], "--ambiguous"))
ambiguous = true;
else if (!strcmp (argv[i], "-n") || !strcmp (argv[i], "--noambiguous"))
ambiguous = false;
else else
expression += std::string (argv[i]) + " "; expression += std::string (argv[i]) + " ";
e.ambiguity (ambiguous);
Variant result; Variant result;
if (infix) if (infix)
e.evaluateInfixExpression (expression, result); e.evaluateInfixExpression (expression, result);