ruby-changes:45600
From: nobu <ko1@a...>
Date: Tue, 21 Feb 2017 15:07:27 +0900 (JST)
Subject: [ruby-changes:45600] nobu:r57673 (trunk): error.c: remove deprecated internal features
nobu 2017-02-21 15:07:22 +0900 (Tue, 21 Feb 2017) New Revision: 57673 https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=57673 Log: error.c: remove deprecated internal features Modified files: trunk/error.c trunk/include/ruby/backward.h trunk/include/ruby/intern.h Index: error.c =================================================================== --- error.c (revision 57672) +++ error.c (revision 57673) @@ -130,24 +130,6 @@ rb_syntax_error_append(VALUE exc, VALUE https://github.com/ruby/ruby/blob/trunk/error.c#L130 } void -rb_compile_error_with_enc(const char *file, int line, void *enc, const char *fmt, ...) -{ - DEPRECATED_INTERNAL_FEATURE("rb_compile_error_with_enc()"); -} - -void -rb_compile_error(const char *file, int line, const char *fmt, ...) -{ - DEPRECATED_INTERNAL_FEATURE("rb_compile_error()"); -} - -void -rb_compile_error_append(const char *fmt, ...) -{ - DEPRECATED_INTERNAL_FEATURE("rb_compile_error_append()"); -} - -void ruby_deprecated_internal_feature(const char *func) { rb_print_backtrace(); Index: include/ruby/backward.h =================================================================== --- include/ruby/backward.h (revision 57672) +++ include/ruby/backward.h (revision 57673) @@ -24,6 +24,17 @@ DECLARE_DEPRECATED_FEATURE(2.2, rb_str_a https://github.com/ruby/ruby/blob/trunk/include/ruby/backward.h#L24 DECLARE_DEPRECATED_FEATURE(2.2, rb_clear_cache); DECLARE_DEPRECATED_FEATURE(2.2, rb_frame_pop); +#define DECLARE_DEPRECATED_INTERNAL_FEATURE(func) \ + NORETURN(ERRORFUNC(("deprecated internal function"), DEPRECATED(void func(void)))) + +/* error.c */ +DECLARE_DEPRECATED_INTERNAL_FEATURE(rb_compile_error); +DECLARE_DEPRECATED_INTERNAL_FEATURE(rb_compile_error_with_enc); +DECLARE_DEPRECATED_INTERNAL_FEATURE(rb_compile_error_append); + +/* struct.c */ +DECLARE_DEPRECATED_INTERNAL_FEATURE(rb_struct_ptr); + /* from version.c */ #ifndef RUBY_SHOW_COPYRIGHT_TO_DIE # define RUBY_SHOW_COPYRIGHT_TO_DIE 1 Index: include/ruby/intern.h =================================================================== --- include/ruby/intern.h (revision 57672) +++ include/ruby/intern.h (revision 57673) @@ -247,9 +247,6 @@ PRINTF_ARGS(NORETURN(void rb_loaderror_w https://github.com/ruby/ruby/blob/trunk/include/ruby/intern.h#L247 PRINTF_ARGS(NORETURN(void rb_name_error(ID, const char*, ...)), 2, 3); PRINTF_ARGS(NORETURN(void rb_name_error_str(VALUE, const char*, ...)), 2, 3); NORETURN(void rb_invalid_str(const char*, const char*)); -NORETURN(DEPRECATED(PRINTF_ARGS(void rb_compile_error(const char*, int, const char*, ...), 3, 4))); -NORETURN(DEPRECATED(PRINTF_ARGS(void rb_compile_error_with_enc(const char*, int, void *, const char*, ...), 4, 5))); -NORETURN(DEPRECATED(PRINTF_ARGS(void rb_compile_error_append(const char*, ...), 1, 2))); NORETURN(void rb_error_frozen(const char*)); NORETURN(void rb_error_frozen_object(VALUE)); CONSTFUNC(void rb_error_untrusted(VALUE)); -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/