From 6877de73deb7fe75a736a0b5fc54c01ecc0d5b14 Mon Sep 17 00:00:00 2001 From: nobu Date: Fri, 17 Feb 2017 05:45:44 +0000 Subject: DEPRECATED_INTERNAL_FEATURE * error.c (ruby_deprecated_internal_feature): renamed, to explicitly represent deprecation. * internal.h (DEPRECATED_INTERNAL_FEATURE): ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@57643 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- error.c | 8 ++++---- internal.h | 5 +++-- pack.c | 4 ++-- variable.c | 3 +-- vm.c | 2 +- vm_method.c | 2 +- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/error.c b/error.c index 8c5430a134..d174464bbf 100644 --- a/error.c +++ b/error.c @@ -132,23 +132,23 @@ rb_syntax_error_append(VALUE exc, VALUE file, int line, int column, void rb_compile_error_with_enc(const char *file, int line, void *enc, const char *fmt, ...) { - ONLY_FOR_INTERNAL_USE("rb_compile_error_with_enc()"); + DEPRECATED_INTERNAL_FEATURE("rb_compile_error_with_enc()"); } void rb_compile_error(const char *file, int line, const char *fmt, ...) { - ONLY_FOR_INTERNAL_USE("rb_compile_error()"); + DEPRECATED_INTERNAL_FEATURE("rb_compile_error()"); } void rb_compile_error_append(const char *fmt, ...) { - ONLY_FOR_INTERNAL_USE("rb_compile_error_append()"); + DEPRECATED_INTERNAL_FEATURE("rb_compile_error_append()"); } void -ruby_only_for_internal_use(const char *func) +ruby_deprecated_internal_feature(const char *func) { rb_print_backtrace(); rb_fatal("%s is only for internal use and deprecated; do not use", func); diff --git a/internal.h b/internal.h index 5baac16957..4bdc416b3a 100644 --- a/internal.h +++ b/internal.h @@ -1083,8 +1083,9 @@ VALUE rb_name_err_new(VALUE mesg, VALUE recv, VALUE method); rb_exc_raise(rb_name_err_new(mesg, recv, name)) #define rb_name_err_raise(mesg, recv, name) \ rb_name_err_raise_str(rb_fstring_cstr(mesg), (recv), (name)) -NORETURN(void ruby_only_for_internal_use(const char *)); -#define ONLY_FOR_INTERNAL_USE(func) ruby_only_for_internal_use(func) +NORETURN(void ruby_deprecated_internal_feature(const char *)); +#define DEPRECATED_INTERNAL_FEATURE(func) \ + (ruby_deprecated_internal_feature(func), UNREACHABLE) /* eval.c */ VALUE rb_refinement_module_get_refined_class(VALUE module); diff --git a/pack.c b/pack.c index d275a286b0..4dd5b2386f 100644 --- a/pack.c +++ b/pack.c @@ -129,13 +129,13 @@ str_associated(VALUE str) void rb_str_associate(VALUE str, VALUE add) { - ONLY_FOR_INTERNAL_USE("rb_str_associate()"); + DEPRECATED_INTERNAL_FEATURE("rb_str_associate()"); } VALUE rb_str_associated(VALUE str) { - ONLY_FOR_INTERNAL_USE("rb_str_associated()"); + DEPRECATED_INTERNAL_FEATURE("rb_str_associated()"); } /* diff --git a/variable.c b/variable.c index 5318a94dbe..4d80ce2afd 100644 --- a/variable.c +++ b/variable.c @@ -1007,8 +1007,7 @@ rb_generic_ivar_table(VALUE obj) return a.tbl; #else - ONLY_FOR_INTERNAL_USE("rb_generic_ivar_table()"); - UNREACHABLE; + DEPRECATED_INTERNAL_FEATURE("rb_generic_ivar_table()"); return 0; #endif } diff --git a/vm.c b/vm.c index 256085ce00..5b1238a4b8 100644 --- a/vm.c +++ b/vm.c @@ -548,7 +548,7 @@ rb_vm_rewind_cfp(rb_thread_t *th, rb_control_frame_t *cfp) void rb_frame_pop(void) { - ONLY_FOR_INTERNAL_USE("rb_frame_pop()"); + DEPRECATED_INTERNAL_FEATURE("rb_frame_pop()"); } /* at exit */ diff --git a/vm_method.c b/vm_method.c index 57b805406c..dd5b921d7e 100644 --- a/vm_method.c +++ b/vm_method.c @@ -83,7 +83,7 @@ rb_class_clear_method_cache(VALUE klass, VALUE arg) void rb_clear_cache(void) { - ONLY_FOR_INTERNAL_USE("rb_clear_cache()"); + DEPRECATED_INTERNAL_FEATURE("rb_clear_cache()"); } void -- cgit v1.2.3