resolve conflict

4 files changed, 5 insertions, 0 deletions

diff --git a/src/array.c b/src/array.c
index f0fcdb10d..e704aa2c4 100644
--- a/src/array.c
+++ b/src/array.c
@@ -702,6 +702,7 @@ mrb_ary_aget(mrb_state *mrb, mrb_value self)
 
   default:
     mrb_raise(mrb, E_ARGUMENT_ERROR, "wrong number of arguments");
+    break;
   }
 
   return mrb_nil_value(); /* dummy to avoid warning : not reach here */
diff --git a/src/class.c b/src/class.c
index 7935b7b3e..08cad0eb0 100644
--- a/src/class.c
+++ b/src/class.c
@@ -408,6 +408,7 @@ mrb_get_args(mrb_state *mrb, const char *format, ...)
       if (argc <= i && !opt) {
         mrb_raise(mrb, E_ARGUMENT_ERROR, "wrong number of arguments");
       }
+      break;
     }
 
     switch (c) {
diff --git a/src/codegen.c b/src/codegen.c
index 799434a06..ace9697e9 100644
--- a/src/codegen.c
+++ b/src/codegen.c
@@ -379,6 +379,7 @@ dispatch(codegen_scope *s, int pc)
     fprintf(stderr, "bug: dispatch on non JMP op\n");
 #endif
     scope_error(s);
+    break;
   }
   s->iseq[pc] = MKOP_AsBx(c, GETARG_A(i), diff);
 }
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 */
 }