1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add rb_warn_reserved_name_at

Browse Source
This commit is contained in:
Nobuyoshi Nakada 2024-12-12 15:33:24 +09:00 committed by Nobuyoshi Nakada
parent 46e8a26c17
commit 267ecf5f02
Notes: git 2024-12-12 08:45:25 +00:00 
Merged: https://github.com/ruby/ruby/pull/12315
2 changed files with 37 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
error.c
View File

@ -575,6 +575,18 @@ rb_warn_deprecated_to_remove(const char *removal, const char *fmt, const char *s
}
}
void
rb_warn_reserved_name(const char *coming, const char *fmt, ...)
{
if (!deprecation_warning_enabled()) return;
with_warning_string_from(mesg, 0, fmt, fmt) {
rb_str_set_len(mesg, RSTRING_LEN(mesg) - 1);
rb_str_catf(mesg, " is reserved for Ruby %s\n", coming);
rb_warn_category(mesg, ID2SYM(id_deprecated));
}
}
static inline int
end_with_asciichar(VALUE str, int c)
{

25
internal/error.h
View File

@ -72,6 +72,7 @@ const char *rb_builtin_type_name(int t);
const char *rb_builtin_class_name(VALUE x);
PRINTF_ARGS(void rb_warn_deprecated(const char *fmt, const char *suggest, ...), 1, 3);
PRINTF_ARGS(void rb_warn_deprecated_to_remove(const char *removal, const char *fmt, const char *suggest, ...), 2, 4);
PRINTF_ARGS(void rb_warn_reserved_name(const char *removal, const char *fmt, ...), 2, 3);
#if RUBY_DEBUG
# include "ruby/version.h"
# define RUBY_VERSION_SINCE(major, minor) (RUBY_API_VERSION_CODE >= (major * 10000) + (minor) * 100)
@ -110,6 +111,14 @@ rb_deprecated_method_to_be_removed(const char *removal)
RBIMPL_ATTR_DIAGNOSE_IF(RUBY_VERSION_STRING_SINCE(removal), "deprecated method to be removed", "error")
{
}
RBIMPL_ATTR_FORCEINLINE()
static void
rb_diagnose_reserved_name_at(const char *coming)
RBIMPL_ATTR_DIAGNOSE_IF(!RUBY_VERSION_isdigit(coming[0]), "malformed version number", "error")
RBIMPL_ATTR_DIAGNOSE_IF(RUBY_VERSION_STRING_SINCE(coming), "reserved name already in use", "error")
{
}
# else
RBIMPL_ATTR_ERROR(("deprecated"))
void rb_deprecated_method_to_be_removed(const char *);
@ -117,16 +126,32 @@ void rb_deprecated_method_to_be_removed(const char *);
(sizeof(char[1-2*(!RUBY_VERSION_isdigit(removal[0]) || RUBY_VERSION_STRING_SINCE(removal))])!=1 ? \
rb_deprecated_method_to_be_removed(removal) : \
RBIMPL_ASSERT_NOTHING)
RBIMPL_ATTR_ERROR(("deprecated"))
void rb_diagnose_reserved_name_at(const char *);
# define rb_diagnose_reserved_name_at(coming) \
(sizeof(char[1-2*(!RUBY_VERSION_isdigit(coming[0]) || RUBY_VERSION_STRING_SINCE(coming))])!=1 ? \
rb_diagnose_reserved_name_at(coming) : \
RBIMPL_ASSERT_NOTHING)
# endif
# define rb_warn_deprecated_to_remove_at(removal, ...) \
(rb_deprecated_method_to_be_removed(#removal), \
rb_warn_deprecated_to_remove(#removal, __VA_ARGS__))
# define rb_warn_reserved_name_at(coming, ...) \
(rb_diagnose_reserved_name_at(#coming), \
rb_warn_reserved_name(#coming, __VA_ARGS__))
# endif
#endif
#ifndef rb_warn_deprecated_to_remove_at
# define rb_warn_deprecated_to_remove_at(removal, ...) \
rb_warn_deprecated_to_remove(#removal, __VA_ARGS__)
#endif
#ifndef rb_warn_reserved_name_at
# define rb_warn_reserved_name_at(removal, ...) \
rb_warn_reserved_name(#removal, __VA_ARGS__)
#endif
#ifndef RUBY_VERSION_SINCE
# define RUBY_VERSION_SINCE(major, minor) 0
#endif