From 588009d67945b8ae814e92a9126075cf26060b83 Mon Sep 17 00:00:00 2001 From: Paul Beckingham Date: Thu, 8 Jan 2015 20:40:29 -0500 Subject: [PATCH] TW-1501 - TW-1501 Calc can't handle multi-digit numbers in some expressions (thanks to Jeremy John Reeder). --- ChangeLog | 2 ++ src/calc.cpp | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9b0d8aa11..a8954a215 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,6 +4,8 @@ Sujeevan Vijayakumaran). - TW-1492 compiling v2.4.0 using musl(libc) (thanks to V.Krishn). - TW-1495 German translation for taskwarrior (thanks to Jens Erat). +- TW-1501 Calc can't handle multi-digit numbers in some expressions (thanks to + Jeremy John Reeder). - Fixed assorted color theme problems. - Changed assorted reports so they do not use '.age' format for dates that are in the future, because those are never shown with this format (thanks to diff --git a/src/calc.cpp b/src/calc.cpp index 9635e02b8..9fd2882e2 100644 --- a/src/calc.cpp +++ b/src/calc.cpp @@ -57,7 +57,7 @@ int main (int argc, char** argv) try { bool infix = true; - bool ambiguous = true; + bool ambiguous = false; // Add a source for constants. Eval e; @@ -77,8 +77,8 @@ int main (int argc, char** argv) << " -d|--debug Debug mode\n" << " -i|--infix Infix expression (default)\n" << " -p|--postfix Postfix expression\n" - << " -a|--ambiguous Choose dates over numbers when ambiguous (default)\n" - << " -n|--noambiguous Choose numbers over dates when ambiguous\n" + << " -a|--ambiguous Choose dates over numbers when ambiguous\n" + << " -n|--noambiguous Choose numbers over dates when ambiguous (default)\n" << "\n"; exit (1); }