1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* lib/test/unit/parallel.rb: remove unused variable.

Browse Source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@31142 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
naruse 2011-03-21 21:42:23 +00:00
parent 78df33a0c1
commit c85be42589
3 changed files with 47 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,7 @@
Tue Mar 22 06:41:37 2011 NARUSE, Yui <naruse@ruby-lang.org>
* lib/test/unit/parallel.rb: remove unused variable.
Tue Mar 22 06:19:42 2011 NARUSE, Yui <naruse@ruby-lang.org> Tue Mar 22 06:19:42 2011 NARUSE, Yui <naruse@ruby-lang.org>
* enc/utf_16le.c: surpress warning: shorten-64-to-32. * enc/utf_16le.c: surpress warning: shorten-64-to-32.
@ -8,7 +12,6 @@ Tue Mar 22 06:19:42 2011 NARUSE, Yui <naruse@ruby-lang.org>
* parse.y (Init_ripper): surpress warning: unused value. * parse.y (Init_ripper): surpress warning: unused value.
Mon Mar 21 11:21:32 2011 Shota Fukumori <sorah@tubusu.net> Mon Mar 21 11:21:32 2011 Shota Fukumori <sorah@tubusu.net>
* lib/test/unit.rb: Refactoring. Unified if and elsif. * lib/test/unit.rb: Refactoring. Unified if and elsif.

84
ext/date/date_core.c
View File

