diff options
Diffstat (limited to 'ext/date')
| -rw-r--r-- | ext/date/date_core.c | 296 | ||||
| -rw-r--r-- | ext/date/lib/date.rb | 116 |
2 files changed, 248 insertions, 164 deletions
diff --git a/ext/date/date_core.c b/ext/date/date_core.c index 96e8c5455a..6c435a869f 100644 --- a/ext/date/date_core.c +++ b/ext/date/date_core.c @@ -36,6 +36,9 @@ #define LIGHTABLE_CWYEAR(y) LIGHTABLE_YEAR(y) #define ITALY 2299161 +#define ENGLAND 2361222 +#define JULIAN (NUM2DBL(rb_const_get(rb_cFloat, rb_intern("INFINITY")))) +#define GREGORIAN (-NUM2DBL(rb_const_get(rb_cFloat, rb_intern("INFINITY")))) #define DAY_IN_SECONDS 86400 #define SECOND_IN_NANOSECONDS 1000000000 @@ -785,151 +788,263 @@ k_numeric_p(VALUE x) } static VALUE +valid_jd_sub(int argc, VALUE *argv, VALUE klass) +{ + return argv[0]; +} + +#ifndef NDEBUG +static VALUE +date_s__valid_jd_p(int argc, VALUE *argv, VALUE klass) +{ + VALUE vjd, vsg; + VALUE argv2[2]; + + rb_scan_args(argc, argv, "11", &vjd, &vsg); + + argv2[0] = vjd; + if (argc < 2) + argv[1] = DBL2NUM(GREGORIAN); + else + argv[1] = vsg; + + return valid_jd_sub(2, argv2, klass); +} +#endif + +static VALUE date_s_valid_jd_p(int argc, VALUE *argv, VALUE klass) { VALUE vjd, vsg; + VALUE argv2[2]; rb_scan_args(argc, argv, "11", &vjd, &vsg); + argv2[0] = vjd; + if (argc < 2) + argv[1] = INT2FIX(ITALY); + else + argv[1] = vsg; + + if (NIL_P(valid_jd_sub(2, argv2, klass))) + return Qfalse; return Qtrue; } static VALUE -date_s_valid_civil_p(int argc, VALUE *argv, VALUE klass) +valid_civil_sub(int argc, VALUE *argv, VALUE klass, int need_jd) { - VALUE vy, vm, vd, vsg; int y, m, d, rm, rd; double sg; - rb_scan_args(argc, argv, "31", &vy, &vm, &vd, &vsg); - - if (!(FIXNUM_P(vy) && - FIXNUM_P(vm) && - FIXNUM_P(vd))) - return cforwardv("valid_civil_r?"); + if (!(FIXNUM_P(argv[0]) && + FIXNUM_P(argv[1]) && + FIXNUM_P(argv[2]))) + return cforwardv("_valid_civil_r?"); - if (!NIL_P(vsg)) - sg = NUM2DBL(vsg); - else - sg = ITALY; - - y = -4712; - m = 1; - d = 1; + y = NUM2INT(argv[0]); + if (!LIGHTABLE_YEAR(y)) + return cforwardv("_valid_civil_r?"); - switch (argc) { - case 4: - case 3: - d = NUM2INT(vd); - case 2: - m = NUM2INT(vm); - case 1: - y = NUM2INT(vy); - if (!LIGHTABLE_YEAR(y)) - return cforwardv("valid_civil_r?"); - } + m = NUM2INT(argv[1]); + d = NUM2INT(argv[2]); + sg = NUM2DBL(argv[3]); - if (isinf(sg) && sg < 0) { + if (!need_jd && isinf(sg) && sg < 0) { if (!valid_gregorian_p(y, m, d, &rm, &rd)) - return Qfalse; - return Qtrue; + return Qnil; + return INT2FIX(0); /* dummy */ } else { long jd; int ns; if (!valid_civil_p(y, m, d, sg, &rm, &rd, &jd, &ns)) - return Qfalse; - return Qtrue; + return Qnil; + return LONG2NUM(jd); } } +#ifndef NDEBUG static VALUE -date_s_valid_ordinal_p(int argc, VALUE *argv, VALUE klass) +date_s__valid_civil_p(int argc, VALUE *argv, VALUE klass) { - VALUE vy, vd, vsg; - int y, d, rd; - double sg; + VALUE vy, vm, vd, vsg; + VALUE argv2[4]; - rb_scan_args(argc, argv, "21", &vy, &vd, &vsg); + rb_scan_args(argc, argv, "31", &vy, &vm, &vd, &vsg); - if (!(FIXNUM_P(vy) && - FIXNUM_P(vd))) - return cforwardv("valid_ordinal_r?"); + argv2[0] = vy; + argv2[1] = vm; + argv2[2] = vd; + if (argc < 4) + argv2[3] = DBL2NUM(GREGORIAN); + else + argv2[3] = vsg; - if (!NIL_P(vsg)) - sg = NUM2DBL(vsg); + return valid_civil_sub(4, argv2, klass, 1); +} +#endif + +static VALUE +date_s_valid_civil_p(int argc, VALUE *argv, VALUE klass) +{ + VALUE vy, vm, vd, vsg; + VALUE argv2[4]; + + rb_scan_args(argc, argv, "31", &vy, &vm, &vd, &vsg); + + argv2[0] = vy; + argv2[1] = vm; + argv2[2] = vd; + if (argc < 4) + argv2[3] = INT2FIX(ITALY); else - sg = ITALY; + argv2[3] = vsg; - y = -4712; - d = 1; + if (NIL_P(valid_civil_sub(4, argv2, klass, 0))) + return Qfalse; + return Qtrue; +} - switch (argc) { - case 3: - case 2: - d = NUM2INT(vd); - case 1: - y = NUM2INT(vy); - if (!LIGHTABLE_YEAR(y)) - return cforwardv("valid_ordinal_r?"); - } +static VALUE +valid_ordinal_sub(int argc, VALUE *argv, VALUE klass) +{ + int y, d, rd; + double sg; + + if (!(FIXNUM_P(argv[0]) && + FIXNUM_P(argv[1]))) + return cforwardv("_valid_ordinal_r?"); + + y = NUM2INT(argv[0]); + if (!LIGHTABLE_YEAR(y)) + return cforwardv("_valid_ordinal_r?"); + + d = NUM2INT(argv[1]); + sg = NUM2DBL(argv[2]); { long jd; int ns; if (!valid_ordinal_p(y, d, sg, &rd, &jd, &ns)) - return Qfalse; - return Qtrue; + return Qnil; + return LONG2NUM(jd); } } +#ifndef NDEBUG static VALUE -date_s_valid_commercial_p(int argc, VALUE *argv, VALUE klass) +date_s__valid_ordinal_p(int argc, VALUE *argv, VALUE klass) { - VALUE vy, vw, vd, vsg; - int y, w, d, rw, rd; - double sg; + VALUE vy, vd, vsg; + VALUE argv2[3]; - rb_scan_args(argc, argv, "31", &vy, &vw, &vd, &vsg); + rb_scan_args(argc, argv, "21", &vy, &vd, &vsg); - if (!(FIXNUM_P(vy) && - FIXNUM_P(vw) && - FIXNUM_P(vd))) - return cforwardv("valid_commercial_r?"); + argv2[0] = vy; + argv2[1] = vd; + if (argc < 3) + argv2[2] = DBL2NUM(GREGORIAN); + else + argv2[2] = vsg; - if (!NIL_P(vsg)) - sg = NUM2DBL(vsg); + return valid_ordinal_sub(3, argv2, klass); +} +#endif + +static VALUE +date_s_valid_ordinal_p(int argc, VALUE *argv, VALUE klass) +{ + VALUE vy, vd, vsg; + VALUE argv2[3]; + + rb_scan_args(argc, argv, "21", &vy, &vd, &vsg); + + argv2[0] = vy; + argv2[1] = vd; + if (argc < 3) + argv2[2] = INT2FIX(ITALY); else - sg = ITALY; + argv2[2] = vsg; - y = -4712; - w = 1; - d = 1; + if (NIL_P(valid_ordinal_sub(3, argv2, klass))) + return Qfalse; + return Qtrue; +} - switch (argc) { - case 4: - case 3: - d = NUM2INT(vd); - case 2: - w = NUM2INT(vw); - case 1: - y = NUM2INT(vy); - if (!LIGHTABLE_CWYEAR(y)) - return cforwardv("valid_commercial_r?"); - } +static VALUE +valid_commercial_sub(int argc, VALUE *argv, VALUE klass) +{ + int y, w, d, rw, rd; + double sg; + + if (!(FIXNUM_P(argv[0]) && + FIXNUM_P(argv[1]) && + FIXNUM_P(argv[2]))) + return cforwardv("_valid_commercial_r?"); + + y = NUM2INT(argv[0]); + if (!LIGHTABLE_CWYEAR(y)) + return cforwardv("_valid_commercial_r?"); + + w = NUM2INT(argv[1]); + d = NUM2INT(argv[2]); + sg = NUM2DBL(argv[3]); { long jd; int ns; if (!valid_commercial_p(y, w, d, sg, &rw, &rd, &jd, &ns)) - return Qfalse; - return Qtrue; + return Qnil; + return LONG2NUM(jd); } } +#ifndef NDEBUG +static VALUE +date_s__valid_commercial_p(int argc, VALUE *argv, VALUE klass) +{ + VALUE vy, vw, vd, vsg; + VALUE argv2[4]; + + rb_scan_args(argc, argv, "31", &vy, &vw, &vd, &vsg); + + argv2[0] = vy; + argv2[1] = vw; + argv2[2] = vd; + if (argc < 4) + argv2[3] = DBL2NUM(GREGORIAN); + else + argv2[3] = vsg; + + return valid_commercial_sub(4, argv2, klass); +} +#endif + +static VALUE +date_s_valid_commercial_p(int argc, VALUE *argv, VALUE klass) +{ + VALUE vy, vw, vd, vsg; + VALUE argv2[4]; + + rb_scan_args(argc, argv, "31", &vy, &vw, &vd, &vsg); + + argv2[0] = vy; + argv2[1] = vw; + argv2[2] = vd; + if (argc < 4) + argv2[3] = INT2FIX(ITALY); + else + argv2[3] = vsg; + + if (NIL_P(valid_commercial_sub(4, argv2, klass))) + return Qfalse; + return Qtrue; +} + static void d_right_gc_mark(union DateData *dat) { @@ -4482,7 +4597,18 @@ Init_date_core(void) rb_define_alloc_func(cDate, d_lite_s_alloc); rb_define_singleton_method(cDate, "new_r!", date_s_new_r_bang, -1); rb_define_singleton_method(cDate, "new_l!", date_s_new_l_bang, -1); - +#ifndef NDEBUG + rb_define_private_method(CLASS_OF(cDate), "_valid_jd?", + date_s__valid_jd_p, -1); + rb_define_private_method(CLASS_OF(cDate), "_valid_ordinal?", + date_s__valid_ordinal_p, -1); + rb_define_private_method(CLASS_OF(cDate), "_valid_civil?", + date_s__valid_civil_p, -1); + rb_define_private_method(CLASS_OF(cDate), "_valid_date?", + date_s__valid_civil_p, -1); + rb_define_private_method(CLASS_OF(cDate), "_valid_commercial?", + date_s__valid_commercial_p, -1); +#endif rb_define_singleton_method(cDate, "valid_jd?", date_s_valid_jd_p, -1); rb_define_singleton_method(cDate, "valid_ordinal?", date_s_valid_ordinal_p, -1); diff --git a/ext/date/lib/date.rb b/ext/date/lib/date.rb index ed24532d51..c6448017f7 100644 --- a/ext/date/lib/date.rb +++ b/ext/date/lib/date.rb @@ -325,7 +325,7 @@ class Date def find_fdoy(y, sg) # :nodoc: j = nil 1.upto(31) do |d| - break if j = _valid_civil?(y, 1, d, sg) + break if j = _valid_civil_r?(y, 1, d, sg) end j end @@ -333,7 +333,7 @@ class Date def find_ldoy(y, sg) # :nodoc: j = nil 31.downto(1) do |d| - break if j = _valid_civil?(y, 12, d, sg) + break if j = _valid_civil_r?(y, 12, d, sg) end j end @@ -341,7 +341,7 @@ class Date def find_fdom(y, m, sg) # :nodoc: j = nil 1.upto(31) do |d| - break if j = _valid_civil?(y, m, d, sg) + break if j = _valid_civil_r?(y, m, d, sg) end j end @@ -349,7 +349,7 @@ class Date def find_ldom(y, m, sg) # :nodoc: j = nil 31.downto(1) do |d| - break if j = _valid_civil?(y, m, d, sg) + break if j = _valid_civil_r?(y, m, d, sg) end j end @@ -576,7 +576,7 @@ class Date # # If it is, returns it. In fact, any value is treated as a valid # Julian Day Number. - def _valid_jd? (jd, sg=GREGORIAN) jd end # :nodoc: + def _valid_jd_r? (jd, sg=GREGORIAN) jd end # :nodoc: # Do the year +y+ and day-of-year +d+ make a valid Ordinal Date? # Returns the corresponding Julian Day Number if they do, or @@ -591,7 +591,7 @@ class Date # adjustment is not valid. # # +sg+ specifies the Day of Calendar Reform. - def _valid_ordinal? (y, d, sg=GREGORIAN) # :nodoc: + def _valid_ordinal_r? (y, d, sg=GREGORIAN) # :nodoc: if d < 0 return unless j = find_ldoy(y, sg) ny, nd = jd_to_ordinal(j + d + 1, sg) @@ -615,7 +615,7 @@ class Date # Reform adjustment is not valid. # # +sg+ specifies the Day of Calendar Reform. - def _valid_civil? (y, m, d, sg=GREGORIAN) # :nodoc: + def _valid_civil_r? (y, m, d, sg=GREGORIAN) # :nodoc: if m < 0 m += 13 end @@ -644,7 +644,7 @@ class Date # Reform adjustment is not valid. # # +sg+ specifies the Day of Calendar Reform. - def _valid_commercial? (y, w, d, sg=GREGORIAN) # :nodoc: + def _valid_commercial_r? (y, w, d, sg=GREGORIAN) # :nodoc: if d < 0 d += 8 end @@ -659,7 +659,7 @@ class Date jd end - def _valid_weeknum? (y, w, d, f, sg=GREGORIAN) # :nodoc: + def _valid_weeknum_r? (y, w, d, f, sg=GREGORIAN) # :nodoc: if d < 0 d += 7 end @@ -674,7 +674,7 @@ class Date jd end - def _valid_nth_kday? (y, m, n, k, sg=GREGORIAN) # :nodoc: + def _valid_nth_kday_r? (y, m, n, k, sg=GREGORIAN) # :nodoc: if k < 0 k += 7 end @@ -700,7 +700,7 @@ class Date # +sec+ are treating as counting backwards from the end of the # next larger unit (e.g. a +min+ of -2 is treated as 58). No # wraparound is performed. - def _valid_time? (h, min, s) # :nodoc: + def _valid_time_r? (h, min, s) # :nodoc: h += 24 if h < 0 min += 60 if min < 0 s += 60 if s < 0 @@ -731,48 +731,6 @@ class Date class << self; alias_method :leap?, :gregorian_leap? end - def self.valid_jd_r? (jd, sg=ITALY) - !!_valid_jd?(jd, sg) - end - - private_class_method :valid_jd_r? - - def self.valid_ordinal_r? (y, d, sg=ITALY) - !!_valid_ordinal?(y, d, sg) - end - - private_class_method :valid_ordinal_r? - - def self.valid_civil_r? (y, m, d, sg=ITALY) - !!_valid_civil?(y, m, d, sg) - end - - private_class_method :valid_civil_r? - - def self.valid_commercial_r? (y, w, d, sg=ITALY) - !!_valid_commercial?(y, w, d, sg) - end - - private_class_method :valid_commercial_r? - - def self.valid_weeknum? (y, w, d, f, sg=ITALY) # :nodoc: - !!_valid_weeknum?(y, w, d, f, sg) - end - - private_class_method :valid_weeknum? - - def self.valid_nth_kday? (y, m, n, k, sg=ITALY) # :nodoc: - !!_valid_nth_kday?(y, m, n, k, sg) - end - - private_class_method :valid_nth_kday? - - def self.valid_time? (h, min, s) # :nodoc: - !!_valid_time?(h, min, s) - end - - private_class_method :valid_time? - def self.new!(ajd=0, of=0, sg=ITALY) jd, df = ajd_to_jd(ajd, 0) if !(Fixnum === jd) || @@ -784,14 +742,14 @@ class Date end def self.jd_r(jd=0, sg=ITALY) # :nodoc: - jd = _valid_jd?(jd, sg) + jd = _valid_jd_r?(jd, sg) new_r!(jd_to_ajd(jd, 0, 0), 0, sg) end private_class_method :jd_r def self.ordinal_r(y=-4712, d=1, sg=ITALY) # :nodoc: - unless jd = _valid_ordinal?(y, d, sg) + unless jd = _valid_ordinal_r?(y, d, sg) raise ArgumentError, 'invalid date' end new_r!(jd_to_ajd(jd, 0, 0), 0, sg) @@ -800,7 +758,7 @@ class Date private_class_method :ordinal_r def self.civil_r(y=-4712, m=1, d=1, sg=ITALY) # :nodoc: - unless jd = _valid_civil?(y, m, d, sg) + unless jd = _valid_civil_r?(y, m, d, sg) raise ArgumentError, 'invalid date' end new_r!(jd_to_ajd(jd, 0, 0), 0, sg) @@ -809,7 +767,7 @@ class Date private_class_method :civil_r def self.commercial_r(y=-4712, w=1, d=1, sg=ITALY) # :nodoc: - unless jd = _valid_commercial?(y, w, d, sg) + unless jd = _valid_commercial_r?(y, w, d, sg) raise ArgumentError, 'invalid date' end new_r!(jd_to_ajd(jd, 0, 0), 0, sg) @@ -818,7 +776,7 @@ class Date private_class_method :commercial_r def self.weeknum(y=-4712, w=0, d=1, f=0, sg=ITALY) - unless jd = _valid_weeknum?(y, w, d, f, sg) + unless jd = _valid_weeknum_r?(y, w, d, f, sg) raise ArgumentError, 'invalid date' end new!(jd_to_ajd(jd, 0, 0), 0, sg) @@ -827,7 +785,7 @@ class Date private_class_method :weeknum def self.nth_kday(y=-4712, m=1, n=1, k=1, sg=ITALY) - unless jd = _valid_nth_kday?(y, m, n, k, sg) + unless jd = _valid_nth_kday_r?(y, m, n, k, sg) raise ArgumentError, 'invalid date' end new!(jd_to_ajd(jd, 0, 0), 0, sg) @@ -935,21 +893,21 @@ class Date catch :jd do a = elem.values_at(:jd) if a.all? - if jd = _valid_jd?(*(a << sg)) + if jd = _valid_jd_r?(*(a << sg)) throw :jd, jd end end a = elem.values_at(:year, :yday) if a.all? - if jd = _valid_ordinal?(*(a << sg)) + if jd = _valid_ordinal_r?(*(a << sg)) throw :jd, jd end end a = elem.values_at(:year, :mon, :mday) if a.all? - if jd = _valid_civil?(*(a << sg)) + if jd = _valid_civil_r?(*(a << sg)) throw :jd, jd end end @@ -959,7 +917,7 @@ class Date a[2] = elem[:wday].nonzero? || 7 end if a.all? - if jd = _valid_commercial?(*(a << sg)) + if jd = _valid_commercial_r?(*(a << sg)) throw :jd, jd end end @@ -969,7 +927,7 @@ class Date a[2] = elem[:cwday] % 7 end if a.all? - if jd = _valid_weeknum?(*(a << 0 << sg)) + if jd = _valid_weeknum_r?(*(a << 0 << sg)) throw :jd, jd end end @@ -982,7 +940,7 @@ class Date a[2] = (elem[:cwday] - 1) % 7 end if a.all? - if jd = _valid_weeknum?(*(a << 1 << sg)) + if jd = _valid_weeknum_r?(*(a << 1 << sg)) throw :jd, jd end end @@ -993,7 +951,7 @@ class Date def self.valid_time_frags? (elem) # :nodoc: h, min, s = elem.values_at(:hour, :min, :sec) - _valid_time?(h, min, s) + _valid_time_r?(h, min, s) end private_class_method :valid_time_frags? @@ -1323,7 +1281,7 @@ class Date y, m = (year * 12 + (mon - 1) + n).divmod(12) m, = (m + 1) .divmod(1) d = mday - until jd2 = _valid_civil?(y, m, d, start) + until jd2 = _valid_civil_r?(y, m, d, start) d -= 1 raise ArgumentError, 'invalid date' unless d > 0 end @@ -1464,8 +1422,8 @@ class DateTime < Date end def self.jd_r(jd=0, h=0, min=0, s=0, of=0, sg=ITALY) # :nodoc: - unless (jd = _valid_jd?(jd, sg)) && - (fr = _valid_time?(h, min, s)) + unless (jd = _valid_jd_r?(jd, sg)) && + (fr = _valid_time_r?(h, min, s)) raise ArgumentError, 'invalid date' end if String === of @@ -1479,8 +1437,8 @@ class DateTime < Date private_class_method :jd_r def self.ordinal_r(y=-4712, d=1, h=0, min=0, s=0, of=0, sg=ITALY) # :nodoc: - unless (jd = _valid_ordinal?(y, d, sg)) && - (fr = _valid_time?(h, min, s)) + unless (jd = _valid_ordinal_r?(y, d, sg)) && + (fr = _valid_time_r?(h, min, s)) raise ArgumentError, 'invalid date' end if String === of @@ -1494,8 +1452,8 @@ class DateTime < Date private_class_method :ordinal_r def self.civil_r(y=-4712, m=1, d=1, h=0, min=0, s=0, of=0, sg=ITALY) # :nodoc: - unless (jd = _valid_civil?(y, m, d, sg)) && - (fr = _valid_time?(h, min, s)) + unless (jd = _valid_civil_r?(y, m, d, sg)) && + (fr = _valid_time_r?(h, min, s)) raise ArgumentError, 'invalid date' end if String === of @@ -1509,8 +1467,8 @@ class DateTime < Date private_class_method :civil_r def self.commercial_r(y=-4712, w=1, d=1, h=0, min=0, s=0, of=0, sg=ITALY) # :nodoc: - unless (jd = _valid_commercial?(y, w, d, sg)) && - (fr = _valid_time?(h, min, s)) + unless (jd = _valid_commercial_r?(y, w, d, sg)) && + (fr = _valid_time_r?(h, min, s)) raise ArgumentError, 'invalid date' end if String === of @@ -1524,8 +1482,8 @@ class DateTime < Date private_class_method :commercial_r def self.weeknum(y=-4712, w=0, d=1, f=0, h=0, min=0, s=0, of=0, sg=ITALY) # :nodoc: - unless (jd = _valid_weeknum?(y, w, d, f, sg)) && - (fr = _valid_time?(h, min, s)) + unless (jd = _valid_weeknum_r?(y, w, d, f, sg)) && + (fr = _valid_time_r?(h, min, s)) raise ArgumentError, 'invalid date' end if String === of @@ -1539,8 +1497,8 @@ class DateTime < Date private_class_method :weeknum def self.nth_kday(y=-4712, m=1, n=1, k=1, h=0, min=0, s=0, of=0, sg=ITALY) # :nodoc: - unless (jd = _valid_nth_kday?(y, m, n, k, sg)) && - (fr = _valid_time?(h, min, s)) + unless (jd = _valid_nth_kday_r?(y, m, n, k, sg)) && + (fr = _valid_time_r?(h, min, s)) raise ArgumentError, 'invalid date' end if String === of |