From 1e8f49872e8a64b5f2fa8bb8a9f51865ecb66f42 Mon Sep 17 00:00:00 2001 From: Yuichi Nishiwaki Date: Mon, 26 Jan 2015 12:22:38 +0900 Subject: [PATCH] s/pic_noreturn/PIC_NORETURN/g --- contrib/03.callcc/callcc.c | 4 ++-- contrib/03.file/src/file.c | 2 +- extlib/benz/include/picrin.h | 4 ++-- extlib/benz/include/picrin/error.h | 6 +++--- extlib/benz/include/picrin/util.h | 6 +++--- extlib/benz/read.c | 2 +- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/contrib/03.callcc/callcc.c b/contrib/03.callcc/callcc.c index fef68f77..8342f0f2 100644 --- a/contrib/03.callcc/callcc.c +++ b/contrib/03.callcc/callcc.c @@ -161,7 +161,7 @@ native_stack_extend(pic_state *pic, struct pic_cont *cont) restore_cont(pic, cont); } -pic_noreturn static void +PIC_NORETURN static void restore_cont(pic_state *pic, struct pic_cont *cont) { char v; @@ -203,7 +203,7 @@ restore_cont(pic_state *pic, struct pic_cont *cont) longjmp(tmp->jmp, 1); } -pic_noreturn static pic_value +PIC_NORETURN static pic_value cont_call(pic_state *pic) { struct pic_proc *proc; diff --git a/contrib/03.file/src/file.c b/contrib/03.file/src/file.c index e3aa1739..8efd2a77 100644 --- a/contrib/03.file/src/file.c +++ b/contrib/03.file/src/file.c @@ -6,7 +6,7 @@ #include "picrin/port.h" #include "picrin/error.h" -pic_noreturn static void +PIC_NORETURN static void file_error(pic_state *pic, const char *msg) { pic_throw(pic, pic->sFILE, msg, pic_nil_value()); diff --git a/extlib/benz/include/picrin.h b/extlib/benz/include/picrin.h index 7c2cf41c..c5980e73 100644 --- a/extlib/benz/include/picrin.h +++ b/extlib/benz/include/picrin.h @@ -220,8 +220,8 @@ void pic_import(pic_state *, pic_value); void pic_import_library(pic_state *, struct pic_lib *); void pic_export(pic_state *, pic_sym *); -pic_noreturn void pic_panic(pic_state *, const char *); -pic_noreturn void pic_errorf(pic_state *, const char *, ...); +PIC_NORETURN void pic_panic(pic_state *, const char *); +PIC_NORETURN void pic_errorf(pic_state *, const char *, ...); void pic_warnf(pic_state *, const char *, ...); const char *pic_errmsg(pic_state *); pic_str *pic_get_backtrace(pic_state *); diff --git a/extlib/benz/include/picrin/error.h b/extlib/benz/include/picrin/error.h index 819c077e..9a290bae 100644 --- a/extlib/benz/include/picrin/error.h +++ b/extlib/benz/include/picrin/error.h @@ -51,9 +51,9 @@ void pic_push_try(pic_state *, struct pic_escape *); void pic_pop_try(pic_state *); pic_value pic_raise_continuable(pic_state *, pic_value); -pic_noreturn void pic_raise(pic_state *, pic_value); -pic_noreturn void pic_throw(pic_state *, pic_sym *, const char *, pic_list); -pic_noreturn void pic_error(pic_state *, const char *, pic_list); +PIC_NORETURN void pic_raise(pic_state *, pic_value); +PIC_NORETURN void pic_throw(pic_state *, pic_sym *, const char *, pic_list); +PIC_NORETURN void pic_error(pic_state *, const char *, pic_list); #if defined(__cplusplus) } diff --git a/extlib/benz/include/picrin/util.h b/extlib/benz/include/picrin/util.h index 8e587e62..2b69b206 100644 --- a/extlib/benz/include/picrin/util.h +++ b/extlib/benz/include/picrin/util.h @@ -11,11 +11,11 @@ extern "C" { #if __STDC_VERSION__ >= 201112L # include -# define pic_noreturn noreturn +# define PIC_NORETURN noreturn #elif __GNUC__ || __clang__ -# define pic_noreturn __attribute__((noreturn)) +# define PIC_NORETURN __attribute__((noreturn)) #else -# define pic_noreturn +# define PIC_NORETURN #endif #if __STDC_VERSION__ >= 199901L diff --git a/extlib/benz/read.c b/extlib/benz/read.c index 5644e739..95f5011f 100644 --- a/extlib/benz/read.c +++ b/extlib/benz/read.c @@ -16,7 +16,7 @@ static pic_value read(pic_state *pic, struct pic_port *port, int c); static pic_value read_nullable(pic_state *pic, struct pic_port *port, int c); -pic_noreturn static void +PIC_NORETURN static void read_error(pic_state *pic, const char *msg) { pic_throw(pic, pic->sREAD, msg, pic_nil_value());