home_run 0.9.0 → 0.9.1

data/ext/{date_ext.c → date_ext/date_ext.c}

@@ -1,146 +1,5 @@
-
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <inttypes.h>
-#include <ruby.h>
-
-#ifdef RUBY19
-#define RHR_DEFAULT_CWYEAR -4713
-#define RHR_DEFAULT_CWEEK 1
-#define RHR_DEFAULT_CWDAY 1
-#else
-#define RHR_DEFAULT_CWYEAR 1582
-#define RHR_DEFAULT_CWEEK 41
-#define RHR_DEFAULT_CWDAY 5
-#endif
-
-#define RHR_JD_MJD 2400001
-#define RHR_JD_LD 2299160
-#define RHR_JD_ITALY 2299161
-#define RHR_JD_ENGLAND 2361222
-#define RHR_UNIX_EPOCH 2440588
-#define RHR_SECONDS_PER_HOUR 3600
-#define RHR_MINUTES_PER_DAYD 1440.0
-#define RHR_SECONDS_PER_DAY 86400
-#define RHR_SECONDS_PER_DAYD 86400.0
-#define RHR_MAX_OFFSET_MINUTES 864
-#define RHR_MAX_OFFSET_FRACT 0.6
-#define RHR_MIN_OFFSET_MINUTES -864
-#define RHR_MIN_OFFSET_FRACT -0.6
-
-/*
-In both the 32-bit and 64-bit cases, the limits are chosen so that you cannot
-store a civil date where converting it to a jd would cause an overflow.
-*/
-#if __LP64__
-/* 
-On 64-bit systems, the limits depend on the number of significant digits in
-a double (15).  These are slightly below the maximum so that all numbers used
-in calculations have fewer than 15 digits.
-*/
-#define RHR_JD_MAX 999979466117609
-#define RHR_JD_MIN -999979466119058
-#define RHR_YEAR_MAX 2737850782415
-#define RHR_MONTH_MAX 12
-#define RHR_DAY_MAX 5
-#define RHR_YEAR_MIN -2737850791845
-#define RHR_MONTH_MIN 11
-#define RHR_DAY_MIN 26
-
-#else
-/* 
-On 32-bit systems, the limits depend on the storage limits of 32-bit integers.
-The numbers are slightly less than 2**31 - 1 and slightly greater than -2**31
-so that no calculations can overflow.
-*/
-#define RHR_JD_MAX 2147438064
-#define RHR_JD_MIN -2145083647
-#define RHR_YEAR_MAX 5874773
-#define RHR_MONTH_MAX 8
-#define RHR_DAY_MAX 15
-#define RHR_YEAR_MIN -5877752
-#define RHR_MONTH_MIN 5
-#define RHR_DAY_MIN 8
-#endif
-
-#define RHR_HAVE_JD 1
-#define RHR_HAVE_CIVIL 2
-#define RHR_HAVE_NANOS 4
-#define RHR_HAVE_HMS 8
-
-#define RHR_NANOS_PER_MILLISECOND 1000000LL
-#define RHR_NANOS_PER_SECOND 1000000000LL
-#define RHR_NANOS_PER_MINUTE 60000000000LL
-#define RHR_NANOS_PER_DAY 86400000000000LL
-#define RHR_NANOS_PER_DAYD 86400000000000.0
-#define RHR_NANOS_PER_SECONDD 1000000000.0
-
-#define RHRR_YEAR_SET 0x1
-#define RHRR_MONTH_SET 0x2
-#define RHRR_DAY_SET 0x4
-#define RHRR_YDAY_SET 0x8
-#define RHRR_HOUR_SET 0x10
-#define RHRR_MINUTE_SET 0x20
-#define RHRR_SECOND_SET 0x40
-#define RHRR_WDAY_SET 0x80
-#define RHRR_CENTURY_SET 0x100
-#define RHRR_CWYEAR_SET 0x200
-#define RHRR_CWEEK_SET 0x400
-#define RHRR_CWDAY_SET 0x800
-#define RHRR_SEC_FRACTION_SET 0x1000
-#define RHRR_UNIX_SET 0x2000
-#define RHRR_WNUM0_SET 0x4000
-#define RHRR_WNUM1_SET 0x8000
-#define RHRR_MERIDIAN_SET 0x10000
-#define RHRR_ZONE_SET 0x20000
-#define RHRR_OFFSET_SET 0x40000
-#define RHRR_UNIXM_SET 0x80000
-
-#define RHR_HAS_JD(d) (((d)->flags & RHR_HAVE_JD) == RHR_HAVE_JD)
-#define RHR_HAS_CIVIL(d) (((d)->flags & RHR_HAVE_CIVIL) == RHR_HAVE_CIVIL)
-
-#define RHR_FILL_JD(d) if (((d)->flags & RHR_HAVE_JD) == 0) { rhrd__civil_to_jd(d); }
-#define RHR_FILL_CIVIL(d) if (((d)->flags & RHR_HAVE_CIVIL) == 0) { rhrd__jd_to_civil(d); }
-
-#define RHRDT_FILL_JD(d) if (!((d)->flags & RHR_HAVE_JD)) { rhrdt__civil_to_jd(d); }
-#define RHRDT_FILL_CIVIL(d) if (!((d)->flags & RHR_HAVE_CIVIL)) { rhrdt__jd_to_civil(d); }
-#define RHRDT_FILL_HMS(d) if (!((d)->flags & RHR_HAVE_HMS)) { rhrdt__nanos_to_hms(d); }
-#define RHRDT_FILL_NANOS(d) if (!((d)->flags & RHR_HAVE_NANOS)) { rhrdt__hms_to_nanos(d); }
-
-#ifdef RUBY186
-#define RHR_RETURN_RESIZED_STR(s, len) return rb_str_resize(s, len);
-#else
-#define RHR_RETURN_RESIZED_STR(s, len) rb_str_set_len(s, len); return s;
-#endif
-
-#define RHR_SPACE_SHIP(x, l, r) if (l < r) { x = -1; } else if (l == r) { x = 0; } else { x = 1; } 
-
-#define RHR_CHECK_JD(d) if ((d->jd > RHR_JD_MAX) || (d->jd < RHR_JD_MIN)) { rb_raise(rb_eRangeError, "date out of range: jd = %li", d->jd);}
-#define RHR_CHECK_CIVIL(d) if (!rhrd__valid_civil_limits(d->year, d->month, d->day)) { rb_raise(rb_eRangeError, "date out of range: year = %li, month = %hhi, day = %hhi", d->year, d->month, d->day);}
-
-#define RHR_CACHED_IV(self, iv) VALUE v = rb_ivar_get(self, iv); if (RTEST(v)) {return v;} 
-
-typedef struct rhrd_s {
-  long jd;
-  long year;
-  unsigned char month;
-  unsigned char day;
-  unsigned char flags;
-} rhrd_t;
-
-typedef struct rhrdt_s {
-  long long nanos; /* Nanoseconds since start of day */
-  long jd;
-  long year;
-  short offset; /* Offset from UTC in minutes */
-  unsigned char month;
-  unsigned char day;
-  unsigned char hour;
-  unsigned char minute;
-  unsigned char second;
-  unsigned char flags;
-} rhrdt_t;
+#include <ctype.h>
+#include "date_ext.h"
 
 const unsigned char rhrd_days_in_month[13] = {0, 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31};
 const long rhrd_cumulative_days_in_month[13] = {0, 0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334};
