From 9b78631e6fd4b66979101f73543a9ae29b13c755 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 6 Jun 2009 23:55:36 -0400
Subject: [PATCH] Enhancement - Sequence integration

- Sequence object fully integrated.
---
 src/Context.cpp     | 16 +++-------------
 src/Sequence.cpp    | 22 +++++++++++++++++++++-
 src/Sequence.h      |  3 ++-
 src/parse.cpp       | 12 ------------
 src/task.h          |  1 -
 src/tests/seq.t.cpp | 20 ++++++++++++++++++--
 6 files changed, 44 insertions(+), 30 deletions(-)

diff --git a/src/Context.cpp b/src/Context.cpp
index da9dd6029..cf9c62cb1 100644
--- a/src/Context.cpp
+++ b/src/Context.cpp
@@ -259,25 +259,15 @@ void Context::parse ()
 
         // Sequence
         // Note: "add" doesn't require an ID
-        else if (command != "add"               &&
-                 validSequence (*arg, sequence) &&
+        else if (command != "add"      &&
+                 sequence.valid (*arg) &&
                  ! foundSomethingAfterSequence)
         {
           std::cout << "# found sequence" << std::endl;
+          sequence.parse (*arg);
           foundSequence = true;
         }
 
-/*
-        else if (lowerCase (command) != "add"  && // "add" doesn't require an ID
-            validSequence (arg, sequence) &&
-            ! foundSomethingAfterSequence)
-        {
-          foundSequence = true;
-          foreach (id, sequence)
-            task.addId (*id);
-        }
-*/
-
 /*
         // Tags begin with + or - and contain arbitrary text.
         else if (validTag (arg))
diff --git a/src/Sequence.cpp b/src/Sequence.cpp
index 83309657e..00d2c2608 100644
--- a/src/Sequence.cpp
+++ b/src/Sequence.cpp
@@ -53,6 +53,26 @@ Sequence::~Sequence ()
 {
 }
 
+////////////////////////////////////////////////////////////////////////////////
+bool Sequence::valid (const std::string& input) const
+{
+  std::vector <std::string> ranges;
+  split (ranges, input, ',');
+
+  std::vector <std::string>::iterator it;
+  for (it = ranges.begin (); it != ranges.end (); ++it)
+  {
+    std::vector <std::string> range;
+    split (range, *it, '-');
+
+    if (range.size () < 1 ||
+        range.size () > 2)
+      return false;
+  }
+
+  return true;
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 void Sequence::parse (const std::string& input)
 {
@@ -121,7 +141,7 @@ void Sequence::combine (const Sequence& other)
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-bool Sequence::validId (const std::string& input)
+bool Sequence::validId (const std::string& input) const
 {
   if (input.length () == 0)
     return false;
diff --git a/src/Sequence.h b/src/Sequence.h
index 005e3b173..f5342000f 100644
--- a/src/Sequence.h
+++ b/src/Sequence.h
@@ -39,11 +39,12 @@ public:
   Sequence (const std::string&);         // Parse
   ~Sequence ();                          // Destructor
 
+  bool valid (const std::string&) const;
   void parse (const std::string&);
   void combine (const Sequence&);
 
 private:
-  bool validId (const std::string&);
+  bool validId (const std::string&) const;
 };
 
 #endif
diff --git a/src/parse.cpp b/src/parse.cpp
index 475be92b0..dd48092c7 100644
--- a/src/parse.cpp
+++ b/src/parse.cpp
@@ -302,18 +302,6 @@ static bool validId (const std::string& input)
 
 ////////////////////////////////////////////////////////////////////////////////
 // 1,2-4,6
-bool validSequence (
-  const std::string& input,
-  Sequence& sequence)
-{
-  bool valid = true;
-
-  try { sequence.parse (input); }
-  catch (...) { valid = false; }
-
-  return valid;
-}
-
 static bool validSequence (
   const std::string& input,
   std::vector <int>& ids)
diff --git a/src/task.h b/src/task.h
index cdd7ad6ca..c6e7416c3 100644
--- a/src/task.h
+++ b/src/task.h
@@ -43,7 +43,6 @@ bool validPriority (const std::string&);
 bool validDate (std::string&);
 bool validDuration (std::string&);
 bool validDescription (const std::string&);
-bool validSequence (const std::string&, Sequence&);
 void loadCustomReports ();
 bool isCustomReport (const std::string&);
 void allCustomReports (std::vector <std::string>&);
diff --git a/src/tests/seq.t.cpp b/src/tests/seq.t.cpp
index 8b48c5a5d..b2225c396 100644
--- a/src/tests/seq.t.cpp
+++ b/src/tests/seq.t.cpp
@@ -41,10 +41,26 @@ Sequence parseSequence (const std::string& input)
 
 int main (int argc, char** argv)
 {
-  UnitTest t (18);
+  UnitTest t (30);
+
+  // Test for validity.
+  Sequence seq;
+  t.notok (seq.valid ("1--2"),  "not valid 1--2");
+  t.notok (seq.valid ("1-2-3"), "not valid 1-2-3");
+  t.notok (seq.valid ("-1-2"),  "not valid -1-2");
+
+  t.ok (seq.valid ("1"),       "valid 1");
+  t.ok (seq.valid ("1,3"),     "valid 1,3");
+  t.ok (seq.valid ("3,1"),     "valid 3,1");
+  t.ok (seq.valid ("1,3-5,7"), "valid 1,3-5,7");
+  t.ok (seq.valid ("1-1000"),  "valid 1-1000");
+  t.ok (seq.valid ("1-1001"),  "valid 1-1001");
+  t.ok (seq.valid ("1-two"),   "valid 1-two");
+  t.ok (seq.valid ("one-2"),   "valid one-2");
+  t.ok (seq.valid ("1-5,3-7"), "valid 1-5,3-7");
 
   // 1
-  Sequence seq = parseSequence ("1");
+  seq = parseSequence ("1");
   t.is (seq.size (), (size_t)1, "seq '1' -> 1 item");
   if (seq.size () == 1)
   {