From 5b837b895fdd4e2ef0f057b9fa5c73e31e0869ee Mon Sep 17 00:00:00 2001 From: Paulo Matos Date: Tue, 19 Feb 2019 14:51:10 +0100 Subject: [PATCH] Put all declarations with NORETURN in a single line If declarations are not in a single line makex.rkt gets confused and mis-parses the declarations. --- racket/src/racket/src/schemef.h | 34 +++++++--------------------- racket/src/racket/src/schemex.h | 39 ++++++++++----------------------- 2 files changed, 20 insertions(+), 53 deletions(-) diff --git a/racket/src/racket/src/schemef.h b/racket/src/racket/src/schemef.h index 73189dadfe..d63edb8d24 100644 --- a/racket/src/racket/src/schemef.h +++ b/racket/src/racket/src/schemef.h @@ -221,34 +221,16 @@ MZ_EXTERN void scheme_glib_log_message(const char *log_domain, int log_level, co MZ_EXTERN void *scheme_glib_log_message_test(char *str); MZ_EXTERN void scheme_out_of_memory_abort(); -MZ_EXTERN void scheme_wrong_count(const char *name, int minc, int maxc, - int argc, Scheme_Object **argv) NORETURN; -MZ_EXTERN void scheme_wrong_count_m(const char *name, int minc, int maxc, - int argc, Scheme_Object **argv, - int is_method) NORETURN; -MZ_EXTERN void scheme_case_lambda_wrong_count(const char *name, - int argc, - Scheme_Object **argv, - int is_method, - int count, ...) NORETURN; -MZ_EXTERN void scheme_wrong_type(const char *name, const char *expected, - int which, int argc, - Scheme_Object **argv) NORETURN; -MZ_EXTERN void scheme_wrong_contract(const char *name, const char *expected, - int which, int argc, - Scheme_Object **argv) NORETURN; -MZ_EXTERN void scheme_wrong_field_type(Scheme_Object *c_name, - const char *expected, - Scheme_Object *o) NORETURN; -MZ_EXTERN void scheme_wrong_field_contract(Scheme_Object *c_name, - const char *expected, - Scheme_Object *o) NORETURN; +MZ_EXTERN void scheme_wrong_count(const char *name, int minc, int maxc, int argc, Scheme_Object **argv) NORETURN; +MZ_EXTERN void scheme_wrong_count_m(const char *name, int minc, int maxc, int argc, Scheme_Object **argv, int is_method) NORETURN; +MZ_EXTERN void scheme_case_lambda_wrong_count(const char *name, int argc, Scheme_Object **argv, int is_method, int count, ...) NORETURN; +MZ_EXTERN void scheme_wrong_type(const char *name, const char *expected, int which, int argc, Scheme_Object **argv) NORETURN; +MZ_EXTERN void scheme_wrong_contract(const char *name, const char *expected, int which, int argc, Scheme_Object **argv) NORETURN; +MZ_EXTERN void scheme_wrong_field_type(Scheme_Object *c_name, const char *expected, Scheme_Object *o) NORETURN; +MZ_EXTERN void scheme_wrong_field_contract(Scheme_Object *c_name, const char *expected, Scheme_Object *o) NORETURN; MZ_EXTERN void scheme_arg_mismatch(const char *name, const char *msg, Scheme_Object *o) NORETURN; MZ_EXTERN void scheme_contract_error(const char *name, const char *msg, ...) NORETURN; -MZ_EXTERN void scheme_wrong_return_arity(const char *where, - int expected, int got, - Scheme_Object **argv, - const char *context_detail, ...) NORETURN; +MZ_EXTERN void scheme_wrong_return_arity(const char *where, int expected, int got, Scheme_Object **argv, const char *context_detail, ...) NORETURN; MZ_EXTERN void scheme_unbound_global(Scheme_Bucket *b) NORETURN; MZ_EXTERN Scheme_Object *scheme_dynamic_wind(void (*pre)(void *), diff --git a/racket/src/racket/src/schemex.h b/racket/src/racket/src/schemex.h index e573bd99d8..b57ac0ed6a 100644 --- a/racket/src/racket/src/schemex.h +++ b/racket/src/racket/src/schemex.h @@ -138,7 +138,7 @@ Scheme_On_Atomic_Timeout_Proc (*scheme_set_on_atomic_timeout)(Scheme_On_Atomic_T /*========================================================================*/ /* error handling */ /*========================================================================*/ -void (*scheme_signal_error)(const char *msg, ...); +void (*scheme_signal_error)(const char *msg, ...) NORETURN; void (*scheme_raise_exn)(int exnid, ...) NORETURN; void (*scheme_warning)(char *msg, ...); void (*scheme_raise)(Scheme_Object *exn); @@ -159,32 +159,17 @@ void (*scheme_log_warning)(char *buffer); void (*scheme_glib_log_message)(const char *log_domain, int log_level, const char *message, void *user_data); void *(*scheme_glib_log_message_test)(char *str); void (*scheme_out_of_memory_abort)(); -void (*scheme_wrong_count)(const char *name, int minc, int maxc, - int argc, Scheme_Object **argv); -void (*scheme_wrong_count_m)(const char *name, int minc, int maxc, - int argc, Scheme_Object **argv, - int is_method); -void (*scheme_case_lambda_wrong_count)(const char *name, int argc, - Scheme_Object **argv, int is_method, int count, ...); -void (*scheme_wrong_type)(const char *name, const char *expected, - int which, int argc, - Scheme_Object **argv); -void (*scheme_wrong_contract)(const char *name, const char *expected, - int which, int argc, - Scheme_Object **argv); -void (*scheme_wrong_field_type)(Scheme_Object *c_name, - const char *expected, - Scheme_Object *o); -void (*scheme_wrong_field_contract)(Scheme_Object *c_name, - const char *expected, - Scheme_Object *o); -void (*scheme_arg_mismatch)(const char *name, const char *msg, Scheme_Object *o); -void (*scheme_contract_error)(const char *name, const char *msg, ...); -void (*scheme_wrong_return_arity)(const char *where, - int expected, int got, - Scheme_Object **argv, - const char *context_detail, ...); -void (*scheme_unbound_global)(Scheme_Bucket *b); +void (*scheme_wrong_count)(const char *name, int minc, int maxc, int argc, Scheme_Object **argv) NORETURN; +void (*scheme_wrong_count_m)(const char *name, int minc, int maxc, int argc, Scheme_Object **argv, int is_method) NORETURN; +void (*scheme_case_lambda_wrong_count)(const char *name, int argc, Scheme_Object **argv, int is_method, int count, ...) NORETURN; +void (*scheme_wrong_type)(const char *name, const char *expected, int which, int argc, Scheme_Object **argv) NORETURN; +void (*scheme_wrong_contract)(const char *name, const char *expected, int which, int argc, Scheme_Object **argv) NORETURN; +void (*scheme_wrong_field_type)(Scheme_Object *c_name, const char *expected, Scheme_Object *o) NORETURN; +void (*scheme_wrong_field_contract)(Scheme_Object *c_name, const char *expected, Scheme_Object *o) NORETURN; +void (*scheme_arg_mismatch)(const char *name, const char *msg, Scheme_Object *o) NORETURN; +void (*scheme_contract_error)(const char *name, const char *msg, ...) NORETURN; +void (*scheme_wrong_return_arity)(const char *where, int expected, int got, Scheme_Object **argv, const char *context_detail, ...) NORETURN; +void (*scheme_unbound_global)(Scheme_Bucket *b) NORETURN; Scheme_Object *(*scheme_dynamic_wind)(void (*pre)(void *), Scheme_Object *(* volatile act)(void *), void (* volatile post)(void *),