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

date_core.c: fix inspect

Browse Source 
* ext/date/date_core.c (mk_inspect_raw, mk_inspect): inspect by
  "%+"PRIsVALUE, to prevent intermediate strings from GC.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@54241 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2016-03-24 03:42:37 +00:00
parent ec3d895094
commit c4f51b71e3
2 changed files with 32 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Thu Mar 24 12:42:36 2016 Nobuyoshi Nakada <nobu@ruby-lang.org>
* ext/date/date_core.c (mk_inspect_raw, mk_inspect): inspect by
"%+"PRIsVALUE, to prevent intermediate strings from GC.
Thu Mar 24 11:43:32 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> Thu Mar 24 11:43:32 2016 Nobuyoshi Nakada <nobu@ruby-lang.org>
* strftime.c (rb_strftime_with_timespec): remove unnecessary * strftime.c (rb_strftime_with_timespec): remove unnecessary

78
ext/date/date_core.c
View File

@ -6430,54 +6430,40 @@ d_lite_to_s(VALUE self)
#ifndef NDEBUG #ifndef NDEBUG
static VALUE static VALUE
mk_inspect_flags(union DateData *x) mk_inspect_raw(union DateData *x, VALUE klass)
{ {
return rb_enc_sprintf(rb_usascii_encoding(), char flags[5];
"%c%c%c%c%c",
(x->flags & COMPLEX_DAT) ? 'C' : 'S', flags[0] = (x->flags & COMPLEX_DAT) ? 'C' : 'S';
(x->flags & HAVE_JD) ? 'j' : '-', flags[1] = (x->flags & HAVE_JD) ? 'j' : '-';
(x->flags & HAVE_DF) ? 'd' : '-', flags[2] = (x->flags & HAVE_DF) ? 'd' : '-';
(x->flags & HAVE_CIVIL) ? 'c' : '-', flags[3] = (x->flags & HAVE_CIVIL) ? 'c' : '-';
(x->flags & HAVE_TIME) ? 't' : '-'); flags[4] = (x->flags & HAVE_TIME) ? 't' : '-';
} flags[5] = '\0';
static VALUE
mk_inspect_raw(union DateData *x, const char *klass)
{
if (simple_dat_p(x)) { if (simple_dat_p(x)) {
VALUE nth, flags;
RB_GC_GUARD(nth) = f_inspect(x->s.nth);
RB_GC_GUARD(flags) = mk_inspect_flags(x);
return rb_enc_sprintf(rb_usascii_encoding(), return rb_enc_sprintf(rb_usascii_encoding(),
"#<%s: " "#<%"PRIsVALUE": "
"(%sth,%dj),+0s,%.0fj; " "(%+"PRIsVALUE"th,%dj),+0s,%.0fj; "
"%dy%dm%dd; %s>", "%dy%dm%dd; %s>",
klass ? klass : "?", klass,
RSTRING_PTR(nth), x->s.jd, x->s.sg, x->s.nth, x->s.jd, x->s.sg,
#ifndef USE_PACK #ifndef USE_PACK
x->s.year, x->s.mon, x->s.mday, x->s.year, x->s.mon, x->s.mday,
#else #else
x->s.year, x->s.year,
EX_MON(x->s.pc), EX_MDAY(x->s.pc), EX_MON(x->s.pc), EX_MDAY(x->s.pc),
#endif #endif
RSTRING_PTR(flags)); flags);
} }
else { else {
VALUE nth, sf, flags;
RB_GC_GUARD(nth) = f_inspect(x->c.nth);
RB_GC_GUARD(sf) = f_inspect(x->c.sf);
RB_GC_GUARD(flags) = mk_inspect_flags(x);
return rb_enc_sprintf(rb_usascii_encoding(), return rb_enc_sprintf(rb_usascii_encoding(),
"#<%s: " "#<%"PRIsVALUE": "
"(%sth,%dj,%ds,%sn),%+ds,%.0fj; " "(%+"PRIsVALUE"th,%dj,%ds,%+"PRIsVALUE"n),"
"%+ds,%.0fj; "
"%dy%dm%dd %dh%dm%ds; %s>", "%dy%dm%dd %dh%dm%ds; %s>",
klass ? klass : "?", klass,
RSTRING_PTR(nth), x->c.jd, x->c.df, x->c.nth, x->c.jd, x->c.df, x->c.sf,
RSTRING_PTR(sf),
x->c.of, x->c.sg, x->c.of, x->c.sg,
#ifndef USE_PACK #ifndef USE_PACK
x->c.year, x->c.mon, x->c.mday, x->c.year, x->c.mon, x->c.mday,
@ -6488,7 +6474,7 @@ mk_inspect_raw(union DateData *x, const char *klass)
EX_HOUR(x->c.pc), EX_MIN(x->c.pc), EX_HOUR(x->c.pc), EX_MIN(x->c.pc),
EX_SEC(x->c.pc), EX_SEC(x->c.pc),
#endif #endif
RSTRING_PTR(flags)); flags);
} }
} }
@ -6496,23 +6482,18 @@ static VALUE
d_lite_inspect_raw(VALUE self) d_lite_inspect_raw(VALUE self)
{ {
get_d1(self); get_d1(self);
return mk_inspect_raw(dat, rb_obj_classname(self)); return mk_inspect_raw(dat, rb_obj_class(self));
} }
#endif #endif
static VALUE static VALUE
mk_inspect(union DateData *x, const char *klass, const char *to_s) mk_inspect(union DateData *x, VALUE klass, VALUE to_s)
{ {
VALUE jd, sf;
RB_GC_GUARD(jd) = f_inspect(m_real_jd(x));
RB_GC_GUARD(sf) = f_inspect(m_sf(x));
return rb_enc_sprintf(rb_usascii_encoding(), return rb_enc_sprintf(rb_usascii_encoding(),
"#<%s: %s ((%sj,%ds,%sn),%+ds,%.0fj)>", "#<%"PRIsVALUE": %"PRIsVALUE" "
klass ? klass : "?", "((%+"PRIsVALUE"j,%ds,%+"PRIsVALUE"n),%+ds,%.0fj)>",
to_s ? to_s : "?", klass, to_s,
RSTRING_PTR(jd), m_df(x), RSTRING_PTR(sf), m_real_jd(x), m_df(x), m_sf(x),
m_of(x), m_sg(x)); m_of(x), m_sg(x));
} }
@ -6531,12 +6512,7 @@ static VALUE
d_lite_inspect(VALUE self) d_lite_inspect(VALUE self)
{ {
get_d1(self); get_d1(self);
{ return mk_inspect(dat, rb_obj_class(self), self);
VALUE to_s;
RB_GC_GUARD(to_s) = f_to_s(self);
return mk_inspect(dat, rb_obj_classname(self), RSTRING_PTR(to_s));
}
} }
#include <errno.h> #include <errno.h>