From da1eb0bc1080c13e7fd61dd80ed80445102ebd00 Mon Sep 17 00:00:00 2001 From: OGINO Masanori Date: Sun, 5 Jan 2014 17:53:14 +0900 Subject: [PATCH 1/2] Remove '\e'. The escape sequence is not in ISO C. Signed-off-by: OGINO Masanori --- src/scan.l | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/scan.l b/src/scan.l index a24da8ab..05a74905 100644 --- a/src/scan.l +++ b/src/scan.l @@ -94,7 +94,7 @@ infnan "+inf.0"|"-inf.0"|"+nan.0"|"-nan.0" alarm { yylvalp->c = '\a'; BEGIN(INITIAL); return tCHAR; } backspace { yylvalp->c = '\b'; BEGIN(INITIAL); return tCHAR; } delete { yylvalp->c = 0x7f; BEGIN(INITIAL); return tCHAR; } -escape { yylvalp->c = '\e'; BEGIN(INITIAL); return tCHAR; } +escape { yylvalp->c = 0x1b; BEGIN(INITIAL); return tCHAR; } newline { yylvalp->c = '\n'; BEGIN(INITIAL); return tCHAR; } null { yylvalp->c = '\0'; BEGIN(INITIAL); return tCHAR; } return { yylvalp->c = '\r'; BEGIN(INITIAL); return tCHAR; } From ceffd8a3bd05f1fe5e9e54f926c7dd7695bae23d Mon Sep 17 00:00:00 2001 From: OGINO Masanori Date: Sun, 5 Jan 2014 18:10:33 +0900 Subject: [PATCH 2/2] Cast to `void *` for '%p' format specifiers. Signed-off-by: OGINO Masanori --- src/codegen.c | 2 +- src/gc.c | 2 +- src/port.c | 6 +++--- src/vm.c | 8 ++++---- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/codegen.c b/src/codegen.c index daf52622..6db698cf 100644 --- a/src/codegen.c +++ b/src/codegen.c @@ -1052,7 +1052,7 @@ print_irep(pic_state *pic, struct pic_irep *irep) { int i; - printf("## irep %p\n", irep); + printf("## irep %p\n", (void *)irep); printf("[clen = %zd, ccapa = %zd, argc = %d, localc = %d]\n", irep->clen, irep->ccapa, irep->argc, irep->localc); printf(":: cv_num = %d\n", irep->cv_num); for (i = 0; i < irep->cv_num; ++i) { diff --git a/src/gc.c b/src/gc.c index 0759093f..422c527d 100644 --- a/src/gc.c +++ b/src/gc.c @@ -29,7 +29,7 @@ init_heap(struct pic_heap *heap) heap->pages = NULL; #if GC_DEBUG - printf("freep = %p\n", heap->freep); + printf("freep = %p\n", (void *)heap->freep); #endif } diff --git a/src/port.c b/src/port.c index 793ddac1..38b404bf 100644 --- a/src/port.c +++ b/src/port.c @@ -59,10 +59,10 @@ write(pic_state *pic, pic_value obj) printf("#"); break; case PIC_TT_PROC: - printf("#", pic_proc_ptr(obj)); + printf("#", pic_ptr(obj)); break; case PIC_TT_PORT: - printf("#", pic_port_ptr(obj)); + printf("#", pic_ptr(obj)); break; case PIC_TT_STRING: printf("\""); @@ -93,7 +93,7 @@ write(pic_state *pic, pic_value obj) printf("#", pic_ptr(obj)); break; case PIC_TT_ENV: - printf("#", pic_env_ptr(obj)); + printf("#", pic_ptr(obj)); break; case PIC_TT_CONT: printf("#", pic_ptr(obj)); diff --git a/src/vm.c b/src/vm.c index aecde80a..74a154df 100644 --- a/src/vm.c +++ b/src/vm.c @@ -359,7 +359,7 @@ pic_apply(pic_state *pic, struct pic_proc *proc, pic_value argv) print_irep(pic, proc->u.irep); } else { - printf(" cfunc = %p\n", proc->u.cfunc); + printf(" cfunc = %p\n", (void *)proc->u.cfunc); } puts("\nLet's go!"); #endif @@ -492,7 +492,7 @@ pic_apply(pic_state *pic, struct pic_proc *proc, pic_value argv) print_irep(pic, proc->u.irep); } else { - printf(" cfunc = %p\n", proc->u.cfunc); + printf(" cfunc = %p\n", (void *)proc->u.cfunc); } puts(""); #endif @@ -718,8 +718,8 @@ pic_apply(pic_state *pic, struct pic_proc *proc, pic_value argv) #if VM_DEBUG puts("**VM END STATE**"); - printf("stbase\t= %p\nsp\t= %p\n", pic->stbase, pic->sp); - printf("cibase\t= %p\nci\t= %p\n", pic->cibase, pic->ci); + printf("stbase\t= %p\nsp\t= %p\n", (void *)pic->stbase, (void *)pic->sp); + printf("cibase\t= %p\nci\t= %p\n", (void *)pic->cibase, (void *)pic->ci); if (pic->stbase < pic->sp) { pic_value *sp; printf("* stack trace:");