Performance improvements:

- Added parse-free convenience functions

src/Date.cpp

@@ -602,43 +602,43 @@ int Date::second () const
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-bool Date::operator== (const Date& rhs)
+bool Date::operator== (const Date& rhs) const
 {
   return rhs._t == _t;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-bool Date::operator!= (const Date& rhs)
+bool Date::operator!= (const Date& rhs) const
 {
   return rhs._t != _t;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-bool Date::operator<  (const Date& rhs)
+bool Date::operator<  (const Date& rhs) const
 {
   return _t < rhs._t;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-bool Date::operator>  (const Date& rhs)
+bool Date::operator>  (const Date& rhs) const
 {
   return _t > rhs._t;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-bool Date::operator<= (const Date& rhs)
+bool Date::operator<= (const Date& rhs) const
 {
   return _t <= rhs._t;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-bool Date::operator>= (const Date& rhs)
+bool Date::operator>= (const Date& rhs) const
 {
   return _t >= rhs._t;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-bool Date::sameHour (const Date& rhs)
+bool Date::sameHour (const Date& rhs) const
 {
   if (this->year ()  == rhs.year ()  &&
       this->month () == rhs.month () &&
@@ -650,7 +650,7 @@ bool Date::sameHour (const Date& rhs)
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-bool Date::sameDay (const Date& rhs)
+bool Date::sameDay (const Date& rhs) const
 {
   if (this->year ()  == rhs.year ()  &&
       this->month () == rhs.month () &&
@@ -661,7 +661,7 @@ bool Date::sameDay (const Date& rhs)
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-bool Date::sameMonth (const Date& rhs)
+bool Date::sameMonth (const Date& rhs) const
 {
   if (this->year ()  == rhs.year () &&
       this->month () == rhs.month ())
@@ -671,7 +671,7 @@ bool Date::sameMonth (const Date& rhs)
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-bool Date::sameYear (const Date& rhs)
+bool Date::sameYear (const Date& rhs) const
 {
   if (this->year () == rhs.year ())
     return true;

src/Date.h

@@ -85,16 +85,16 @@ public:
   int minute () const;
   int second () const;
 
-  bool operator== (const Date&);
-  bool operator!= (const Date&);
-  bool operator<  (const Date&);
-  bool operator>  (const Date&);
-  bool operator<= (const Date&);
-  bool operator>= (const Date&);
-  bool sameHour   (const Date&);
-  bool sameDay    (const Date&);
-  bool sameMonth  (const Date&);
-  bool sameYear   (const Date&);
+  bool operator== (const Date&) const;
+  bool operator!= (const Date&) const;
+  bool operator<  (const Date&) const;
+  bool operator>  (const Date&) const;
+  bool operator<= (const Date&) const;
+  bool operator>= (const Date&) const;
+  bool sameHour   (const Date&) const;
+  bool sameDay    (const Date&) const;
+  bool sameMonth  (const Date&) const;
+  bool sameYear   (const Date&) const;
 
   Date operator+  (const int);
   Date operator-  (const int);

src/main.h

@@ -47,6 +47,7 @@ Date getNextRecurrence (Date&, std::string&);
 bool generateDueDates (Task&, std::vector <Date>&);
 void updateRecurrenceMask (Task&);
 int getDueState (const std::string&);
+int getDueState (const Date&);
 bool nag (Task&);
 
 // rules.cpp

src/recur.cpp

@@ -386,7 +386,7 @@ int getDueState (const std::string& due)
     Date dt (::atoi (due.c_str ()));
 
     // rightNow is the current date + time.
-    Date rightNow;
+    static Date rightNow;
     Date thisDay (rightNow.month (), rightNow.day (), rightNow.year ());
 
     if (dt < rightNow)
@@ -408,6 +408,36 @@ int getDueState (const std::string& due)
   return 0;
 }
 
+////////////////////////////////////////////////////////////////////////////////
+// Determines whether a task is overdue.  Returns
+//   0 = not due at all
+//   1 = imminent
+//   2 = today
+//   3 = overdue
+int getDueState (const Date& due)
+{
+  // rightNow is the current date + time.
+  static Date rightNow;
+  Date thisDay (rightNow.month (), rightNow.day (), rightNow.year ());
+
+  if (due < rightNow)
+    return 3;
+
+  if (rightNow.sameDay (due))
+    return 2;
+
+  int imminentperiod = context.config.getInteger ("due");
+
+  if (imminentperiod == 0)
+    return 1;
+
+  Date imminentDay = thisDay + imminentperiod * 86400;
+  if (due < imminentDay)
+    return 1;
+
+  return 0;
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 // Returns a Boolean indicator as to whether a nag message was generated, so
 // that commands can control the number of nag messages displayed (ie one is