Fix using day-of-week names for `xact` command

Also fix end-of-command boundary checks for keywords "at", "to", etc.

2 files changed, 36 insertions, 13 deletions

diff --git a/src/draft.cc b/src/draft.cc
index 12d7faf7..0ece892e 100644
--- a/src/draft.cc
+++ b/src/draft.cc
@@ -108,7 +108,7 @@ void draft_t::parse_args(const value_t& args)
       check_for_date = false;
     }
     else if (check_for_date &&
-             bool(weekday = string_to_day_of_week(what[0]))) {
+             bool(weekday = string_to_day_of_week((*begin).to_string()))) {
 #if defined(__GNUC__) && __GNUC__ >= 4 && __GNUC_MINOR__ >= 7
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
@@ -127,35 +127,35 @@ void draft_t::parse_args(const value_t& args)
       string arg = (*begin).to_string();
 
       if (arg == "at") {
-        if (begin == end)
+        if (++begin == end)
           throw std::runtime_error(_("Invalid xact command arguments"));
-        tmpl->payee_mask = (*++begin).to_string();
+        tmpl->payee_mask = (*begin).to_string();
       }
       else if (arg == "to" || arg == "from") {
         if (! post || post->account_mask) {
           tmpl->posts.push_back(xact_template_t::post_template_t());
           post = &tmpl->posts.back();
         }
-        if (begin == end)
+        if (++begin == end)
           throw std::runtime_error(_("Invalid xact command arguments"));
-        post->account_mask = mask_t((*++begin).to_string());
+        post->account_mask = mask_t((*begin).to_string());
         post->from = arg == "from";
       }
       else if (arg == "on") {
-        if (begin == end)
+        if (++begin == end)
           throw std::runtime_error(_("Invalid xact command arguments"));
-        tmpl->date = parse_date((*++begin).to_string());
+        tmpl->date = parse_date((*begin).to_string());
         check_for_date = false;
       }
       else if (arg == "code") {
-        if (begin == end)
+        if (++begin == end)
           throw std::runtime_error(_("Invalid xact command arguments"));
-        tmpl->code = (*++begin).to_string();
+        tmpl->code = (*begin).to_string();
       }
       else if (arg == "note") {
-        if (begin == end)
+        if (++begin == end)
           throw std::runtime_error(_("Invalid xact command arguments"));
-        tmpl->note = (*++begin).to_string();
+        tmpl->note = (*begin).to_string();
       }
       else if (arg == "rest") {
         ;                       // just ignore this argument
@@ -163,9 +163,9 @@ void draft_t::parse_args(const value_t& args)
       else if (arg == "@" || arg == "@@") {
         amount_t cost;
         post->cost_operator = arg;
-        if (begin == end)
+        if (++begin == end)
           throw std::runtime_error(_("Invalid xact command arguments"));
-        arg = (*++begin).to_string();
+        arg = (*begin).to_string();
         if (! cost.parse(arg, PARSE_SOFT_FAIL | PARSE_NO_MIGRATE))
           throw std::runtime_error(_("Invalid xact command arguments"));
         post->cost = cost;
diff --git a/test/baseline/cmd-entry.test b/test/baseline/cmd-entry.test
index 0de39b9c..152a4738 100644
--- a/test/baseline/cmd-entry.test
+++ b/test/baseline/cmd-entry.test
@@ -41,3 +41,26 @@ __ERROR__
 Error: No accounts, and no past transaction matching 'no:such:account'
 end test
 
+test entry --now 2012/03/25 thursday "Test 1"
+2012/03/22 Test 1
+    A                                         $10.00
+    B
+end test
+
+test --now 2012/03/25 entry tue at "Test 2"
+2012/03/20 Test 2
+    C                                      20.00 EUR
+    D
+end test
+
+test --now 2012/03/25 entry "Test 1" from D
+2012/03/25 Test 1
+    A                                         $10.00
+    D
+end test
+
+test --now 2012/03/25 entry "Test 1" from -> 1
+__ERROR__
+Error: Invalid xact command arguments
+end test
+