@@ -153,6 +12,7 @@ const char * rhrd__abbr_day_names[7] = {"Sun", "Mon", "Tue", "Wed", "Thu", "Fri"
 const char rhrd__zone_re_str[] = "\\A(?:gmt|utc?)?[-+]\\d+(?:[,.:]\\d+(?::\\d+)?)?|[[:alpha:].\\s]+(?:standard|daylight)\\s+time\\b|[[:alpha:]]+(?:\\s+dst)?\\b";
 const char rhrd__zone_dst_re_str[] = "\\s+(?:(?:(standard)|daylight)\\s+time|dst)\\z";
 const char rhrd__zone_sign_re_str[] = "\\A(?:gmt|utc?)?(?:(-)|\\+)";
+const char rhrd__strptime_num_patterns[] = "CDdeFGgHIjkLlMmNQRrSsTUuVvWwXxYy0123456789";
 
 VALUE rhrd_class;
 VALUE rhrd_s_class;
@@ -191,6 +51,7 @@ ID rhrd_id_offset;
 ID rhrd_id_slice;
 ID rhrd_id_split;
 ID rhrd_id_sub_b;
+ID rhrd_id_to_enum;
 ID rhrd_id_to_i;
 #ifdef RUBY19
 ID rhrd_id_nsec;
@@ -223,6 +84,7 @@ VALUE rhrd_sym_offset;
 VALUE rhrd_sym_sec;
 VALUE rhrd_sym_sec_fraction;
 VALUE rhrd_sym_seconds;
+VALUE rhrd_sym_step;
 VALUE rhrd_sym_wday;
 VALUE rhrd_sym_wnum0;
 VALUE rhrd_sym_wnum1;
@@ -231,15 +93,7 @@ VALUE rhrd_sym_year;
 VALUE rhrd_sym_zone;
 
 static VALUE rhrd_step(int argc, VALUE *argv, VALUE self);
-static VALUE rhrdt_step(int argc, VALUE *argv, VALUE self);
 static VALUE rhrd_to_s(VALUE self);
-static VALUE rhrdt_to_s(VALUE self);
-static VALUE rhrd_s_zone_to_diff(VALUE self, VALUE zone);
-VALUE rhrdt__new_offset(VALUE self, double offset);
-void rhrdt__civil_to_jd(rhrdt_t *d);
-void rhrdt__jd_to_civil(rhrdt_t *date);
-void rhrdt__nanos_to_hms(rhrdt_t *d);
-void rhrdt__hms_to_nanos(rhrdt_t *d);
 
 /* C helper methods */
 
@@ -264,8 +118,8 @@ long rhrd__modll(long long a, long b) {
   return c;
 }
 
-/* Return 0 if the year, month, day provided are greater than
- * the allowed limits, 1 otherwise. */
+/* Return 1 if the year, month, day provided are within
+ * the allowed limits, 0 otherwise. */
 int rhrd__valid_civil_limits(long year, long month, long day) {
   if (year > RHR_YEAR_MAX || year < RHR_YEAR_MIN) {
     return 0;
@@ -365,7 +219,7 @@ int rhrd__leap_year(long year) {
  * fields in the rhrd_t and returning 1 if so.  If the fields
  * given are not a valid date, return 0. 
  * This also handles wrap around if the month or day is negative. */
-int rhrd__valid_civil(rhrd_t *d, long year, long month, long day) {
+int rhrd__valid_civil(rhrd_t *d, long year, long month, long day, int overlimit_raise) {
   if (month < 0 && month >= -12) {
     month += 13;
   }
@@ -397,6 +251,9 @@ int rhrd__valid_civil(rhrd_t *d, long year, long month, long day) {
   }
 
   if(!rhrd__valid_civil_limits(year, month, day)) {
+    if (overlimit_raise == RHR_OVERLIMIT_RAISE) {
+      rb_raise(rb_eRangeError, "date out of range: year = %li, month = %li, day = %li", year, month, day);
+    }
     return 0;
   } 
 
@@ -425,7 +282,7 @@ VALUE rhrd__add_days(VALUE self, long n) {
   VALUE new;
   long x;
   Data_Get_Struct(self, rhrd_t, d);
-  new = Data_Make_Struct(rhrd_class, rhrd_t, NULL, free, newd);
+  new = Data_Make_Struct(rhrd_class, rhrd_t, NULL, -1, newd);
 
   if(!(RHR_HAS_JD(d))) {
     x = rhrd__safe_add_long(n, (long)(d->day));
@@ -456,7 +313,7 @@ VALUE rhrd__add_months(VALUE self, long n) {
   long x;
   Data_Get_Struct(self, rhrd_t, d);
 
-  new = Data_Make_Struct(rhrd_class, rhrd_t, NULL, free, newd);
+  new = Data_Make_Struct(rhrd_class, rhrd_t, NULL, -1, newd);
   RHR_FILL_CIVIL(d)
   n = rhrd__safe_add_long(n, (long)(d->month));
   if(n > 1 && n <= 12) {
@@ -556,7 +413,7 @@ void rhrd__fill_commercial(rhrd_t *d) {
  * and cwday arguments, if the date is valid, and return 1.  If the
  * date is not valid, return 0.  This also handles wrap around if
  * the cweek or cwday arguments is negative. */
-int rhrd__valid_commercial(rhrd_t *d, long cwyear, long cweek, long cwday) {
+int rhrd__valid_commercial(rhrd_t *d, long cwyear, long cweek, long cwday, int overlimit_raise) {
   rhrd_t n;
   memset(&n, 0, sizeof(rhrd_t));
 
@@ -586,6 +443,9 @@ int rhrd__valid_commercial(rhrd_t *d, long cwyear, long cweek, long cwday) {
   }
 
   if ((n.jd > RHR_JD_MAX) || (n.jd < RHR_JD_MIN)) {
+    if (overlimit_raise == RHR_OVERLIMIT_RAISE) {
+      rb_raise(rb_eRangeError, "date out of range");
+    }
     return 0;
   }
 
@@ -608,7 +468,7 @@ long rhrd__ordinal_day(long year, unsigned char month, unsigned char day) {
  * given ordinal day fields, if they are valid.  Returns
  * 1 if the date is valid, 0 if not.  This also handles
  * wrap around for a negative yday argument. */
-int rhrd__valid_ordinal(rhrd_t *d, long year, long yday) {
+int rhrd__valid_ordinal(rhrd_t *d, long year, long yday, int overlimit_raise) {
   int leap;
   long month, day;
 
@@ -636,6 +496,9 @@ int rhrd__valid_ordinal(rhrd_t *d, long year, long yday) {
   }
 
   if(!rhrd__valid_civil_limits(year, month, day)) {
+    if (overlimit_raise == RHR_OVERLIMIT_RAISE) {
+      rb_raise(rb_eRangeError, "date out of range");
+    }
     return 0;
   } 
 
@@ -778,7 +641,7 @@ int rhrd__fill_from_hash(rhrd_t *d, VALUE hash) {
       d->jd = rhrd__yday1_jd(year);
       d->flags |= RHR_HAVE_JD;
       rhrd__fill_commercial(d);
-      if(!rhrd__valid_commercial(d, d->year, 1, NUM2LONG(rwday))) {
+      if(!rhrd__valid_commercial(d, d->year, 1, NUM2LONG(rwday), RHR_NO_RAISE)) {
         return 1;
       }
       d->flags &= ~RHR_HAVE_CIVIL;
@@ -835,15 +698,17 @@ int rhrd__fill_from_hash(rhrd_t *d, VALUE hash) {
   } else {
     return -1;
   }
-  if (yday && rhrd__valid_ordinal(d, year, yday)) {
+
+  if (yday && rhrd__valid_ordinal(d, year, yday, RHR_OVERLIMIT_RAISE)) {
     return 0;
-  } else if (cweek && cwday && rhrd__valid_commercial(d, cwyear, cweek, cwday)) {
+  }
+  if (cweek && cwday && rhrd__valid_commercial(d, cwyear, cweek, cwday, RHR_OVERLIMIT_RAISE)) {
     return 0;
-  } else if (!rhrd__valid_civil(d, year, month, day)) {
-    return 1;
   }
-
-  return 0;
+  if (rhrd__valid_civil(d, year, month, day, RHR_OVERLIMIT_RAISE)) {
+    return 0;
+  }
+  return 1;
 }
 
 /* Returns a new ruby object filled with information from
@@ -851,7 +716,7 @@ int rhrd__fill_from_hash(rhrd_t *d, VALUE hash) {
  * did not contain valid date information. */
 VALUE rhrd__from_hash(VALUE hash) {
   rhrd_t *d;
-  VALUE rd = Data_Make_Struct(rhrd_class, rhrd_t, NULL, free, d);
+  VALUE rd = Data_Make_Struct(rhrd_class, rhrd_t, NULL, -1, d);
   if(rhrd__fill_from_hash(d, hash)) {
     rb_raise(rb_eArgError, "invalid date");
   } else {
@@ -1071,6 +936,7 @@ VALUE rhrd__strptime(VALUE rstr, const char *fmt_str, long fmt_len) {
   long wnum1 = 0;
   long i;
   long fmt_pos;
+  int year_only4 = 0;
   int scan_len;
   VALUE zone = Qnil;
   VALUE hash;
@@ -1180,7 +1046,16 @@ VALUE rhrd__strptime(VALUE rstr, const char *fmt_str, long fmt_len) {
           state |= RHRR_CWYEAR_SET | RHRR_CENTURY_SET;
           break;
         case 'G':
-          if (sscanf(str + pos, "%ld%n", &cwyear, &scan_len) != 1) {
+#define RHR_PARSE_year_only4 year_only4 = 0;\
+          if (fmt_pos + 1 < fmt_len) {\
+            if(isdigit(fmt_str[fmt_pos + 1])) {\
+              year_only4 = 1;\
+            } else if ((fmt_pos + 2 < fmt_len) && (fmt_str[fmt_pos + 1] == '%') && strchr(rhrd__strptime_num_patterns, fmt_str[fmt_pos + 2])) {\
+              year_only4 = 1;\
+            }\
+          }
+          RHR_PARSE_year_only4 
+          if (sscanf(str + pos, year_only4 ? "%4ld%n" : "%ld%n", &cwyear, &scan_len) != 1) {
             return Qnil;
           }
           state |= RHRR_CWYEAR_SET + RHRR_CENTURY_SET;
@@ -1365,10 +1240,11 @@ VALUE rhrd__strptime(VALUE rstr, const char *fmt_str, long fmt_len) {
           RHR_PARSE_y
           break;
         case 'Y':
-#define RHR_PARSE_Y if (sscanf(str + pos, "%ld%n", &year, &scan_len) != 1) {\
+#define RHR_PARSE_Y if (sscanf(str + pos, year_only4 ? "%4ld%n" : "%ld%n", &year, &scan_len) != 1) {\
             return Qnil;\
           }\
           state |= RHRR_YEAR_SET + RHRR_CENTURY_SET;
+          RHR_PARSE_year_only4 
           RHR_PARSE_Y
           break;
         case 'z':
@@ -1402,6 +1278,7 @@ VALUE rhrd__strptime(VALUE rstr, const char *fmt_str, long fmt_len) {
           RHR_PARSE_sep(':')
           RHR_PARSE_S
           RHR_PARSE_sep(' ')
+          RHR_PARSE_year_only4 
           RHR_PARSE_Y
           break;
         case 'x':
@@ -1446,6 +1323,7 @@ VALUE rhrd__strptime(VALUE rstr, const char *fmt_str, long fmt_len) {
           RHR_PARSE_sep('-')
           RHR_PARSE_b
           RHR_PARSE_sep('-')
+          RHR_PARSE_year_only4 
           RHR_PARSE_Y
           break;
         case '+':
@@ -1463,6 +1341,7 @@ VALUE rhrd__strptime(VALUE rstr, const char *fmt_str, long fmt_len) {
           RHR_PARSE_sep(' ')
           RHR_PARSE_Z
           RHR_PARSE_sep(' ')
+          RHR_PARSE_year_only4 
           RHR_PARSE_Y
           break;
         default:
@@ -1569,8 +1448,6 @@ void rhrd__set_cw_ivs(VALUE self, rhrd_t *d) {
   rb_ivar_set(self, rhrd_id_cwday, LONG2NUM(d->day));
 }
 
-#include "date_parser.c"
-
 /* Ruby class methods */
 
 /* call-seq:
@@ -1587,7 +1464,7 @@ static VALUE rhrd_s__load(VALUE klass, VALUE string) {
   rhrd_t * d;
   VALUE jd, rd;
   jd = rb_marshal_load(string);
-  rd = Data_Make_Struct(klass, rhrd_t, NULL, free, d);
+  rd = Data_Make_Struct(klass, rhrd_t, NULL, -1, d);
   d->jd = NUM2LONG(jd);
   RHR_CHECK_JD(d)
   d->flags = RHR_HAVE_JD;
@@ -1648,7 +1525,7 @@ static VALUE rhrd_s_civil(int argc, VALUE *argv, VALUE klass) {
   long year;
   long month = 1;
   long day = 1;
-  VALUE rd = Data_Make_Struct(klass, rhrd_t, NULL, free, d);
+  VALUE rd = Data_Make_Struct(klass, rhrd_t, NULL, -1, d);
 
   switch(argc) {
     case 3:
@@ -1667,8 +1544,7 @@ static VALUE rhrd_s_civil(int argc, VALUE *argv, VALUE klass) {
       break;
   }
 
-  if (!rhrd__valid_civil(d, year, month, day)) {
-    RHR_CHECK_CIVIL(d)
+  if (!rhrd__valid_civil(d, year, month, day, RHR_OVERLIMIT_RAISE)) {
     rb_raise(rb_eArgError, "invalid date (year: %li, month: %li, day: %li)", year, month, day);
   }
   return rd;
@@ -1693,7 +1569,7 @@ static VALUE rhrd_s_commercial(int argc, VALUE *argv, VALUE klass) {
   long cwyear = RHR_DEFAULT_CWYEAR;
   long cweek = RHR_DEFAULT_CWEEK;
   long cwday = RHR_DEFAULT_CWDAY;
-  VALUE rd = Data_Make_Struct(klass, rhrd_t, NULL, free, d);
+  VALUE rd = Data_Make_Struct(klass, rhrd_t, NULL, -1, d);
 
   switch(argc) {
     case 3:
@@ -1717,8 +1593,7 @@ static VALUE rhrd_s_commercial(int argc, VALUE *argv, VALUE klass) {
       break;
   }
 
-  if(!rhrd__valid_commercial(d, cwyear, cweek, cwday)) {
-    RHR_CHECK_JD(d)
+  if(!rhrd__valid_commercial(d, cwyear, cweek, cwday, RHR_OVERLIMIT_RAISE)) {
     rb_raise(rb_eArgError, "invalid date (cwyear: %li, cweek: %li, cwday: %li)", cwyear, cweek, cwday);
   }
   return rd;
@@ -1742,7 +1617,7 @@ static VALUE rhrd_s_gregorian_leap_q(VALUE klass, VALUE year) {
  */
 static VALUE rhrd_s_jd (int argc, VALUE *argv, VALUE klass) {
   rhrd_t *d;
-  VALUE rd = Data_Make_Struct(klass, rhrd_t, NULL, free, d);
+  VALUE rd = Data_Make_Struct(klass, rhrd_t, NULL, -1, d);
 
   switch(argc) {
     case 0:
@@ -1779,7 +1654,7 @@ static VALUE rhrd_s_julian_leap_q(VALUE klass, VALUE y) {
  */
 static VALUE rhrd_s_new_b(int argc, VALUE *argv, VALUE klass) {
   rhrd_t *d;
-  VALUE rd = Data_Make_Struct(klass, rhrd_t, NULL, free, d);
+  VALUE rd = Data_Make_Struct(klass, rhrd_t, NULL, -1, d);
 
   switch(argc) {
     case 0:
@@ -1812,7 +1687,7 @@ static VALUE rhrd_s_ordinal(int argc, VALUE *argv, VALUE klass) {
   long year;
   long day = 1;
   rhrd_t *d;
-  VALUE rd = Data_Make_Struct(klass, rhrd_t, NULL, free, d);
+  VALUE rd = Data_Make_Struct(klass, rhrd_t, NULL, -1, d);
 
   switch(argc) {
     case 2:
@@ -1820,8 +1695,7 @@ static VALUE rhrd_s_ordinal(int argc, VALUE *argv, VALUE klass) {
       day = NUM2LONG(argv[1]);
     case 1:
       year = NUM2LONG(argv[0]);
-      if(!rhrd__valid_ordinal(d, year, day)) {
-        RHR_CHECK_JD(d)
+      if(!rhrd__valid_ordinal(d, year, day, RHR_OVERLIMIT_RAISE)) {
         rb_raise(rb_eArgError, "invalid date (year: %li, yday: %li)", year, day);
       }
       break;
@@ -1854,7 +1728,7 @@ static VALUE rhrd_s_parse(int argc, VALUE *argv, VALUE klass) {
 
   switch(argc) {
     case 0:
-      rd = Data_Make_Struct(klass, rhrd_t, NULL, free, d);
+      rd = Data_Make_Struct(klass, rhrd_t, NULL, -1, d);
       d->flags = RHR_HAVE_JD;
       return rd;
     case 1:
@@ -1885,7 +1759,7 @@ static VALUE rhrd_s_strptime(int argc, VALUE *argv, VALUE klass) {
 
   switch(argc) {
     case 0:
-      rd = Data_Make_Struct(klass, rhrd_t, NULL, free, d);
+      rd = Data_Make_Struct(klass, rhrd_t, NULL, -1, d);
       d->flags = RHR_HAVE_JD;
       return rd;
     case 1:
@@ -1914,7 +1788,7 @@ static VALUE rhrd_s_strptime(int argc, VALUE *argv, VALUE klass) {
  */
 static VALUE rhrd_s_today(int argc, VALUE *argv, VALUE klass) {
   rhrd_t *d;
-  VALUE rd = Data_Make_Struct(klass, rhrd_t, NULL, free, d);
+  VALUE rd = Data_Make_Struct(klass, rhrd_t, NULL, -1, d);
 
   switch(argc) {
     case 0:
@@ -1948,7 +1822,7 @@ static VALUE rhrd_s_valid_civil_q(int argc, VALUE *argv, VALUE klass) {
   switch(argc) {
     case 3:
     case 4:
-      if (!rhrd__valid_civil(&d, NUM2LONG(argv[0]), NUM2LONG(argv[1]), NUM2LONG(argv[2]))) {
+      if (!rhrd__valid_civil(&d, NUM2LONG(argv[0]), NUM2LONG(argv[1]), NUM2LONG(argv[2]), RHR_NO_RAISE)) {
 #ifdef RUBY19
         return Qfalse;
 #else
@@ -1988,7 +1862,7 @@ static VALUE rhrd_s_valid_commercial_q(int argc, VALUE *argv, VALUE klass) {
   switch(argc) {
     case 3:
     case 4:
-      if (!rhrd__valid_commercial(&d, NUM2LONG(argv[0]), NUM2LONG(argv[1]), NUM2LONG(argv[2]))) {
+      if (!rhrd__valid_commercial(&d, NUM2LONG(argv[0]), NUM2LONG(argv[1]), NUM2LONG(argv[2]), RHR_NO_RAISE)) {
 #ifdef RUBY19
         return Qfalse;
 #else
@@ -2052,7 +1926,7 @@ static VALUE rhrd_s_valid_ordinal_q(int argc, VALUE *argv, VALUE klass) {
   switch(argc) {
     case 2:
     case 3:
-      if (!rhrd__valid_ordinal(&d, NUM2LONG(argv[0]), NUM2LONG(argv[1]))) {
+      if (!rhrd__valid_ordinal(&d, NUM2LONG(argv[0]), NUM2LONG(argv[1]), RHR_NO_RAISE)) {
 #ifdef RUBY19
         return Qfalse;
 #else
@@ -2087,7 +1961,7 @@ static VALUE rhrd_s_valid_ordinal_q(int argc, VALUE *argv, VALUE klass) {
  *
  * On ruby 1.9, this method is private.
  */
-static VALUE rhrd_s_zone_to_diff(VALUE klass, VALUE str) {
+VALUE rhrd_s_zone_to_diff(VALUE klass, VALUE str) {
   long offset = 0;
   long len, i, j;
   char *s;
@@ -2125,8 +1999,8 @@ static VALUE rhrd_s_zone_to_diff(VALUE klass, VALUE str) {
       if((s[i] == ',') || (s[i] == '.')) {
         v = rb_funcall(str, rhrd_id_split, 1, rhrd_re_comma_period);
         e = rb_ary_entry(v, 1);
-        return LONG2NUM((NUM2LONG(rb_funcall(rb_ary_entry(v, 0), rhrd_id_to_i, 0)) * RHR_SECONDS_PER_HOUR)
-               + (NUM2LONG(rb_funcall(e, rhrd_id_to_i, 0)) * RHR_SECONDS_PER_HOUR) / (long)pow(10, RSTRING_LEN(rb_str_to_str(e))) * offset);
+        return LONG2NUM(((NUM2LONG(rb_funcall(rb_ary_entry(v, 0), rhrd_id_to_i, 0)) * RHR_SECONDS_PER_HOUR)
+               + ((NUM2LONG(rb_funcall(e, rhrd_id_to_i, 0)) * RHR_SECONDS_PER_HOUR) / (long)pow(10, RSTRING_LEN(rb_str_to_str(e))))) * offset);
       }
     }
     switch (len) {
@@ -2574,24 +2448,33 @@ static VALUE rhrd_step(int argc, VALUE *argv, VALUE self) {
   rhrd_t *d, *n, *newd;
   rhrdt_t *ndt;
   long step, limit, current;
-  VALUE rlimit, new;
+  VALUE rlimit, new, rstep;
   Data_Get_Struct(self, rhrd_t, d);
   RHR_FILL_JD(d)
 
-  rb_need_block();
   switch(argc) {
     case 1:
       step = 1;
+      rstep = LONG2NUM(step);
       break;
     case 2:
-      step = NUM2LONG(argv[1]);
+      rstep = argv[1];
+      step = NUM2LONG(rstep);
       break;
     default:
       rb_raise(rb_eArgError, "wrong number of arguments: %i for 2", argc);
       break;
   }
-
   rlimit = argv[0];
+
+#ifdef RUBY19
+  if (!rb_block_given_p()) {
+    return rb_funcall(self, rhrd_id_to_enum, 3, rhrd_sym_step, rlimit, rstep);
+  }
+#else
+  rb_need_block();
+#endif
+
   if (RTEST(rb_obj_is_kind_of(rlimit, rb_cNumeric))) {
     limit = NUM2LONG(rlimit);
   } else if (RTEST((rb_obj_is_kind_of(rlimit, rhrdt_class)))) {
@@ -2610,7 +2493,7 @@ static VALUE rhrd_step(int argc, VALUE *argv, VALUE self) {
   if (limit > current) {
     if (step > 0) {
       while(limit >= current) {
-        new = Data_Make_Struct(rhrd_class, rhrd_t, NULL, free, newd);
+        new = Data_Make_Struct(rhrd_class, rhrd_t, NULL, -1, newd);
         newd->jd = current;
         RHR_CHECK_JD(newd)
         newd->flags = RHR_HAVE_JD;
@@ -2621,7 +2504,7 @@ static VALUE rhrd_step(int argc, VALUE *argv, VALUE self) {
   } else if (limit < current) {
     if (step < 0) {
       while(limit <= current) {
-        new = Data_Make_Struct(rhrd_class, rhrd_t, NULL, free, newd);
+        new = Data_Make_Struct(rhrd_class, rhrd_t, NULL, -1, newd);
         newd->jd = current;
         RHR_CHECK_JD(newd)
         newd->flags = RHR_HAVE_JD;
@@ -3006,7 +2889,7 @@ VALUE rhrd__add_years(VALUE self, long n) {
   VALUE new;
   Data_Get_Struct(self, rhrd_t, d);
 
-  new = Data_Make_Struct(rhrd_class, rhrd_t, NULL, free, newd);
+  new = Data_Make_Struct(rhrd_class, rhrd_t, NULL, -1, newd);
   RHR_FILL_CIVIL(d)
   newd->year = rhrd__safe_add_long(n, d->year);
   newd->month = d->month;
@@ -3054,7 +2937,7 @@ static VALUE rhrd_s_httpdate(int argc, VALUE *argv, VALUE klass) {
 
   switch(argc) {
     case 0:
-      rd = Data_Make_Struct(klass, rhrd_t, NULL, free, d);
+      rd = Data_Make_Struct(klass, rhrd_t, NULL, -1, d);
       d->flags = RHR_HAVE_JD;
       return rd;
     case 1:
@@ -3088,7 +2971,7 @@ static VALUE rhrd_s_iso8601(int argc, VALUE *argv, VALUE klass) {
 
   switch(argc) {
     case 0:
-      rd = Data_Make_Struct(klass, rhrd_t, NULL, free, d);
+      rd = Data_Make_Struct(klass, rhrd_t, NULL, -1, d);
       d->flags = RHR_HAVE_JD;
       return rd;
     case 1:
@@ -3122,7 +3005,7 @@ static VALUE rhrd_s_jisx0301(int argc, VALUE *argv, VALUE klass) {
 
   switch(argc) {
     case 0:
-      rd = Data_Make_Struct(klass, rhrd_t, NULL, free, d);
+      rd = Data_Make_Struct(klass, rhrd_t, NULL, -1, d);
       d->flags = RHR_HAVE_JD;
       return rd;
     case 1:
@@ -3156,7 +3039,7 @@ static VALUE rhrd_s_rfc2822(int argc, VALUE *argv, VALUE klass) {
 
   switch(argc) {
     case 0:
-      rd = Data_Make_Struct(klass, rhrd_t, NULL, free, d);
+      rd = Data_Make_Struct(klass, rhrd_t, NULL, -1, d);
       d->flags = RHR_HAVE_JD;
       return rd;
     case 1:
@@ -3190,7 +3073,7 @@ static VALUE rhrd_s_rfc3339(int argc, VALUE *argv, VALUE klass) {
 
   switch(argc) {
     case 0:
-      rd = Data_Make_Struct(klass, rhrd_t, NULL, free, d);
+      rd = Data_Make_Struct(klass, rhrd_t, NULL, -1, d);
       d->flags = RHR_HAVE_JD;
       return rd;
     case 1:
@@ -3224,7 +3107,7 @@ static VALUE rhrd_s_xmlschema(int argc, VALUE *argv, VALUE klass) {
 
   switch(argc) {
     case 0:
-      rd = Data_Make_Struct(klass, rhrd_t, NULL, free, d);
+      rd = Data_Make_Struct(klass, rhrd_t, NULL, -1, d);
       d->flags = RHR_HAVE_JD;
       return rd;
     case 1:
@@ -3560,7 +3443,7 @@ static VALUE rhrd_rfc3339(VALUE self) {
 static VALUE rhrd_to_datetime(VALUE self) {
   rhrd_t *d;
   rhrdt_t *dt;
-  VALUE rdt = Data_Make_Struct(rhrdt_class, rhrdt_t, NULL, free, dt);
+  VALUE rdt = Data_Make_Struct(rhrdt_class, rhrdt_t, NULL, -1, dt);
   Data_Get_Struct(self, rhrd_t, d);
 
   if (RHR_HAS_CIVIL(d)) {
@@ -3607,7 +3490,7 @@ static VALUE rhrd_to_time(VALUE self) {
 static VALUE rhrd_time_to_date(VALUE self) {
   rhrd_t *d;
   VALUE rd;
-  rd = Data_Make_Struct(rhrd_class, rhrd_t, NULL, free, d);
+  rd = Data_Make_Struct(rhrd_class, rhrd_t, NULL, -1, d);
   d->jd = rhrd__unix_to_jd(NUM2LONG(rb_funcall(self, rhrd_id_to_i, 0)) + NUM2LONG(rb_funcall(self, rhrd_id_utc_offset, 0)));
   d->flags = RHR_HAVE_JD;
   RHR_CHECK_JD(d)
@@ -4059,8 +3942,6 @@ static VALUE rhrd_s_valid_time_q(VALUE klass, VALUE rh, VALUE rm, VALUE rs) {
 
 #endif
 
-#include "datetime.c"
-
 /* Ruby Library Initialization */
 
 /* +Date+ is used to store a single date in the gregorian calendar.
@@ -4096,6 +3977,7 @@ void Init_date_ext(void) {
   rhrd_id_slice = rb_intern("slice");
   rhrd_id_split = rb_intern("split");
   rhrd_id_sub_b = rb_intern("sub!");
+  rhrd_id_to_enum = rb_intern("to_enum");
   rhrd_id_to_i = rb_intern("to_i");
 #ifdef RUBY19
   rhrd_id_nsec = rb_intern("nsec");
@@ -4128,6 +4010,7 @@ void Init_date_ext(void) {
   rhrd_sym_sec = ID2SYM(rb_intern("sec"));
   rhrd_sym_sec_fraction = ID2SYM(rb_intern("sec_fraction"));
   rhrd_sym_seconds = ID2SYM(rb_intern("seconds"));
+  rhrd_sym_step = ID2SYM(rb_intern("step"));
   rhrd_sym_wday = ID2SYM(rb_intern("wday"));
   rhrd_sym_wnum0 = ID2SYM(rb_intern("wnum0"));
   rhrd_sym_wnum1 = ID2SYM(rb_intern("wnum1"));
@@ -4135,6 +4018,10 @@ void Init_date_ext(void) {
   rhrd_sym_year = ID2SYM(rb_intern("year"));
   rhrd_sym_zone = ID2SYM(rb_intern("zone"));
 
+#ifdef RHR_ENCODING
+  rhrd_encoding_index = rb_enc_to_index(rb_usascii_encoding());
+#endif
+
   /* Define classes*/
 
   rhrd_class = rb_define_class("Date", rb_cObject);