From 22d339c2f707edb0ca77c5fb2fadb003898699c0 Mon Sep 17 00:00:00 2001 From: Yuichi Nishiwaki Date: Thu, 25 Feb 2016 21:10:29 +0900 Subject: [PATCH] fix build errors --- extlib/benz/debug.c | 6 ++---- extlib/benz/include/picrin/extra.h | 2 +- extlib/benz/number.c | 4 ++-- src/main.c | 2 +- 4 files changed, 6 insertions(+), 8 deletions(-) diff --git a/extlib/benz/debug.c b/extlib/benz/debug.c index ad4592a7..c901e407 100644 --- a/extlib/benz/debug.c +++ b/extlib/benz/debug.c @@ -38,11 +38,9 @@ pic_get_backtrace(pic_state *pic) #if PIC_USE_WRITE void -pic_print_error(pic_state *pic, xFILE *file) +pic_print_error(pic_state *pic, xFILE *file, pic_value err) { - pic_value err = pic_err(pic), port = pic_open_port(pic, file); - - assert(! pic_invalid_p(pic, err)); + pic_value port = pic_open_port(pic, file); if (! pic_error_p(pic, err)) { pic_fprintf(pic, port, "raise: ~s", err); diff --git a/extlib/benz/include/picrin/extra.h b/extlib/benz/include/picrin/extra.h index 78a465bd..bd606e2e 100644 --- a/extlib/benz/include/picrin/extra.h +++ b/extlib/benz/include/picrin/extra.h @@ -98,7 +98,7 @@ xFILE *xfopen_null(pic_state *, const char *mode); void pic_warnf(pic_state *, const char *, ...); pic_value pic_get_backtrace(pic_state *); #if PIC_USE_WRITE -void pic_print_error(pic_state *, xFILE *); +void pic_print_error(pic_state *, xFILE *, pic_value err); #endif #if defined(__cplusplus) diff --git a/extlib/benz/number.c b/extlib/benz/number.c index cd13491a..eae2f41d 100644 --- a/extlib/benz/number.c +++ b/extlib/benz/number.c @@ -255,7 +255,7 @@ pic_number_string_to_number(pic_state *pic) int radix = 10; long num; char *eptr; - pic_value flo, e; + pic_value flo = pic_false_value(pic), e; pic_get_args(pic, "z|i", &str, &radix); @@ -271,7 +271,7 @@ pic_number_string_to_number(pic_state *pic) } pic_catch(e) { /* swallow error */ - flo = pic_false_value(pic); + (void)e; } if (pic_int_p(pic, flo) || pic_float_p(pic, flo)) { diff --git a/src/main.c b/src/main.c index c4628894..354612b9 100644 --- a/src/main.c +++ b/src/main.c @@ -45,7 +45,7 @@ main(int argc, char *argv[], char **envp) status = 0; } pic_catch(e) { - pic_print_error(pic, xstderr); + pic_print_error(pic, xstderr, e); status = 1; }