Merge branch 'master' of github.com:mruby/mruby

This commit is contained in:
Yukihiro Matz Matsumoto
2012-11-14 14:42:36 +09:00
4 changed files with 31 additions and 6 deletions
+1 -1
View File
@@ -286,7 +286,7 @@ mrb_range_beg_len(mrb_state *mrb, mrb_value range, mrb_int *begp, mrb_int *lenp,
if (end > len) end = len;
}
if (end < 0) end += len;
if (!r->excl) end++; /* include end point */
if (!r->excl && end < len) end++; /* include end point */
len = end - beg;
if (len < 0) len = 0;
+1 -1
View File
@@ -671,7 +671,7 @@ retry:
tmp = mrb_check_string_type(mrb, val);
if (!mrb_nil_p(tmp)) {
if (RSTRING_LEN(tmp) != 1 ) {
mrb_raise(mrb, E_ARGUMENT_ERROR, "%%c requires a character");
mrb_raise(mrb, E_ARGUMENT_ERROR, "%c requires a character");
}
c = RSTRING_PTR(tmp)[0];
n = 1;