Merge pull request #68 from scivision/usebug

allow work on Windows that lacks strptime

Author: milancurcic

CMakeLists.txt

@@ -16,9 +16,17 @@ Fortran_MODULE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/include
 ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib
 LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
 
+if(WIN32)
+  enable_language(CXX)
+  add_library(strptime OBJECT strptime.cpp)
+  set_target_properties(strptime PROPERTIES CXX_STANDARD 11 CXX_STANDARD_REQUIRED true)
+  target_link_libraries(datetime PRIVATE strptime)
+endif()
+
 # tests
 add_executable(datetime_tests src/tests/datetime_tests.f90)
 target_link_libraries(datetime_tests datetime)
 set_target_properties(datetime_tests PROPERTIES
-RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
+RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin
+LINKER_LANGUAGE Fortran)
 add_test(NAME datetime_tests COMMAND $<TARGET_FILE:datetime_tests>)

src/lib/datetime.f90

@@ -2,7 +2,7 @@
 ! datetime-fortran - A Fortran library for date and time manipulation
 ! Copyright (c) 2013-2017, Wavebit Scientific LLC
 ! All rights reserved.
-! 
+!
 ! Licensed under the BSD-3 clause license. See LICENSE for details.
 !
 module datetime_module

src/lib/mod_datetime.f90

@@ -85,7 +85,7 @@ module mod_datetime
   procedure,pass(d0),private :: datetime_plus_timedelta
   procedure,pass(d0),private :: timedelta_plus_datetime
   procedure,pass(d0),private :: datetime_minus_datetime
-  procedure,pass(d0),private :: datetime_minus_timedelta 
+  procedure,pass(d0),private :: datetime_minus_timedelta
   procedure,pass(d0),private :: eq
   procedure,pass(d0),private :: neq
   procedure,pass(d0),private :: gt
