@@ -7,6 +7,7 @@ #include <math.h> #include <ruby.h> +#include <time.h> #define FLOOR(a) lrintf(floorf(a)) #define FLOAT(a) (float)a @@ -187,18 +188,37 @@ rb_date_new(int argc, VALUE * argv, VALUE self) { m = (argc > 1 ? NUM2INT(argv[1]) : 1), d = (argc > 2 ? NUM2INT(argv[2]) : 1); VALUE sg = (argc > 3 ? argv[3] : ITALY); - int jd = civil_to_jd(y, m, d, sg); + int jd = -1; struct mini_tm t; - jd_to_civil(jd, sg, &t); - if ( t.y != y || t.m != m || t.d != d ) { - rb_raise(rb_eArgError, "Invalid date: (%d, %d, %d)", y, m, d); - return Qnil; - }else{ - VALUE ajd = jd_to_ajd(jd, INT2FIX(0), INT2FIX(0)); - VALUE date = rb_funcall(self, id_new_bang, 3, ajd, INT2FIX(0), sg); - rb_ivar_set(date, id_ivar_civil, rb_ary_new3(3, INT2FIX(t.y), INT2FIX(t.m), INT2FIX(t.d))); - return date; + if (d < 0) { + int ny = (y * 12 + m) / 12; + int nm = (y * 12 + m) % 12; + nm = (nm + 1) / 1; + jd = civil_to_jd(ny, nm, d+1, sg); + + VALUE ns = jd < 2299161 ? JULIAN : GREGORIAN; + jd_to_civil(jd-d, ns, &t); + if ( t.y != ny || t.m != nm || t.d != 1 ) { + rb_raise(rb_eArgError, "Invalid date: (%d, %d, %d)", y, m, d); + return Qnil; + } + jd_to_civil(jd, sg, &t); + if ( t.y != y || t.m != m ) { + rb_raise(rb_eArgError, "Invalid date: (%d, %d, %d)", y, m, d); + return Qnil; + } + } else { + jd = civil_to_jd(y, m, d, sg); + jd_to_civil(jd, sg, &t); + if ( t.y != y || t.m != m || t.d != d ) { + rb_raise(rb_eArgError, "Invalid date: (%d, %d, %d)", y, m, d); + return Qnil; + } } + VALUE ajd = jd_to_ajd(jd, INT2FIX(0), INT2FIX(0)); + VALUE date = rb_funcall(self, id_new_bang, 3, ajd, INT2FIX(0), sg); + rb_ivar_set(date, id_ivar_civil, rb_ary_new3(3, INT2FIX(t.y), INT2FIX(t.m), INT2FIX(t.d))); + return date; } ext/date_performance.c @@ -96,4 +96,25 @@ class ExtensionTest < Test::Unit::TestCase assert_equal "2007-01-01T04:20:00+00:00", dt.strftime("%FT%T%:z") end + def test_constructor_with_negative_days + #leap year + month_ends = [31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31] + (1..12).each do |m| + d = Date.new(2008, m, -1) + assert_equal d.day, month_ends[m-1] + end + #normal year + month_ends = [31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31] + (1..12).each do |m| + d = Date.new(2009, m, -1) + assert_equal d.day, month_ends[m-1] + end + #before calendar reform for Italy + month_ends = [31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31] + (1..12).each do |m| + d = Date.new(1581, m, -1) + assert_equal d.day, month_ends[m-1] + end + end + end test/extension_test.rb 4872381152285ac388b9a0ed32b7252090d6402f Alexander Dymo gremlin@venus.site http://github.com/rtomayko/date-performance/commit/8203c325cf47516b275daab0a6770005f1248a05 8203c325cf47516b275daab0a6770005f1248a05 2008-07-12T08:06:49-07:00 2008-07-12T08:05:25-07:00 Implemented support for negative number of days as constructor arguments. For example, Date.civil(2008, 7, -1) will construct "2008-7-31" date. f7b389192f4eb74de9891d93cc6bd16951ab56e8 Ryan Tomayko rtomayko@gmail.com