admin/mruby-mruby
1
0
Fork 0
mirror of https://github.com/mruby/mruby synced 2026-06-08 16:11:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

mrb_raisef(): new function. Same as previou version of mrb_raise().

Browse Source 
mrb_raise(): API modified. It cannot treat variable arguments.
This commit is contained in:
Masaki Muranaka
2012-10-23 09:42:22 +09:00
parent e05bbd45bb
commit 6069a33089
14 changed files with 67 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/string.c
+7 -7
View File
@@ -840,7 +840,7 @@ mrb_str_aref_m(mrb_state *mrb, mrb_value str)
return mrb_str_substr(mrb, str, mrb_fixnum(a1), mrb_fixnum(a2));
}
if (argc != 1) {
mrb_raise(mrb, E_ARGUMENT_ERROR, "wrong number of arguments (%d for 1)", argc);
mrb_raisef(mrb, E_ARGUMENT_ERROR, "wrong number of arguments (%d for 1)", argc);
}
return mrb_str_aref(mrb, str, a1);
}
@@ -1525,7 +1525,7 @@ mrb_str_index_m(mrb_state *mrb, mrb_value str)
tmp = mrb_check_string_type(mrb, sub);
if (mrb_nil_p(tmp)) {
mrb_raise(mrb, E_TYPE_ERROR, "type mismatch: %s given",
mrb_raisef(mrb, E_TYPE_ERROR, "type mismatch: %s given",
mrb_obj_classname(mrb, sub));
}
sub = tmp;
@@ -1931,7 +1931,7 @@ mrb_str_rindex_m(mrb_state *mrb, mrb_value str)
tmp = mrb_check_string_type(mrb, sub);
if (mrb_nil_p(tmp)) {
mrb_raise(mrb, E_TYPE_ERROR, "type mismatch: %s given",
mrb_raisef(mrb, E_TYPE_ERROR, "type mismatch: %s given",
mrb_obj_classname(mrb, sub));
}
sub = tmp;
@@ -2466,7 +2466,7 @@ mrb_cstr_to_inum(mrb_state *mrb, const char *str, int base, int badcheck)
break;
default:
if (base < 2 || 36 < base) {
mrb_raise(mrb, E_ARGUMENT_ERROR, "illegal radix %d", base);
mrb_raisef(mrb, E_ARGUMENT_ERROR, "illegal radix %d", base);
}
if (base <= 32) {
len = 5;
@@ -2510,7 +2510,7 @@ mrb_cstr_to_inum(mrb_state *mrb, const char *str, int base, int badcheck)
return mrb_fixnum_value(result);
}
bad:
mrb_raise(mrb, E_ARGUMENT_ERROR, "invalide string for number(%s)", str);
mrb_raisef(mrb, E_ARGUMENT_ERROR, "invalide string for number(%s)", str);
/* not reached */
return mrb_fixnum_value(0);
}
@@ -2589,7 +2589,7 @@ mrb_str_to_i(mrb_state *mrb, mrb_value self)
base = mrb_fixnum(argv[0]);
if (base < 0) {
mrb_raise(mrb, E_ARGUMENT_ERROR, "illegal radix %d", base);
mrb_raisef(mrb, E_ARGUMENT_ERROR, "illegal radix %d", base);
}
return mrb_str_to_inum(mrb, self, base, 0/*Qfalse*/);
}
@@ -2620,7 +2620,7 @@ mrb_cstr_to_dbl(mrb_state *mrb, const char * p, int badcheck)
if (p == end) {
if (badcheck) {
bad:
mrb_raise(mrb, E_ARGUMENT_ERROR, "invalide string for float(%s)", p);
mrb_raisef(mrb, E_ARGUMENT_ERROR, "invalide string for float(%s)", p);
/* not reached */
}
return d;