summaryrefslogtreecommitdiffhomepage
path: root/src/codegen.c
diff options
context:
space:
mode:
authorYukihiro Matz Matsumoto <[email protected]>2013-03-15 00:21:22 +0900
committerYukihiro Matz Matsumoto <[email protected]>2013-03-15 00:21:22 +0900
commit75dd4a5aeda402e74ade4b3e74d2ca15eecec009 (patch)
tree25997a520ae7d249bcab701186c788af93639c0c /src/codegen.c
parent22756f45beb81559b53a8d9e282bf59344e27ec5 (diff)
parent2ff330ee0e7f2bbcff34051f028c7837b8c16b38 (diff)
downloadmruby-75dd4a5aeda402e74ade4b3e74d2ca15eecec009.tar.gz
mruby-75dd4a5aeda402e74ade4b3e74d2ca15eecec009.zip
resolve conflict
Diffstat (limited to 'src/codegen.c')
-rw-r--r--src/codegen.c1
1 files changed, 1 insertions, 0 deletions
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);
}