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

This commit is contained in:
Yukihiro Matsumoto
2012-09-13 05:56:46 +09:00
2 changed files with 9 additions and 3 deletions
+6 -3
View File
@@ -134,20 +134,23 @@ exc_inspect(mrb_state *mrb, mrb_value exc)
mrb_str_cat2(mrb, str, ":");
mrb_str_append(mrb, str, line);
mrb_str_cat2(mrb, str, ": ");
if (RSTRING_LEN(mesg) > 0) {
if (!mrb_nil_p(mesg) && RSTRING_LEN(mesg) > 0) {
mrb_str_append(mrb, str, mesg);
mrb_str_cat2(mrb, str, " (");
}
mrb_str_cat2(mrb, str, mrb_obj_classname(mrb, exc));
if (RSTRING_LEN(mesg) > 0) {
if (!mrb_nil_p(mesg) && RSTRING_LEN(mesg) > 0) {
mrb_str_cat2(mrb, str, ")");
}
}
else {
str = mrb_str_new2(mrb, mrb_obj_classname(mrb, exc));
if (RSTRING_LEN(mesg) > 0) {
if (!mrb_nil_p(mesg) && RSTRING_LEN(mesg) > 0) {
mrb_str_cat2(mrb, str, ": ");
mrb_str_append(mrb, str, mesg);
} else {
mrb_str_cat2(mrb, str, ": ");
mrb_str_cat2(mrb, str, mrb_obj_classname(mrb, exc));
}
}
return str;
+3
View File
@@ -269,3 +269,6 @@ assert('Exception 14') do
a == :ok
end
assert('Exception#inspect without message') do
Exception.new.inspect
end