kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

time.c: Fix some bugs about WIDEVALUE

Browse source 
WIDEVALUE differs from VALUE in 32bit platform, but some codes assume
that they are the same.

There is `#define STRUCT_WIDEVAL` mode to check the consistency.
This change allows to build with STRUCT_WIDEVAL.
This commit is contained in:
Yusuke Endoh 2019-10-06 11:39:01 +09:00
parent 06a04a1aa3
commit 2409667aa2
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
time.c
View file

@ -303,7 +303,7 @@ v2w(VALUE v)
{ {
if (RB_TYPE_P(v, T_RATIONAL)) { if (RB_TYPE_P(v, T_RATIONAL)) {
if (RRATIONAL(v)->den != LONG2FIX(1)) if (RRATIONAL(v)->den != LONG2FIX(1))
return v; return WIDEVAL_WRAP(v);
v = RRATIONAL(v)->num; v = RRATIONAL(v)->num;
} }
#if WIDEVALUE_IS_WIDER #if WIDEVALUE_IS_WIDER
@ -2193,7 +2193,7 @@ extract_vtm(VALUE time, struct vtm *vtm, VALUE subsecx)
*vtm = tobj->vtm; *vtm = tobj->vtm;
t = rb_time_unmagnify(tobj->timew); t = rb_time_unmagnify(tobj->timew);
if (TZMODE_FIXOFF_P(tobj) && vtm->utc_offset != INT2FIX(0)) if (TZMODE_FIXOFF_P(tobj) && vtm->utc_offset != INT2FIX(0))
t = wadd(t, vtm->utc_offset); t = wadd(t, v2w(vtm->utc_offset));
} }
else if (RB_TYPE_P(time, T_STRUCT)) { else if (RB_TYPE_P(time, T_STRUCT)) {
#define AREF(x) rb_struct_aref(time, ID2SYM(id_##x)) #define AREF(x) rb_struct_aref(time, ID2SYM(id_##x))
@ -4103,7 +4103,7 @@ time_inspect(VALUE time)
GetTimeval(time, tobj); GetTimeval(time, tobj);
str = strftimev("%Y-%m-%d %H:%M:%S", time, rb_usascii_encoding()); str = strftimev("%Y-%m-%d %H:%M:%S", time, rb_usascii_encoding());
subsec = wmod(tobj->timew, WINT2FIXWV(TIME_SCALE)); subsec = w2v(wmod(tobj->timew, WINT2FIXWV(TIME_SCALE)));
if (FIXNUM_P(subsec) && FIX2LONG(subsec) == 0) { if (FIXNUM_P(subsec) && FIX2LONG(subsec) == 0) {
} }
else if (FIXNUM_P(subsec) && FIX2LONG(subsec) < TIME_SCALE) { else if (FIXNUM_P(subsec) && FIX2LONG(subsec) < TIME_SCALE) {
@ -4115,7 +4115,7 @@ time_inspect(VALUE time)
} }
else { else {
rb_str_cat_cstr(str, " "); rb_str_cat_cstr(str, " ");
subsec = quov(w2v(subsec), INT2FIX(TIME_SCALE)); subsec = quov(subsec, INT2FIX(TIME_SCALE));
rb_str_concat(str, rb_obj_as_string(subsec)); rb_str_concat(str, rb_obj_as_string(subsec));
} }
if (TZMODE_UTC_P(tobj)) { if (TZMODE_UTC_P(tobj)) {