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

time.c: refine error message

Browse Source 
* time.c (validate_vtm): separate validation failure messages for
  each members.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@57115 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2016-12-19 08:36:21 +00:00
parent 528f870e14
commit 5064e9201a
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
time.c
View File

@ -2514,15 +2514,18 @@ validate_zone_name(VALUE zone_name)
static void static void
validate_vtm(struct vtm *vtm) validate_vtm(struct vtm *vtm)
{ {
if ( vtm->mon < 1 || vtm->mon > 12 #define validate_vtm_range(mem, b, e) \
|| vtm->mday < 1 || vtm->mday > 31 ((vtm->mem < b || vtm->mem > e) ? \
|| vtm->hour < 0 || vtm->hour > 24 rb_raise(rb_eArgError, #mem" out of range") : (void)0)
|| (vtm->hour == 24 && (vtm->min > 0 || vtm->sec > 0)) validate_vtm_range(mon, 1, 12);
|| vtm->min < 0 || vtm->min > 59 validate_vtm_range(mday, 1, 31);
|| vtm->sec < 0 || vtm->sec > 60 validate_vtm_range(hour, 0, 24);
|| lt(vtm->subsecx, INT2FIX(0)) || ge(vtm->subsecx, INT2FIX(TIME_SCALE)) validate_vtm_range(min, 0, (vtm->hour == 24 ? 0 : 59));
|| (!NIL_P(vtm->utc_offset) && (validate_utc_offset(vtm->utc_offset), 0))) validate_vtm_range(sec, 0, (vtm->hour == 24 ? 0 : 60));
rb_raise(rb_eArgError, "argument out of range"); if (lt(vtm->subsecx, INT2FIX(0)) || ge(vtm->subsecx, INT2FIX(TIME_SCALE)))
rb_raise(rb_eArgError, "subsecx out of range");
if (!NIL_P(vtm->utc_offset)) validate_utc_offset(vtm->utc_offset);
#undef validate_vtm_range
} }
static void static void