added format() methods for Date and Datetime

rolled dev version in config.h

Author: eddelbuettel

ChangeLog

@@ -1,9 +1,19 @@
+2016-11-27  Dirk Eddelbuettel  <edd@debian.org>
+
+        * inst/include/Rcpp/date_datetime/Date.h (format, operator<<): Added
+        * inst/include/Rcpp/date_datetime/Datetime.h (format, operator<<): Ditto
+
+2016-11-23  Dirk Eddelbuettel  <edd@debian.org>
+
+        * inst/include/Rcpp/config.h (RCPP_DEV_VERSION): Set minor version
+
 2016-11-22  Dirk Eddelbuettel  <edd@debian.org>
 
         * DESCRIPTION (Date, Version): roll minor version
 
         * inst/include/Rcpp/date_datetime/newDatetimeVector.h (Rcpp): Small
         correction concerning timezone attribute to ctor from RTYPE
+
 2016-11-22  Jim Hester  <james.f.hester@gmail.com>
 
         * inst/src/api.cpp: Cleanup to stack message parseing

inst/NEWS.Rd

@@ -8,6 +8,7 @@
     \itemize{
       \item The exception stack message is now correctly demangled on all
       compiler versions (Jim Hester in \ghpr{598})
+      \item Date and Datetime object now have format methods
     }
     \item Changes in Rcpp unit tests
     \itemize{

inst/include/Rcpp/config.h

@@ -30,7 +30,7 @@
 #define RCPP_VERSION Rcpp_Version(0,12,8)
 
 // the current source snapshot
-#define RCPP_DEV_VERSION RcppDevVersion(0,12,8,0)
+#define RCPP_DEV_VERSION RcppDevVersion(0,12,8,1)
 
 #endif
 

inst/include/Rcpp/date_datetime/Date.h

@@ -102,6 +102,20 @@ namespace Rcpp {
             return m_d;
         }
 
+        inline std::string format(const char *fmt = "%Y-%m-%d") const {
+            char txt[32];
+            struct tm temp = m_tm;
+            temp.tm_year -= baseYear();    // adjust for fact that system has year rel. to 1900
+            ::strftime(txt, 31, fmt, &temp);
+            return std::string(txt);
+        }
+
+        inline std::ostream &operator<<(std::ostream & s) const {
+            s << this->format() << std::endl;
+            return s;
+        }
+
+
     private:
         double m_d;                 // (fractional) day number, relative to epoch of Jan 1, 1970
         struct tm m_tm;             // standard time representation

inst/include/Rcpp/date_datetime/Datetime.h

@@ -68,6 +68,20 @@ namespace Rcpp {
 
         operator double()  const { return m_dt; }
 
+        inline std::string format(const char *fmt = "%Y-%m-%d %H:%M:%S") const {
+            char txtiso[64], txtsec[64];
+            time_t t = static_cast<time_t>(std::floor(m_dt));
+            struct tm temp = *localtime(&t); // localtime, not gmtime
+            ::strftime(txtiso, 63, fmt, &temp);
+            ::snprintf(txtsec, 63, "%s.%06d", txtiso, m_us);
+            return std::string(txtsec);
+        }
+
+        inline std::ostream &operator<<(std::ostream & s) const {
+            s << this->format() << std::endl;
+            return s;
+        }
+
     private:
         double m_dt;            // fractional seconds since epoch
         struct tm m_tm;         // standard time representation
@@ -88,6 +102,11 @@ namespace Rcpp {
             }
         }
 
+        // 1900 as per POSIX mktime() et al
+        static inline unsigned int baseYear() {
+            return 1900;
+        }
+
     };
 
 
@@ -132,6 +151,7 @@ namespace Rcpp {
     inline bool    operator<=(const Datetime &d1, const Datetime& d2) { return d1.m_dt <= d2.m_dt; }
     inline bool    operator!=(const Datetime &d1, const Datetime& d2) { return d1.m_dt != d2.m_dt; }
 
+
 }
 
 #endif