mv Date to headers

Author: romainfrancois

inst/include/Rcpp/Date.h

@@ -49,17 +49,17 @@ namespace Rcpp {
             m_tm.tm_sec = m_tm.tm_min = m_tm.tm_hour = m_tm.tm_isdst = 0;
 
             // allow for ISO-notation case (yyyy, mm, dd) which we prefer over (mm, dd, year)
-            if (mon >= baseYear && day <= 12 && year <= 31) {
-                m_tm.tm_year = mon - baseYear;
+            if (mon >= baseYear() && day <= 12 && year <= 31) {
+                m_tm.tm_year = mon - baseYear();
                 m_tm.tm_mon  = day - 1;     // range 0 to 11
                 m_tm.tm_mday = year;
             } else {
                 m_tm.tm_mday  = day;
                 m_tm.tm_mon   = mon - 1;	// range 0 to 11
-                m_tm.tm_year  = year - baseYear;
+                m_tm.tm_year  = year - baseYear();
             }
             double tmp = mktime00(m_tm); 	// use mktime() replacement borrowed from R
-            m_tm.tm_year += baseYear;	// we'd rather keep it as a normal year
+            m_tm.tm_year += baseYear() ;	// we'd rather keep it as a normal year
             m_d = tmp/(24*60*60);
         }
 
@@ -79,10 +79,10 @@ namespace Rcpp {
         int getWeekday() const { return m_tm.tm_wday + 1; } 	// makes it 1 .. 7
         int getYearday() const { return m_tm.tm_yday + 1; }     // makes it 1 .. 366
 
-        static const unsigned int QLtoJan1970Offset;  			// Offset between R / Unix epoch date and the QL base date
-        static const unsigned int baseYear;						// 1900 as per POSIX mktime() et al
-        
-        Date & operator=(const Date &newdate); 					// copy assignment operator 
+        // 1900 as per POSIX mktime() et al
+        static inline const unsigned int baseYear(){
+            return 1900 ;    
+        }
 
         // Minimal set of date operations.
         friend Date   operator+(const Date &date, int offset);
@@ -116,9 +116,6 @@ namespace Rcpp {
         	double mktime00(struct tm &tm) const; // from R's src/main/datetime.c
     };    
 
-    const unsigned int Date::QLtoJan1970Offset = 25569;  	// Offset between R / Unix epoch date and the QL base date
-    const unsigned int Date::baseYear = 1900;			// because we hate macros
-
     // template specialisation for wrap() on the date 
     template <> SEXP wrap<Rcpp::Date>(const Rcpp::Date &date);
 

inst/include/Rcpp/api/meat/Date.h

@@ -0,0 +1,43 @@
+// Copyright (C) 2013 Dirk Eddelbuettel and Romain Francois
+//
+// This file is part of Rcpp.
+//
+// Rcpp 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.
+//
+// Rcpp 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 Rcpp.  If not, see <http://www.gnu.org/licenses/>.
+
+#ifndef Rcpp_api_meat_Date_h
+#define Rcpp_api_meat_Date_h
+
+namespace Rcpp{
+       
+    inline Date::Date(SEXP d) {
+        m_d = Rcpp::as<double>(d);
+        update_tm();
+    }
+         
+    inline Date::Date(const std::string &s, const std::string &fmt) {
+        Function strptime("strptime");	// we cheat and call strptime() from R
+        Function asDate("as.Date");	// and we need to convert to Date
+        m_d = Rcpp::as<int>(asDate(strptime(s, fmt, "UTC")));
+        update_tm();
+    }
+    
+    template <> 
+    inline SEXP wrap(const Date &date) {
+        return internal::new_date_object( date.getDate() ) ;
+    }
+    
+
+}
+
+#endif

inst/include/Rcpp/routines.h

@@ -34,8 +34,8 @@ namespace Rcpp{
     SEXP get_Rcpp_namespace() ; 
     SEXP rcpp_get_stack_trace() ;
     SEXP rcpp_set_stack_trace(SEXP) ;
-    inline double mktime00(struct tm &) ;
-    inline struct tm * gmtime_(const time_t * const) ;
+    double mktime00(struct tm &) ;
+    struct tm * gmtime_(const time_t * const) ;
 }
 
 int* get_cache( int n ) ;

src/Date.cpp

@@ -51,7 +51,7 @@ namespace Rcpp {
         double excess = 0.0;
 
         day = tm.tm_mday - 1;
-        year0 = Date::baseYear + tm.tm_year;
+        year0 = Date::baseYear() + tm.tm_year;
         /* safety check for unbounded loops */
         if (year0 > 3000) {
             excess = (int)(year0/2000) - 1;