strptime 0.1.5-x64-mingw32 → 0.1.6-x64-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f14b003f4b8844cbf672f61a08d6bd36ec00bc6e
-  data.tar.gz: d862294a20c9f82abc4ebc2ed3894c44df65d5d3
+  metadata.gz: 74e748c14431762b3cd13bfb0cb124f916b31df6
+  data.tar.gz: 6cc210c4a25ec8ae9f3ebff7128c1c0ca1dfc1b9
 SHA512:
-  metadata.gz: 9255de76aef38d840a2c93d3c8fd6dcc5c9e38b99f377f1d1573c871003b0ebcd5a9e1d10171501a843b3baf6f8ed906c3c1a9a6ee290d7cde4526eaae012fb2
-  data.tar.gz: 290c6de4a78e4f111a3c8a3c045ca3a17386ca5e3e475063397d86c9f3a70459505ba6c3ca59ee293cee984209901512af1861e8f7da35c22a1844a0d34a51f0
+  metadata.gz: de2d291e7788b4a0f38c9b9e2bb98d4e1e04d5c69a274500aa71839b5df9db2922af8792fe748c1fd4e6e2bb463cfda7d561eed609a4a8b2c12966c52a66209b
+  data.tar.gz: 2f766ea911b3152209fca2ca6aa2bfe528923b9f4147e7d092c6fe7a6b74a6e68519f88bd4361786dc337111839dee1cf0929fef338f527d784e485f1a2f06a9

data/.travis.yml

@@ -3,7 +3,7 @@ os:
   - linux
   - osx
 rvm:
-  - 2.0.0-p647
+  - 2.0.0
   - 2.1
   - 2.2.3
   - 2.2.3-clang

data/appveyor.yml

@@ -4,10 +4,8 @@ install:
   - ruby --version
   - gem --version
   - bundle install
-build: off
-test_script:
+build_script:
   - bundle exec rake -rdevkit
-
 environment:
   matrix:
     - ruby_version: "200"

data/ext/strptime/extconf.rb

@@ -1,5 +1,6 @@
 require "mkmf"
 
-have_func 'timegm', 'time.h' or 'timegm(3) is required'
+have_func('rb_timespec_now')
+have_func('rb_time_timespec_new')
 
 create_makefile("strptime/strptime")

data/ext/strptime/ruby_time.c

@@ -20,7 +20,8 @@
 typedef uint64_t WIDEVALUE;
 typedef WIDEVALUE wideval_t;
 
