summaryrefslogtreecommitdiffhomepage
path: root/src/string.c
diff options
context:
space:
mode:
authorMasaki Muranaka <[email protected]>2013-02-26 15:43:19 +0900
committerMasaki Muranaka <[email protected]>2013-02-26 15:43:19 +0900
commitcb7cf4e795bab952802fce023ff19c79bf66f74d (patch)
tree1caf32a999c95e9f73160e7d115821447ce2a0ef /src/string.c
parent8a9026426e3355d8f0080df506855832b528c6a3 (diff)
downloadmruby-cb7cf4e795bab952802fce023ff19c79bf66f74d.tar.gz
mruby-cb7cf4e795bab952802fce023ff19c79bf66f74d.zip
Simplify mrb_range_beg_len(). Don't use OTHER macro.
Diffstat (limited to 'src/string.c')
-rw-r--r--src/string.c17
1 files changed, 8 insertions, 9 deletions
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;
}