From cb7cf4e795bab952802fce023ff19c79bf66f74d Mon Sep 17 00:00:00 2001 From: Masaki Muranaka Date: Tue, 26 Feb 2013 15:43:19 +0900 Subject: Simplify mrb_range_beg_len(). Don't use OTHER macro. --- src/string.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) (limited to 'src/string.c') diff --git a/src/string.c b/src/string.c index 205c39876..7af0d1d59 100644 --- a/src/string.c +++ b/src/string.c @@ -759,23 +759,22 @@ num_index: return mrb_str_dup(mrb, indx); return mrb_nil_value(); - default: + case MRB_TT_RANGE: /* check if indx is Range */ { mrb_int beg, len; mrb_value tmp; len = RSTRING_LEN(str); - switch (mrb_range_beg_len(mrb, indx, &beg, &len, len, 0)) { - case FALSE: - break; - case 2/*OTHER*/: - return mrb_nil_value(); - default: - tmp = mrb_str_subseq(mrb, str, beg, len); - return tmp; + if (mrb_range_beg_len(mrb, indx, &beg, &len, len)) { + tmp = mrb_str_subseq(mrb, str, beg, len); + return tmp; + } + else { + return mrb_nil_value(); } } + default: idx = mrb_fixnum(indx); goto num_index; } -- cgit v1.2.3