@ -42,10 +42,10 @@
#define DAY_IN_NANOSECONDS 86400000000000LL #define DAY_IN_NANOSECONDS 86400000000000LL
/* copied from time.c */ /* copied from time.c */
#define NDIV(x,y) (-(-((x)+1)/(y))-1) #define NDIV(x,y) ((int)(-(-((x)+1)/(y))-1))
#define NMOD(x,y) ((y)-(-((x)+1)%(y))-1) #define NMOD(x,y) ((int)((y)-(-((x)+1)%(y))-1))
#define DIV(n,d) ((n)<0 ? NDIV((n),(d)) : (n)/(d)) #define DIV(n,d) ((int)((n)<0 ? NDIV((n),(d)) : (n)/(d)))
#define MOD(n,d) ((n)<0 ? NMOD((n),(d)) : (n)%(d)) #define MOD(n,d) ((int)((n)<0 ? NMOD((n),(d)) : (n)%(d)))
union DateData union DateData
{ {
@ -305,7 +305,7 @@ jd_to_ordinal(long jd, double sg, int *ry, int *rd)
jd_to_civil(jd, sg, ry, &rm2, &rd2); jd_to_civil(jd, sg, ry, &rm2, &rd2);
find_fdoy(*ry, sg, &rjd, &ns); find_fdoy(*ry, sg, &rjd, &ns);
*rd = jd - rjd + 1; *rd = (int)(jd - rjd) + 1;
} }
static void static void
@ -820,11 +820,11 @@ date_s_valid_civil_p(int argc, VALUE *argv, VALUE klass)
switch (argc) { switch (argc) {
case 4: case 4:
case 3: case 3:
d = NUM2LONG(vd); d = NUM2INT(vd);
case 2: case 2:
m = NUM2LONG(vm); m = NUM2INT(vm);
case 1: case 1:
y = NUM2LONG(vy); y = NUM2INT(vy);
if (!LIGHTABLE_YEAR(y)) if (!LIGHTABLE_YEAR(y))
return cforwardv("valid_civil_r?"); return cforwardv("valid_civil_r?");
} }
@ -868,9 +868,9 @@ date_s_valid_ordinal_p(int argc, VALUE *argv, VALUE klass)
switch (argc) { switch (argc) {
case 3: case 3:
case 2: case 2:
d = NUM2LONG(vd); d = NUM2INT(vd);
case 1: case 1:
y = NUM2LONG(vy); y = NUM2INT(vy);
if (!LIGHTABLE_YEAR(y)) if (!LIGHTABLE_YEAR(y))
return cforwardv("valid_ordinal_r?"); return cforwardv("valid_ordinal_r?");
} }
@ -911,11 +911,11 @@ date_s_valid_commercial_p(int argc, VALUE *argv, VALUE klass)
switch (argc) { switch (argc) {
case 4: case 4:
case 3: case 3:
d = NUM2LONG(vd); d = NUM2INT(vd);
case 2: case 2:
w = NUM2LONG(vw); w = NUM2INT(vw);
case 1: case 1:
y = NUM2LONG(vy); y = NUM2INT(vy);
if (!LIGHTABLE_CWYEAR(y)) if (!LIGHTABLE_CWYEAR(y))
return cforwardv("valid_commercial_r?"); return cforwardv("valid_commercial_r?");
} }
@ -1128,9 +1128,9 @@ date_s_ordinal(int argc, VALUE *argv, VALUE klass)
switch (argc) { switch (argc) {
case 3: case 3:
case 2: case 2:
d = NUM2LONG(vd); d = NUM2INT(vd);
case 1: case 1:
y = NUM2LONG(vy); y = NUM2INT(vy);
if (!LIGHTABLE_YEAR(y)) if (!LIGHTABLE_YEAR(y))
return cforwardv("ordinal_r"); return cforwardv("ordinal_r");
} }
@ -1195,11 +1195,11 @@ date_s_civil(int argc, VALUE *argv, VALUE klass)
switch (argc) { switch (argc) {
case 4: case 4:
case 3: case 3:
d = NUM2LONG(vd); d = NUM2INT(vd);
case 2: case 2:
m = NUM2LONG(vm); m = NUM2INT(vm);
case 1: case 1:
y = NUM2LONG(vy); y = NUM2INT(vy);
if (!LIGHTABLE_YEAR(y)) if (!LIGHTABLE_YEAR(y))
return cforwardv("civil_r"); return cforwardv("civil_r");
} }
@ -1271,11 +1271,11 @@ date_s_commercial(int argc, VALUE *argv, VALUE klass)
switch (argc) { switch (argc) {
case 4: case 4:
case 3: case 3:
d = NUM2LONG(vd); d = NUM2INT(vd);
case 2: case 2:
w = NUM2LONG(vw); w = NUM2INT(vw);
case 1: case 1:
y = NUM2LONG(vy); y = NUM2INT(vy);
if (!LIGHTABLE_CWYEAR(y)) if (!LIGHTABLE_CWYEAR(y))
return cforwardv("commercial_r"); return cforwardv("commercial_r");
} }
@ -2697,11 +2697,11 @@ datetime_s_jd(int argc, VALUE *argv, VALUE klass)
if (!daydiff_to_sec(vof, &rof)) if (!daydiff_to_sec(vof, &rof))
return cforwardv("jd_r"); return cforwardv("jd_r");
case 4: case 4:
s = NUM2LONG(vs); s = NUM2INT(vs);
case 3: case 3:
min = NUM2LONG(vmin); min = NUM2INT(vmin);
case 2: case 2:
h = NUM2LONG(vh); h = NUM2INT(vh);
case 1: case 1:
jd = NUM2LONG(vjd); jd = NUM2LONG(vjd);
if (!LIGHTABLE_JD(jd)) if (!LIGHTABLE_JD(jd))
@ -2774,15 +2774,15 @@ datetime_s_ordinal(int argc, VALUE *argv, VALUE klass)
if (!daydiff_to_sec(vof, &rof)) if (!daydiff_to_sec(vof, &rof))
return cforwardv("ordinal_r"); return cforwardv("ordinal_r");
case 5: case 5:
s = NUM2LONG(vs); s = NUM2INT(vs);
case 4: case 4:
min = NUM2LONG(vmin); min = NUM2INT(vmin);
case 3: case 3:
h = NUM2LONG(vh); h = NUM2INT(vh);
case 2: case 2:
d = NUM2LONG(vd); d = NUM2INT(vd);
case 1: case 1:
y = NUM2LONG(vy); y = NUM2INT(vy);
if (!LIGHTABLE_YEAR(y)) if (!LIGHTABLE_YEAR(y))
return cforwardv("ordinal_r"); return cforwardv("ordinal_r");
} }
@ -2864,17 +2864,17 @@ datetime_s_civil(int argc, VALUE *argv, VALUE klass)
if (!daydiff_to_sec(vof, &rof)) if (!daydiff_to_sec(vof, &rof))
return cforwardv("civil_r"); return cforwardv("civil_r");
case 6: case 6:
s = NUM2LONG(vs); s = NUM2INT(vs);
case 5: case 5:
min = NUM2LONG(vmin); min = NUM2INT(vmin);
case 4: case 4:
h = NUM2LONG(vh); h = NUM2INT(vh);
case 3: case 3:
d = NUM2LONG(vd); d = NUM2INT(vd);
case 2: case 2:
m = NUM2LONG(vm); m = NUM2INT(vm);
case 1: case 1:
y = NUM2LONG(vy); y = NUM2INT(vy);
if (!LIGHTABLE_YEAR(y)) if (!LIGHTABLE_YEAR(y))
return cforwardv("civil_r"); return cforwardv("civil_r");
} }
@ -2967,17 +2967,17 @@ datetime_s_commercial(int argc, VALUE *argv, VALUE klass)
if (!daydiff_to_sec(vof, &rof)) if (!daydiff_to_sec(vof, &rof))
return cforwardv("commercial_r"); return cforwardv("commercial_r");
case 6: case 6:
s = NUM2LONG(vs); s = NUM2INT(vs);
case 5: case 5:
min = NUM2LONG(vmin); min = NUM2INT(vmin);
case 4: case 4:
h = NUM2LONG(vh); h = NUM2INT(vh);
case 3: case 3:
d = NUM2LONG(vd); d = NUM2INT(vd);
case 2: case 2:
w = NUM2LONG(vw); w = NUM2INT(vw);
case 1: case 1:
y = NUM2LONG(vy); y = NUM2INT(vy);
if (!LIGHTABLE_CWYEAR(y)) if (!LIGHTABLE_CWYEAR(y))
return cforwardv("commercial_r"); return cforwardv("commercial_r");
} }
@ -3054,7 +3054,7 @@ datetime_s_now(int argc, VALUE *argv, VALUE klass)
if (s == 60) if (s == 60)
s = 59; s = 59;
#ifdef HAVE_STRUCT_TM_TM_GMTOFF #ifdef HAVE_STRUCT_TM_TM_GMTOFF
of = tm.tm_gmtoff; of = (int)tm.tm_gmtoff;
#else #else
of = (int)-timezone; of = (int)-timezone;
#endif #endif

2
lib/test/unit/parallel.rb
View File

@ -20,7 +20,7 @@ module Test
def _run_suites(suites, type) def _run_suites(suites, type)
suites.map do |suite| suites.map do |suite|
result = _run_suite(suite, type) _run_suite(suite, type)
end end
end end