conservatory
/
picrin
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rename pic_code.u.c -> pic_code.u.r

This commit is contained in:
Yuichi Nishiwaki 2013-11-04 21:32:09 -05:00
parent 5bb762b6e3
commit 8aca1ebc96
3 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/picrin/irep.h
View File

@ -43,7 +43,7 @@ struct pic_code {
struct {
short depth;
short idx;
} c;
} r;
} u;
};

28
src/codegen.c
View File

@ -199,8 +199,8 @@ codegen(codegen_state *state, pic_value obj, bool tailpos)
FALLTHROUGH;
case 0: /* local */
irep->code[irep->clen].insn = OP_CREF;
irep->code[irep->clen].u.c.depth = depth;
irep->code[irep->clen].u.c.idx = idx;
irep->code[irep->clen].u.r.depth = depth;
irep->code[irep->clen].u.r.idx = idx;
irep->clen++;
break;
}
@ -347,8 +347,8 @@ codegen(codegen_state *state, pic_value obj, bool tailpos)
FALLTHROUGH;
case 0: /* local */
irep->code[irep->clen].insn = OP_CSET;
irep->code[irep->clen].u.c.depth = depth;
irep->code[irep->clen].u.c.idx = idx;
irep->code[irep->clen].u.r.depth = depth;
irep->code[irep->clen].u.r.idx = idx;
irep->clen++;
break;
}
@ -588,7 +588,7 @@ lift_cv(pic_state *pic, struct pic_irep *irep)
break;
case OP_CREF:
case OP_CSET:
irep->code[i].u.c.depth--;
irep->code[i].u.r.depth--;
break;
}
}
@ -616,11 +616,11 @@ slide_cv(pic_state *pic, unsigned *cv_tbl, unsigned cv_num, struct pic_irep *ire
break;
case OP_CREF:
case OP_CSET:
if (d != c.u.c.depth)
if (d != c.u.r.depth)
break;
for (j = 0; j < cv_num; ++j) {
if (c.u.c.idx == cv_tbl[j]) {
irep->code[i].u.c.idx = j;
if (c.u.r.idx == cv_tbl[j]) {
irep->code[i].u.r.idx = j;
break;
}
}
@ -680,15 +680,15 @@ codegen_lambda(codegen_state *state, pic_value obj)
/* pass */
break;
case OP_CREF:
if (c.u.c.depth == 0 && ! state->scope->dirty_flags[c.u.c.idx]) {
if (c.u.r.depth == 0 && ! state->scope->dirty_flags[c.u.r.idx]) {
irep->code[i].insn = OP_LREF;
irep->code[i].u.i = irep->code[i].u.c.idx;
irep->code[i].u.i = irep->code[i].u.r.idx;
}
break;
case OP_CSET:
if (c.u.c.depth == 0 && ! state->scope->dirty_flags[c.u.c.idx]) {
if (c.u.r.depth == 0 && ! state->scope->dirty_flags[c.u.r.idx]) {
irep->code[i].insn = OP_LSET;
irep->code[i].u.i = irep->code[i].u.c.idx;
irep->code[i].u.i = irep->code[i].u.r.idx;
}
break;
}
@ -828,10 +828,10 @@ print_irep(pic_state *pic, struct pic_irep *irep)
printf("OP_LSET\t%d\n", irep->code[i].u.i);
break;
case OP_CREF:
printf("OP_CREF\t%d\t%d\n", irep->code[i].u.c.depth, irep->code[i].u.c.idx);
printf("OP_CREF\t%d\t%d\n", irep->code[i].u.r.depth, irep->code[i].u.r.idx);
break;
case OP_CSET:
printf("OP_CSET\t%d\t%d\n", irep->code[i].u.c.depth, irep->code[i].u.c.idx);
printf("OP_CSET\t%d\t%d\n", irep->code[i].u.r.depth, irep->code[i].u.r.idx);
break;
case OP_JMP:
printf("OP_JMP\t%d\n", irep->code[i].u.i);

8
src/vm.c
View File

@ -327,25 +327,25 @@ pic_apply(pic_state *pic, struct pic_proc *proc, pic_value argv)
NEXT;
}
CASE(OP_CREF) {
int depth = c.u.c.depth;
int depth = c.u.r.depth;
struct pic_env *env;
env = pic->ci->env;
while (depth--) {
env = env->up;
}
PUSH(env->values[c.u.c.idx]);
PUSH(env->values[c.u.r.idx]);
NEXT;
}
CASE(OP_CSET) {
int depth = c.u.c.depth;
int depth = c.u.r.depth;
struct pic_env *env;
env = pic->ci->env;
while (depth--) {
env = env->up;
}
env->values[c.u.c.idx] = POP();
env->values[c.u.r.idx] = POP();
NEXT;
}
CASE(OP_JMP) {