Bugfix: conversion of an empty string to a date or hour object

[AXE.git] / src / date.h

diff --git a/src/date.h b/src/date.h
index 0789ef4..2a500d4 100644 (file)
--- a/src/date.h
+++ b/src/date.h
@@ -5,7 +5,7 @@
 ***********************
 **      FILE NAME      : date.h
 **      SYSTEM NAME    : AXE - Andromeda X-windows Encapsulation
-**      VERSION NUMBER : $Revision: 1.2 $
+**      VERSION NUMBER : $Revision: 1.3 $
 **
 **  DESCRIPTION      :  
 **
@@ -23,7 +23,18 @@
 
 /*****************************
    $Log: date.h,v $
-   Revision 1.2  2002-09-02 06:18:20  arjen
+   Revision 1.3  2002-09-28 06:58:45  arjen
+   Bugfix: conversion of an empty string to a date or hour object
+   now makes the values of such an object 0 (null) instead of giving
+   a segmentation fault.
+   The class UTC combines the date and hour classes. The most basic
+   functions of the UTC class are now implemented.
+   These include constructors and conversion to and from String objects.
+   New functions: date::proper(), hour::proper() and UTC::proper().
+   Return true if the object holds a proper clock time and/or calendar
+   date; false if at least one value is out of range.
+
+   Revision 1.2  2002/09/02 06:18:20  arjen
    Fixed some date and time conversion functions
 
    Revision 1.1  2002/07/25 08:01:26  arjen
@@ -31,7 +42,7 @@
 
 *****************************/
 
-/* static const char *RCSID = "$Id: date.h,v 1.2 2002-09-02 06:18:20 arjen Exp $"; */
+/* static const char *RCSID = "$Id: date.h,v 1.3 2002-09-28 06:58:45 arjen Exp $"; */
 
 #ifndef AXE_DATE_H
 #define AXE_DATE_H
@@ -49,6 +60,8 @@ class date
 
    date subtract(unsigned long days);
 
+   friend class UTC;
+
 public:
 
    date()
@@ -67,6 +80,8 @@ public:
 
    date(String s);
 
+   bool proper();   // Check wether this is a proper calendar date
+
    friend date operator+(date, date);
    friend date operator+(unsigned long,  date);
    friend date operator+(date,  unsigned long);
@@ -186,8 +201,8 @@ public:
 //   date operator/(double)
 //   date& operator/=(double)
 
-   friend ostream& operator<<(ostream&, const date&);
-   friend istream& operator>>(istream&, date&);
+   friend std::ostream& operator<<(std::ostream&, const date&);
+   friend std::istream& operator>>(std::istream&, date&);
 
    String format(const char *fmt = "%F");
 };
@@ -199,6 +214,8 @@ class hour
    int   hours;
    short minutes, seconds;
 
+   friend class UTC;
+
 public:
 
    hour()
@@ -217,12 +234,14 @@ public:
 
    hour(String s);
 
+   bool proper();   // Check wether this is a proper clock time
+
    friend hour operator+(hour &, hour &);
    hour operator += (hour h);
    friend hour operator-(hour &, hour &);
 
-   friend ostream& operator<<(ostream &, const hour &);
-   friend istream& operator>>(istream &, hour &);
+   friend std::ostream& operator<<(std::ostream &, const hour &);
+   friend std::istream& operator>>(std::istream &, hour &);
 
    String format(const char *fmt = "%T");
 };
@@ -238,7 +257,37 @@ public:
 
    UTC()
    {
+      /* Leave everything to the default hour and date constructors */
+   }
+
+   UTC(const String s);
+   UTC(date dt, hour tm)
+   {
+      d = dt;
+      t = tm;
+   }
+
+   operator date()
+   {
+      return d;
    }
+
+   operator hour()
+   {
+      return t;
+   }
+
+   bool proper()
+   {
+      return d.proper() && t.proper();
+   }
+
+   friend std::ostream& operator<<(std::ostream &, const UTC &);
+   friend std::istream& operator>>(std::istream &, UTC &);
+
+   String format(const char *fmt = "%F %T");
 };
 
+UTC Now();
+
 #endif /* AXE_DATE_H */