From 751d0f87f82c56316fbffc64aab6ccdbd92583c3 Mon Sep 17 00:00:00 2001 From: Yuichi Nishiwaki Date: Fri, 7 Mar 2014 22:06:43 +0900 Subject: [PATCH] typedef struct pic_code pic_code --- include/picrin.h | 6 +++--- include/picrin/cont.h | 2 +- include/picrin/irep.h | 2 +- src/codegen.c | 8 ++++---- src/vm.c | 8 ++++---- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/include/picrin.h b/include/picrin.h index b433ccd7..6f8dbb94 100644 --- a/include/picrin.h +++ b/include/picrin.h @@ -59,11 +59,11 @@ extern "C" { #include "config.h" #include "picrin/value.h" -struct pic_code; +typedef struct pic_code pic_code; typedef struct { int argc, retc; - struct pic_code *ip; + pic_code *ip; pic_value *fp; struct pic_env *env; } pic_callinfo; @@ -87,7 +87,7 @@ typedef struct { pic_callinfo *ci; pic_callinfo *cibase, *ciend; - struct pic_code *ip; + pic_code *ip; struct pic_proc **rescue; size_t ridx, rlen; diff --git a/include/picrin/cont.h b/include/picrin/cont.h index c11fa3c3..dd43607b 100644 --- a/include/picrin/cont.h +++ b/include/picrin/cont.h @@ -24,7 +24,7 @@ struct pic_cont { pic_callinfo *ci_ptr; size_t ci_offset, ci_len; - struct pic_code *ip; + pic_code *ip; struct pic_proc **rescue; size_t ridx, rlen; diff --git a/include/picrin/irep.h b/include/picrin/irep.h index aebe78ef..7aa52965 100644 --- a/include/picrin/irep.h +++ b/include/picrin/irep.h @@ -60,7 +60,7 @@ struct pic_code { struct pic_irep { PIC_OBJECT_HEADER - struct pic_code *code; + pic_code *code; int argc, localc; unsigned *cv_tbl, cv_num; bool varg; diff --git a/src/codegen.c b/src/codegen.c index 6203ecb0..f6bf09a0 100644 --- a/src/codegen.c +++ b/src/codegen.c @@ -948,7 +948,7 @@ typedef struct codegen_context { /* closed variable table */ unsigned *cv_tbl, cv_num; /* actual bit code sequence */ - struct pic_code *code; + pic_code *code; size_t clen, ccapa; /* child ireps */ struct pic_irep **irep; @@ -1045,7 +1045,7 @@ push_codegen_context(codegen_state *state, pic_value args, pic_value locals, boo xh_destroy(vars); - cxt->code = (struct pic_code *)pic_calloc(pic, PIC_ISEQ_SIZE, sizeof(struct pic_code)); + cxt->code = (pic_code *)pic_calloc(pic, PIC_ISEQ_SIZE, sizeof(pic_code)); cxt->clen = 0; cxt->ccapa = PIC_ISEQ_SIZE; @@ -1074,7 +1074,7 @@ pop_codegen_context(codegen_state *state) irep->localc = state->cxt->localc; irep->cv_tbl = state->cxt->cv_tbl; irep->cv_num = state->cxt->cv_num; - irep->code = pic_realloc(pic, state->cxt->code, sizeof(struct pic_code) * state->cxt->clen); + irep->code = pic_realloc(pic, state->cxt->code, sizeof(pic_code) * state->cxt->clen); irep->clen = state->cxt->clen; irep->irep = pic_realloc(pic, state->cxt->irep, sizeof(struct pic_irep *) * state->cxt->ilen); irep->ilen = state->cxt->ilen; @@ -1553,7 +1553,7 @@ pic_set(pic_state *pic, const char *name, pic_value value) } void -print_code(pic_state *pic, struct pic_code c) +print_code(pic_state *pic, pic_code c) { UNUSED(pic); diff --git a/src/vm.c b/src/vm.c index c766da91..e055e593 100644 --- a/src/vm.c +++ b/src/vm.c @@ -362,7 +362,7 @@ pic_apply_argv(pic_state *pic, struct pic_proc *proc, size_t argc, ...) return pic_apply(pic, proc, v); } -void print_code(pic_state *, struct pic_code); +void print_code(pic_state *, pic_code); #if VM_DEBUG # define OPCODE_EXEC_HOOK print_code(pic, c) @@ -394,11 +394,11 @@ void print_code(pic_state *, struct pic_code); pic_value pic_apply(pic_state *pic, struct pic_proc *proc, pic_value argv) { - struct pic_code c; + pic_code c; int ai = pic_gc_arena_preserve(pic); jmp_buf jmp, *prev_jmp = pic->jmp; size_t argc, i; - struct pic_code boot[2]; + pic_code boot[2]; #if PIC_DIRECT_THREADED_VM static void *oplabels[] = { @@ -849,7 +849,7 @@ pic_apply(pic_state *pic, struct pic_proc *proc, pic_value argv) } VM_LOOP_END; } -static struct pic_code trampoline_iseq[] = { +static pic_code trampoline_iseq[] = { { OP_NOP, {0} }, { OP_TAILCALL, {0} }, };