Enhancement - Command Line Parsing

- Fixed problem where a blank ID was considered valid.  For example,
  the command "task 1 -2" should use -2 as the description, but instead
  considered this to be the sequence 1,0,2.
- Replaced old validId calls with the new validSequence calls.
- A sequence has been redefined to be the first set of consecutive
  arguments that look like sequences.  Once broken by a non-sequence
  argument, all remaining args, even if they look like a sequence,
  are not considered part of the sequence.  This allows commands like
  "task append 1,3-5 Write 10 emails", where 10 is not part of the
  sequence because of the intervening "Write".
- Unit tests (parse.t.cpp) that exercise the parsing of sequences.
  Should probably be expanded to cover more.

src/tests/.gitignore

@@ -5,3 +5,4 @@ date.t
 duration.t
 text.t
 autocomplete.t
+parse.t

src/tests/Makefile

@@ -1,4 +1,5 @@
-PROJECT = t.t tdb.t date.t duration.t t.benchmark.t text.t autocomplete.t
+PROJECT = t.t tdb.t date.t duration.t t.benchmark.t text.t autocomplete.t \
+          parse.t
 CFLAGS  = -I. -I.. -Wall -pedantic -ggdb3 -fno-rtti
 LFLAGS  = -L/usr/local/lib
 OBJECTS = ../TDB.o ../T.o ../parse.o ../text.o ../Date.o ../util.o ../Config.o
@@ -38,3 +39,6 @@ text.t: text.t.o $(OBJECTS) test.o
 autocomplete.t: autocomplete.t.o $(OBJECTS) test.o
 	g++ autocomplete.t.o $(OBJECTS) test.o $(LFLAGS) -o autocomplete.t
 
+parse.t: parse.t.o $(OBJECTS) test.o
+	g++ parse.t.o $(OBJECTS) test.o $(LFLAGS) -o parse.t
+

src/tests/parse.t.cpp

@@ -0,0 +1,134 @@
+////////////////////////////////////////////////////////////////////////////////
+// task - a command line task list manager.
+//
+// Copyright 2006 - 2009, Paul Beckingham.
+// All rights reserved.
+//
+// This program is free software; you can redistribute it and/or modify it under
+// the terms of the GNU General Public License as published by the Free Software
+// Foundation; either version 2 of the License, or (at your option) any later
+// version.
+//
+// This program is distributed in the hope that it will be useful, but WITHOUT
+// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+// FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+// details.
+//
+// You should have received a copy of the GNU General Public License along with
+// this program; if not, write to the
+//
+//     Free Software Foundation, Inc.,
+//     51 Franklin Street, Fifth Floor,
+//     Boston, MA
+//     02110-1301
+//     USA
+//
+////////////////////////////////////////////////////////////////////////////////
+#include <iostream>
+#include "task.h"
+#include "test.h"
+
+////////////////////////////////////////////////////////////////////////////////
+int main (int argc, char** argv)
+{
+  UnitTest t (18);
+
+  std::vector <std::string> args;
+  std::string command;
+
+  Config conf;
+  conf.set ("dateformat", "m/d/Y");
+
+  {
+    T task;
+    split (args, "add foo", ' ');
+    parse (args, command, task, conf);
+    t.is (command,                "add", "(1) command found");
+    t.is (task.getId (),          0,     "(1) zero id on add");
+    t.is (task.getDescription (), "foo", "(1) correct description");
+  }
+
+  {
+    T task;
+    split (args, "delete 1,3-5,7", ' ');
+    parse (args, command, task, conf);
+    std::vector <int> sequence = task.getAllIds ();
+    t.is (sequence.size (), (size_t)5, "(2) sequence length");
+    if (sequence.size () == 5)
+    {
+      t.is (sequence[0], 1, "(2) sequence[0] == 1");
+      t.is (sequence[1], 3, "(2) sequence[1] == 3");
+      t.is (sequence[2], 4, "(2) sequence[2] == 4");
+      t.is (sequence[3], 5, "(2) sequence[3] == 5");
+      t.is (sequence[4], 7, "(2) sequence[4] == 7");
+    }
+    else
+    {
+      t.fail ("(2) sequence[0] == 1");
+      t.fail ("(2) sequence[1] == 3");
+      t.fail ("(2) sequence[2] == 4");
+      t.fail ("(2) sequence[3] == 5");
+      t.fail ("(2) sequence[4] == 7");
+    }
+  }
+
+  {
+    T task;
+    split (args, "delete 1,2 3,4", ' ');
+    parse (args, command, task, conf);
+    std::vector <int> sequence = task.getAllIds ();
+    t.is (sequence.size (), (size_t)4, "(3) sequence length");
+    if (sequence.size () == 4)
+    {
+      t.is (sequence[0], 1, "(3) sequence[0] == 1");
+      t.is (sequence[1], 2, "(3) sequence[1] == 2");
+      t.is (sequence[2], 3, "(3) sequence[2] == 3");
+      t.is (sequence[3], 4, "(3) sequence[3] == 4");
+    }
+    else
+    {
+      t.fail ("(3) sequence[0] == 1");
+      t.fail ("(3) sequence[1] == 2");
+      t.fail ("(3) sequence[2] == 3");
+      t.fail ("(3) sequence[3] == 4");
+    }
+  }
+
+  {
+    T task;
+    split (args, "1 There are 7 days in a week", ' ');
+    parse (args, command, task, conf);
+    std::vector <int> sequence = task.getAllIds ();
+    t.is (sequence.size (), (size_t)1, "(4) sequence length");
+    if (sequence.size () == 1)
+    {
+      t.is (sequence[0], 1, "(4) sequence[0] == 1");
+    }
+    else
+    {
+      t.fail ("(4) sequence[0] == 1");
+    }
+  }
+
+  {
+    T task;
+    args.clear ();
+    args.push_back ("1");
+    args.push_back ("4-123 is back-ordered");
+    parse (args, command, task, conf);
+    std::vector <int> sequence = task.getAllIds ();
+    t.is (sequence.size (), (size_t)1, "(5) sequence length");
+    if (sequence.size () == 1)
+    {
+      t.is (sequence[0], 1, "(5) sequence[0] == 1");
+    }
+    else
+    {
+      t.fail ("(5) sequence[0] == 1");
+    }
+  }
+  return 0;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+