@@ -123,14 +123,14 @@ pure elemental type(datetime) function datetime_constructor(year,month,&
   integer,          intent(in),optional :: year        !! year
   integer,          intent(in),optional :: month       !! month
   integer,          intent(in),optional :: day         !! day
-  integer,          intent(in),optional :: hour        !! hour 
+  integer,          intent(in),optional :: hour        !! hour
   integer,          intent(in),optional :: minute      !! minute
   integer,          intent(in),optional :: second      !! second
   integer,          intent(in),optional :: millisecond !! millisecond
   real(kind=real64),intent(in),optional :: tz          !! timezone offset in hours
 
   if(present(year))then
-    datetime_constructor % year = year    
+    datetime_constructor % year = year
   else
     datetime_constructor % year = 1
   endif
@@ -181,7 +181,7 @@ pure elemental type(datetime) function datetime_constructor(year,month,&
 
 
 
-! datetime getters  
+! datetime getters
 !=======================================================================
 
 pure elemental integer function getYear(self)
@@ -273,12 +273,12 @@ pure elemental subroutine addMilliseconds(self,ms)
 endsubroutine addMilliseconds
 
 
-! datetime-bound methods 
+! datetime-bound methods
 !=======================================================================
 
 pure elemental subroutine addSeconds(self,s)
 
-  !! Adds an integer number of seconds to self. Called by `datetime` 
+  !! Adds an integer number of seconds to self. Called by `datetime`
   !! addition (`+`) and subtraction (`-`) operators.
 
   class(datetime),intent(inout) :: self !! `datetime` instance
@@ -304,7 +304,7 @@ pure elemental subroutine addSeconds(self,s)
 
 pure elemental subroutine addMinutes(self,m)
 
-  !! Adds an integer number of minutes to self. Called by `datetime` 
+  !! Adds an integer number of minutes to self. Called by `datetime`
   !! addition (`+`) and subtraction (`-`) operators.
 
   class(datetime),intent(inout) :: self !! `datetime` instance
@@ -330,7 +330,7 @@ pure elemental subroutine addMinutes(self,m)
 
 pure elemental subroutine addHours(self,h)
 
-  !! Adds an integer number of hours to self. Called by `datetime` 
+  !! Adds an integer number of hours to self. Called by `datetime`
   !! addition (`+`) and subtraction (`-`) operators.
 
   class(datetime),intent(inout) :: self !! `datetime` instance
@@ -356,7 +356,7 @@ pure elemental subroutine addHours(self,h)
 
 pure elemental subroutine addDays(self,d)
 
-  !! Adds an integer number of dayss to self. Called by `datetime` 
+  !! Adds an integer number of dayss to self. Called by `datetime`
   !! addition (`+`) and subtraction (`-`) operators.
 
   class(datetime),intent(inout) :: self !! `datetime` instance
@@ -383,7 +383,7 @@ pure elemental subroutine addDays(self,d)
       self % day = self % day+daysInMonth(self % month,self % year)
     else
       exit
-    endif 
+    endif
   enddo
 
 endsubroutine addDays
@@ -395,7 +395,7 @@ pure elemental character(len=23) function isoformat(self,sep)
   !! Returns character string with time in ISO 8601 format.
 
   class(datetime), intent(in)          :: self !! `datetime instance`
-  character(len=1),intent(in),optional :: sep  
+  character(len=1),intent(in),optional :: sep
     !! separator character, 'T' is default
 
   character(len=1) :: separator
@@ -406,8 +406,8 @@ pure elemental character(len=23) function isoformat(self,sep)
     separator = 'T'
   endif
 
-  ! TODO below is a bit cumbersome and was implemented 
-  ! at a time before the interface to strftime. Now we 
+  ! TODO below is a bit cumbersome and was implemented
+  ! at a time before the interface to strftime. Now we
   ! could do something like:
   !
   ! isoformat = self % strftime('%Y-%m-%d'//separator//'%H:%M:%S')
@@ -426,8 +426,8 @@ pure elemental character(len=23) function isoformat(self,sep)
 
 pure elemental logical function isValid(self)
 
-  !! Checks whether the `datetime` instance has valid component values. 
-  !! Returns `.true.` if the `datetime` instance is valid, and `.false.` 
+  !! Checks whether the `datetime` instance has valid component values.
+  !! Returns `.true.` if the `datetime` instance is valid, and `.false.`
   !! otherwise.
 
   class(datetime),intent(in) :: self !! `datetime` instance
@@ -450,23 +450,23 @@ pure elemental logical function isValid(self)
     isValid = .false.
     return
   endif
- 
-  if(self % hour < 0 .or. self % hour > 23)then    
+
+  if(self % hour < 0 .or. self % hour > 23)then
     isValid = .false.
     return
   endif
 
-  if(self % minute < 0 .or. self % minute > 59)then    
+  if(self % minute < 0 .or. self % minute > 59)then
     isValid = .false.
     return
   endif
 
-  if(self % second < 0 .or. self % second > 59)then    
+  if(self % second < 0 .or. self % second > 59)then
     isValid = .false.
     return
   endif
 
-  if(self % millisecond < 0 .or. self % millisecond > 999)then    
+  if(self % millisecond < 0 .or. self % millisecond > 999)then
     isValid = .false.
     return
   endif
@@ -477,7 +477,7 @@ pure elemental logical function isValid(self)
 
 type(datetime) function now()
 
-  !! Returns a `datetime` instance with current time. 
+  !! Returns a `datetime` instance with current time.
   !! No input arguments.
 
   character(len=5)     :: zone
@@ -507,7 +507,7 @@ type(datetime) function now()
 
 pure elemental integer function weekday(self)
 
-  !! Returns the day of the week calculated using Zeller's congruence. 
+  !! Returns the day of the week calculated using Zeller's congruence.
   !! Returned value is an integer scalar in the range [0-6], such that:
   !!
   !! 0: Sunday
@@ -558,7 +558,7 @@ pure elemental integer function isoweekday(self)
   class(datetime),intent(in) :: self !! `datetime` instance
 
   isoweekday = self % weekday()
-  
+
   if (isoweekday == 0) then
     isoweekday = 7
   end if
@@ -632,8 +632,8 @@ pure elemental character(len=3) function isoweekdayShort(self)
 
 function isocalendar(self)
 
-  !! Returns an array of 3 integers, year, week number, and week day, 
-  !! as defined by ISO 8601 week date. Essentially a wrapper around C 
+  !! Returns an array of 3 integers, year, week number, and week day,
+  !! as defined by ISO 8601 week date. Essentially a wrapper around C
   !! `strftime` function.
 
   class(datetime),intent(in) :: self !! `datetime` instance
@@ -644,7 +644,7 @@ function isocalendar(self)
   character(len=20)    :: string
 
   rc = c_strftime(string,len(string),'%G %V %u'//c_null_char,&
-                  self % tm())  
+                  self % tm())
 
   read(unit=string(1:4),fmt='(I4)')year
   read(unit=string(6:7),fmt='(I2)')week
@@ -658,10 +658,10 @@ function isocalendar(self)
 
 integer function secondsSinceEpoch(self)
 
-  !! Returns an integer number of seconds since the UNIX Epoch, 
-  !! `1970-01-01 00:00:00`. Note that this is a wrapper around C's 
-  !! `strftime('%s')`, so the number of seconds will reflect the time 
-  !! zone of the local machine on which the function is being called. 
+  !! Returns an integer number of seconds since the UNIX Epoch,
+  !! `1970-01-01 00:00:00`. Note that this is a wrapper around C's
+  !! `strftime('%s')`, so the number of seconds will reflect the time
+  !! zone of the local machine on which the function is being called.
 
   class(datetime),intent(in) :: self !! `datetime` instance
 
@@ -748,7 +748,7 @@ pure elemental character(len=5) function tzOffset(self)
 
 pure elemental type(datetime) function utc(self)
 
-  !! Returns the `datetime` instance at Coordinated Universal Time (UTC). 
+  !! Returns the `datetime` instance at Coordinated Universal Time (UTC).
 
   class(datetime),intent(in) :: self !! `datetime` instance
 
@@ -890,8 +890,8 @@ pure elemental function datetime_minus_datetime(d0,d1) result(t)
 
 pure elemental logical function gt(d0,d1)
 
-  !! `datetime` comparison operator that eturns `.true.` if `d0` is 
-  !! greater than `d1` and `.false.` otherwise. Overloads the 
+  !! `datetime` comparison operator that eturns `.true.` if `d0` is
+  !! greater than `d1` and `.false.` otherwise. Overloads the
   !! operator `>`.
 
   class(datetime),intent(in) :: d0 !! lhs `datetime` instance
@@ -965,7 +965,7 @@ pure elemental logical function gt(d0,d1)
 
 pure elemental logical function lt(d0,d1)
 
-  !! `datetime` comparison operator that returns `.true.` if `d0` is 
+  !! `datetime` comparison operator that returns `.true.` if `d0` is
   !! less than `d1` and `.false.` otherwise. Overloads the operator `<`.
 
   class(datetime),intent(in) :: d0 !! lhs `datetime` instance
@@ -979,7 +979,7 @@ pure elemental logical function lt(d0,d1)
 
 pure elemental logical function eq(d0,d1)
 
-  !! `datetime` comparison operator that returns `.true.` if `d0` is 
+  !! `datetime` comparison operator that returns `.true.` if `d0` is
   !! equal to `d1` and `.false.` otherwise. Overloads the operator `==`.
 
   class(datetime),intent(in) :: d0 !! lhs `datetime` instance
@@ -1005,7 +1005,7 @@ pure elemental logical function eq(d0,d1)
 
 pure elemental logical function neq(d0,d1)
 
-  !! `datetime` comparison operator that eturns `.true.` if `d0` is 
+  !! `datetime` comparison operator that eturns `.true.` if `d0` is
   !! not equal to `d1` and `.false.` otherwise. Overloads the operator `/=`.
 
   class(datetime),intent(in) :: d0 !! lhs `datetime` instance
@@ -1019,8 +1019,8 @@ pure elemental logical function neq(d0,d1)
 
 pure elemental logical function ge(d0,d1)
 
-  !! `datetime` comparison operator. Returns `.true.` if `d0` is greater 
-  !! than or equal to `d1` and `.false.` otherwise. Overloads the 
+  !! `datetime` comparison operator. Returns `.true.` if `d0` is greater
+  !! than or equal to `d1` and `.false.` otherwise. Overloads the
   !! operator `>=`.
 
   class(datetime),intent(in) :: d0 !! lhs `datetime` instance
@@ -1034,8 +1034,8 @@ pure elemental logical function ge(d0,d1)
 
 pure elemental logical function le(d0,d1)
 
-  !! `datetime` comparison operator. Returns `.true.` if `d0` is less 
-  !! than or equal to `d1`, and `.false.` otherwise. Overloads the 
+  !! `datetime` comparison operator. Returns `.true.` if `d0` is less
+  !! than or equal to `d1`, and `.false.` otherwise. Overloads the
   !! operator `<=`.
 
   class(datetime),intent(in) :: d0 !! lhs `datetime` instance
@@ -1065,9 +1065,9 @@ pure elemental logical function isLeapYear(year)
 
 pure function datetimeRange(d0,d1,t)
 
-  !! Given start and end `datetime` instances `d0` and `d1` and time 
-  !! increment as `timedelta` instance `t`, returns an array of 
-  !! `datetime` instances. The number of elements is the number of whole 
+  !! Given start and end `datetime` instances `d0` and `d1` and time
+  !! increment as `timedelta` instance `t`, returns an array of
+  !! `datetime` instances. The number of elements is the number of whole
   !! time increments contained between datetimes `d0` and `d1`.
 
   type(datetime), intent(in) :: d0 !! start time
@@ -1113,8 +1113,8 @@ pure elemental integer function daysInMonth(month,year)
 
   if(month < 1 .or. month > 12)then
     ! Should raise an error and abort here, however we want to keep
-    ! the pure and elemental attributes. Make sure this function is 
-    ! called with the month argument in range. 
+    ! the pure and elemental attributes. Make sure this function is
+    ! called with the month argument in range.
     daysInMonth = 0
     return
   endif
@@ -1147,7 +1147,7 @@ pure elemental integer function daysInYear(year)
 
 pure elemental real(kind=real64) function date2num(d)
 
-  !! Given a datetime instance d, returns number of days since 
+  !! Given a datetime instance d, returns number of days since
   !! `0001-01-01 00:00:00`, taking into account the timezone offset.
 
   type(datetime),intent(in) :: d !! `datetime` instance
@@ -1174,17 +1174,17 @@ pure elemental real(kind=real64) function date2num(d)
            + d_utc % hour*h2d  &
            + d_utc % minute*m2d&
            + (d_utc % second+1e-3_real64*d_utc % millisecond)*s2d
- 
+
 endfunction date2num
 
 
 
 pure elemental type(datetime) function num2date(num)
 
-  !! Given number of days since `0001-01-01 00:00:00`, returns a 
+  !! Given number of days since `0001-01-01 00:00:00`, returns a
   !! correspoding `datetime` instance.
 
-  real(kind=real64),intent(in) :: num 
+  real(kind=real64),intent(in) :: num
     !! number of days since `0001-01-01 00:00:00`
 
   integer :: year,month,day,hour,minute,second,millisecond
@@ -1247,7 +1247,7 @@ pure elemental type(datetime) function num2date(num)
 type(datetime) function strptime(str,format)
 
   !! A wrapper function around C/C++ strptime function.
-  !! Returns a `datetime` instance. 
+  !! Returns a `datetime` instance.
 
   character(len=*),intent(in) :: str    !! time string
   character(len=*),intent(in) :: format !! time format
@@ -1264,7 +1264,7 @@ type(datetime) function strptime(str,format)
 
 pure elemental type(datetime) function tm2date(ctime)
 
-  !! Given a `tm_struct` instance, returns a corresponding `datetime` 
+  !! Given a `tm_struct` instance, returns a corresponding `datetime`
   !! instance.
 
   type(tm_struct),intent(in) :: ctime !! C-style time struct