diff options
| author | Yukihiro Matz Matsumoto <[email protected]> | 2013-03-15 00:21:22 +0900 |
|---|---|---|
| committer | Yukihiro Matz Matsumoto <[email protected]> | 2013-03-15 00:21:22 +0900 |
| commit | 75dd4a5aeda402e74ade4b3e74d2ca15eecec009 (patch) | |
| tree | 25997a520ae7d249bcab701186c788af93639c0c /src/kernel.c | |
| parent | 22756f45beb81559b53a8d9e282bf59344e27ec5 (diff) | |
| parent | 2ff330ee0e7f2bbcff34051f028c7837b8c16b38 (diff) | |
| download | mruby-75dd4a5aeda402e74ade4b3e74d2ca15eecec009.tar.gz mruby-75dd4a5aeda402e74ade4b3e74d2ca15eecec009.zip | |
resolve conflict
Diffstat (limited to 'src/kernel.c')
| -rw-r--r-- | src/kernel.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/kernel.c b/src/kernel.c index e0a1a0a52..c1f1c198f 100644 --- a/src/kernel.c +++ b/src/kernel.c @@ -518,6 +518,7 @@ mrb_obj_instance_eval(mrb_state *mrb, mrb_value self) default: cv = mrb_singleton_class(mrb, self); c = mrb_class_ptr(cv); + break; } return mrb_yield_internal(mrb, b, 0, 0, self, c); } @@ -931,6 +932,7 @@ mrb_f_raise(mrb_state *mrb, mrb_value self) exc = mrb_make_exception(mrb, argc, a); mrb_obj_iv_set(mrb, mrb_obj_ptr(exc), mrb_intern(mrb, "lastpc"), mrb_voidp_value(mrb->ci->pc)); mrb_exc_raise(mrb, exc); + break; } return mrb_nil_value(); /* not reached */ } |