-#ifdef PACKED_STRUCT_UNALIGNED
+#ifndef HAVE_RB_TIME_TIMESPEC_NEW
+# if defined(PACKED_STRUCT_UNALIGNED) /* 2.2 */
 PACKED_STRUCT_UNALIGNED(struct vtm {
     VALUE year;	/* 2000 for example.  Integer. */
     VALUE subsecx;     /* 0 <= subsecx < TIME_SCALE.  possibly Rational. */
@@ -41,7 +42,7 @@ PACKED_STRUCT_UNALIGNED(struct time_object {
     uint8_t gmt : 3; /* 0:utc 1:localtime 2:fixoff 3:init */
     uint8_t tm_got : 1;
 });
-#else
+# else /* 2.0.0~2.1 */
 struct vtm {
     VALUE year; /* 2000 for example.  Integer. */
     int mon; /* 1..12 */
@@ -62,15 +63,13 @@ struct time_object {
     int gmt; /* 0:utc 1:localtime 2:fixoff */
     int tm_got;
 };
-#endif
+# endif
 
 VALUE
-rb_time_succ(VALUE time);
-VALUE
-rbtime_timespec_new(const struct timespec *ts, int offset)
+rb_time_timespec_new(const struct timespec *ts, int offset)
 {
     VALUE obj = rb_time_nano_new(ts->tv_sec, ts->tv_nsec);
-    if (offset) {
+    if (-86400 < offset && offset <  86400) { /* fixoff */
 	struct time_object *tobj;
 	tobj = DATA_PTR(obj);
 	tobj->tm_got = 0;
@@ -78,12 +77,25 @@ rbtime_timespec_new(const struct timespec *ts, int offset)
 	tobj->vtm.utc_offset = INT2FIX(offset);
 	tobj->vtm.zone = NULL;
     }
+    else if (offset == INT_MAX) { /* localtime */
+    }
+    else if (offset == INT_MAX-1) { /* UTC */
+	struct time_object *tobj;
+	tobj = DATA_PTR(obj);
+	tobj->tm_got = 0;
+	tobj->gmt = 1;
+    }
+    else {
+	rb_raise(rb_eArgError, "utc_offset out of range");
+    }
+
     return obj;
 }
+#endif
 
-/* timespec_now */
+#ifndef RB_TIMESPEC_NOW
 void
-timespec_now(struct timespec *ts)
+rb_timespec_now(struct timespec *ts)
 {
 #ifdef HAVE_CLOCK_GETTIME
     if (clock_gettime(CLOCK_REALTIME, ts) == -1) {
@@ -100,6 +112,7 @@ timespec_now(struct timespec *ts)
     }
 #endif
 }
+#endif
 
 /* localtime_with_gmtoff_zone */
 #ifdef HAVE_GMTIME_R

data/ext/strptime/strptime.c

@@ -365,7 +365,7 @@ strptime_exec0(void **pc, const char *fmt, const char *str, size_t slen,
 	const char *p0 = str + si;
 	int r;
 	size_t len;
-	if (*p0 == 'z') {
+	if (*p0 == 'z' || *p0 == 'Z') {
 	    gmtoff = 0;
 	    ADD_PC(1);
 	    END_INSN(z)
@@ -420,9 +420,10 @@ strptime_exec0(void **pc, const char *fmt, const char *str, size_t slen,
 	struct timespec ts;
 	struct tm tm;
 	time_t t;
+	int gmt = gmtoff >= INT_MAX-1 ? INT_MAX-gmtoff : 2;
 
 	/* get current time with timezone */
-	timespec_now(&ts);
+	rb_timespec_now(&ts);
 	{
 	    static time_t ct;
 	    static struct tm ctm;
@@ -436,6 +437,9 @@ strptime_exec0(void **pc, const char *fmt, const char *str, size_t slen,
 	    if (gmtoff == INT_MAX) {
 		gmtoff = localoff;
 	    }
+	    else if (gmtoff == INT_MAX-1) {
+		gmtoff = 0;
+	    }
 	    if (gmtoff != ctmoff) {
 		tm_add_offset(&ctm, gmtoff - ctmoff);
 		ctmoff = gmtoff;
@@ -469,7 +473,8 @@ strptime_exec0(void **pc, const char *fmt, const char *str, size_t slen,
 	    if (sec != -1) tm.tm_sec = sec;
 	}
 
-	t = timegm_noleapsecond(&tm) - gmtoff;
+	t = timegm_noleapsecond(&tm);
+	if (gmt != 1) t -= gmtoff;
 	tsp->tv_sec = t;
 	tsp->tv_nsec = nsec;
 	*gmtoffp = gmtoff;
@@ -658,32 +663,6 @@ strptime_init_copy(VALUE copy, VALUE self)
     return copy;
 }
 
-typedef uint64_t WIDEVALUE;
-typedef WIDEVALUE wideval_t;
-#ifndef PACKED_STRUCT_UNALIGNED
-#define PACKED_STRUCT_UNALIGNED(x) x
-#endif
-PACKED_STRUCT_UNALIGNED(struct vtm {
-    VALUE year;	/* 2000 for example.  Integer. */
-    VALUE subsecx;     /* 0 <= subsecx < TIME_SCALE.  possibly Rational. */
-    VALUE utc_offset;  /* -3600 as -01:00 for example.  possibly Rational. */
-    const char *zone;  /* "JST", "EST", "EDT", etc. */
-    uint16_t yday : 9; /* 1..366 */
-    uint8_t mon : 4;   /* 1..12 */
-    uint8_t mday : 5;  /* 1..31 */
-    uint8_t hour : 5;  /* 0..23 */
-    uint8_t min : 6;   /* 0..59 */
-    uint8_t sec : 6;   /* 0..60 */
-    uint8_t wday : 3;  /* 0:Sunday, 1:Monday, ..., 6:Saturday 7:init */
-    uint8_t isdst : 2; /* 0:StandardTime 1:DayLightSavingTime 3:init */
-});
-PACKED_STRUCT_UNALIGNED(struct time_object {
-    wideval_t timew; /* time_t value * TIME_SCALE.  possibly Rational. */
-    struct vtm vtm;
-    uint8_t gmt : 3; /* 0:utc 1:localtime 2:fixoff 3:init */
-    uint8_t tm_got : 1;
-});
-
 /*
  * @overload exec(str)
  *   @param str [String] string to parse
@@ -696,15 +675,15 @@ static VALUE
 strptime_exec(VALUE self, VALUE str)
 {
     struct strptime_object *tobj;
-    int r, gmtoff = 0;
+    int r, gmtoff = INT_MAX;
+    struct timespec ts;
     StringValue(str);
     GetStrptimeval(self, tobj);
-    struct timespec ts;
 
     r = strptime_exec0(tobj->isns, RSTRING_PTR(tobj->fmt), RSTRING_PTR(str),
 		       RSTRING_LEN(str), &ts, &gmtoff);
     if (r) rb_raise(rb_eArgError, "string doesn't match");
-    return rbtime_timespec_new(&ts, gmtoff);
+    return rb_time_timespec_new(&ts, gmtoff);
 }
 
 /*
@@ -719,7 +698,7 @@ strptime_execi(VALUE self, VALUE str)
 {
     struct strptime_object *tobj;
     struct timespec ts;
-    int r, gmtoff = 0;
+    int r, gmtoff = INT_MAX;
     StringValue(str);
     GetStrptimeval(self, tobj);
 

data/ext/strptime/strptime.h

@@ -2,9 +2,13 @@
 #define STRPTIME_H 1
 
 #include "ruby.h"
-VALUE rbtime_timespec_new(const struct timespec *ts, int offset);
+# ifndef HAVE_RB_TIME_TIMESPEC_NEW
+VALUE rb_time_timespec_new(const struct timespec *ts, int offset);
+# endif
 struct tm * localtime_with_gmtoff_zone(const time_t *t, struct tm *result, long *gmtoff, const char **zone);
-void timespec_now(struct timespec *ts);
+# ifndef HAVE_RB_TIMESPEC_NOW
+void rb_timespec_now(struct timespec *ts);
+# endif
 time_t timegm_noleapsecond(struct tm *tm);
 void tm_add_offset(struct tm *tm, long diff);
 

data/lib/strptime/version.rb

@@ -1,3 +1,3 @@
 class Strptime
-  VERSION = "0.1.5"
+  VERSION = "0.1.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: strptime
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: x64-mingw32
 authors:
 - NARUSE, Yui
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-11-05 00:00:00.000000000 Z
+date: 2015-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler