resolve conflict from #964

This commit is contained in:
Yukihiro Matz Matsumoto
2013-03-27 00:52:24 +09:00
9 changed files with 649 additions and 1210 deletions
+1 -1
View File
@@ -2498,7 +2498,7 @@ codedump(mrb_state *mrb, int n)
if (!irep) return;
printf("irep %d nregs=%d nlocals=%d pools=%d syms=%d\n", n,
irep->nregs, irep->nlocals, irep->plen, irep->slen);
irep->nregs, irep->nlocals, (int)irep->plen, (int)irep->slen);
for (i=0; i<irep->ilen; i++) {
ai = mrb_gc_arena_save(mrb);
printf("%03d ", i);