diff options
author | 卜部昌平 <shyouhei@ruby-lang.org> | 2020-05-04 15:52:56 +0900 |
---|---|---|
committer | 卜部昌平 <shyouhei@ruby-lang.org> | 2020-05-11 09:24:08 +0900 |
commit | 97672f669af53c41b094772559030195787406be (patch) | |
tree | 71902d58cda65825046cff5e42723dfa0d0280af /include/ruby/impl/compiler_is | |
parent | d7f4d732c199df24620a162372c71ee83ed21e62 (diff) |
sed -i s/RUBY3/RBIMPL/g
Devs do not love "3". The only exception is RUBY3_KEYWORDS in parse.y,
which seems unrelated to our interests.
Notes
Notes:
Merged: https://github.com/ruby/ruby/pull/3079
Diffstat (limited to 'include/ruby/impl/compiler_is')
-rw-r--r-- | include/ruby/impl/compiler_is/apple.h | 22 | ||||
-rw-r--r-- | include/ruby/impl/compiler_is/clang.h | 24 | ||||
-rw-r--r-- | include/ruby/impl/compiler_is/gcc.h | 32 | ||||
-rw-r--r-- | include/ruby/impl/compiler_is/intel.h | 28 | ||||
-rw-r--r-- | include/ruby/impl/compiler_is/msvc.h | 44 | ||||
-rw-r--r-- | include/ruby/impl/compiler_is/sunpro.h | 44 |
6 files changed, 97 insertions, 97 deletions
diff --git a/include/ruby/impl/compiler_is/apple.h b/include/ruby/impl/compiler_is/apple.h index b4ff8fd211..a9412feb5f 100644 --- a/include/ruby/impl/compiler_is/apple.h +++ b/include/ruby/impl/compiler_is/apple.h @@ -1,5 +1,5 @@ -#ifndef RUBY3_COMPILER_IS_APPLE_H /*-*-C++-*-vi:se ft=cpp:*/ -#define RUBY3_COMPILER_IS_APPLE_H +#ifndef RBIMPL_COMPILER_IS_APPLE_H /*-*-C++-*-vi:se ft=cpp:*/ +#define RBIMPL_COMPILER_IS_APPLE_H /** * @file * @author Ruby developers <ruby-core@ruby-lang.org> @@ -7,7 +7,7 @@ * Permission is hereby granted, to either redistribute and/or * modify this file, provided that the conditions mentioned in the * file COPYING are met. Consult the file for details. - * @warning Symbols prefixed with either `RUBY3` or `ruby3` are + * @warning Symbols prefixed with either `RBIMPL` or `ruby3` are * implementation details. Don't take them as canon. They could * rapidly appear then vanish. The name (path) of this header file * is also an implementation detail. Do not expect it to persist @@ -18,7 +18,7 @@ * Do not expect for instance `__VA_ARGS__` is always available. * We assume C99 for ruby itself but we don't assume languages of * extension libraries. They could be written in C++98. - * @brief Defines #RUBY3_COMPILER_IS_Apple. + * @brief Defines #RBIMPL_COMPILER_IS_Apple. * * Apple ships clang. Problem is, its `__clang_major__` etc. are not the * upstream LLVM version, but XCode's. We have to think Apple's is distinct @@ -26,16 +26,16 @@ * file. */ #if ! defined(__clang__) -# define RUBY3_COMPILER_IS_Apple 0 +# define RBIMPL_COMPILER_IS_Apple 0 #elif ! defined(__apple_build_version__) -# define RUBY3_COMPILER_IS_Apple 0 +# define RBIMPL_COMPILER_IS_Apple 0 #else -# define RUBY3_COMPILER_IS_Apple 1 -# define RUBY3_COMPILER_VERSION_MAJOR __clang_major__ -# define RUBY3_COMPILER_VERSION_MINOR __clang_minor__ -# define RUBY3_COMPILER_VERSION_PATCH __clang_patchlevel__ +# define RBIMPL_COMPILER_IS_Apple 1 +# define RBIMPL_COMPILER_VERSION_MAJOR __clang_major__ +# define RBIMPL_COMPILER_VERSION_MINOR __clang_minor__ +# define RBIMPL_COMPILER_VERSION_PATCH __clang_patchlevel__ #endif -#endif /* RUBY3_COMPILER_IS_APPLE_H */ +#endif /* RBIMPL_COMPILER_IS_APPLE_H */ diff --git a/include/ruby/impl/compiler_is/clang.h b/include/ruby/impl/compiler_is/clang.h index 03a24473c7..43db01bf22 100644 --- a/include/ruby/impl/compiler_is/clang.h +++ b/include/ruby/impl/compiler_is/clang.h @@ -1,5 +1,5 @@ -#ifndef RUBY3_COMPILER_IS_CLANG_H /*-*-C++-*-vi:se ft=cpp:*/ -#define RUBY3_COMPILER_IS_CLANG_H +#ifndef RBIMPL_COMPILER_IS_CLANG_H /*-*-C++-*-vi:se ft=cpp:*/ +#define RBIMPL_COMPILER_IS_CLANG_H /** * @file * @author Ruby developers <ruby-core@ruby-lang.org> @@ -7,7 +7,7 @@ * Permission is hereby granted, to either redistribute and/or * modify this file, provided that the conditions mentioned in the * file COPYING are met. Consult the file for details. - * @warning Symbols prefixed with either `RUBY3` or `ruby3` are + * @warning Symbols prefixed with either `RBIMPL` or `ruby3` are * implementation details. Don't take them as canon. They could * rapidly appear then vanish. The name (path) of this header file * is also an implementation detail. Do not expect it to persist @@ -18,21 +18,21 @@ * Do not expect for instance `__VA_ARGS__` is always available. * We assume C99 for ruby itself but we don't assume languages of * extension libraries. They could be written in C++98. - * @brief Defines #RUBY3_COMPILER_IS_Clang. + * @brief Defines #RBIMPL_COMPILER_IS_Clang. */ #include "ruby/impl/compiler_is/apple.h" #if ! defined(__clang__) -# define RUBY3_COMPILER_IS_Clang 0 +# define RBIMPL_COMPILER_IS_Clang 0 -#elif RUBY3_COMPILER_IS(Apple) -# define RUBY3_COMPILER_IS_Clang 0 +#elif RBIMPL_COMPILER_IS(Apple) +# define RBIMPL_COMPILER_IS_Clang 0 #else -# define RUBY3_COMPILER_IS_Clang 1 -# define RUBY3_COMPILER_VERSION_MAJOR __clang_major__ -# define RUBY3_COMPILER_VERSION_MINOR __clang_minor__ -# define RUBY3_COMPILER_VERSION_PATCH __clang_patchlevel__ +# define RBIMPL_COMPILER_IS_Clang 1 +# define RBIMPL_COMPILER_VERSION_MAJOR __clang_major__ +# define RBIMPL_COMPILER_VERSION_MINOR __clang_minor__ +# define RBIMPL_COMPILER_VERSION_PATCH __clang_patchlevel__ #endif -#endif /* RUBY3_COMPILER_IS_CLANG_H */ +#endif /* RBIMPL_COMPILER_IS_CLANG_H */ diff --git a/include/ruby/impl/compiler_is/gcc.h b/include/ruby/impl/compiler_is/gcc.h index e1fac3c5a9..39e57b5761 100644 --- a/include/ruby/impl/compiler_is/gcc.h +++ b/include/ruby/impl/compiler_is/gcc.h @@ -1,5 +1,5 @@ -#ifndef RUBY3_COMPILER_IS_GCC_H /*-*-C++-*-vi:se ft=cpp:*/ -#define RUBY3_COMPILER_IS_GCC_H +#ifndef RBIMPL_COMPILER_IS_GCC_H /*-*-C++-*-vi:se ft=cpp:*/ +#define RBIMPL_COMPILER_IS_GCC_H /** * @file * @author Ruby developers <ruby-core@ruby-lang.org> @@ -7,7 +7,7 @@ * Permission is hereby granted, to either redistribute and/or * modify this file, provided that the conditions mentioned in the * file COPYING are met. Consult the file for details. - * @warning Symbols prefixed with either `RUBY3` or `ruby3` are + * @warning Symbols prefixed with either `RBIMPL` or `ruby3` are * implementation details. Don't take them as canon. They could * rapidly appear then vanish. The name (path) of this header file * is also an implementation detail. Do not expect it to persist @@ -18,29 +18,29 @@ * Do not expect for instance `__VA_ARGS__` is always available. * We assume C99 for ruby itself but we don't assume languages of * extension libraries. They could be written in C++98. - * @brief Defines #RUBY3_COMPILER_IS_GCC. + * @brief Defines #RBIMPL_COMPILER_IS_GCC. */ #include "ruby/impl/compiler_is/apple.h" #include "ruby/impl/compiler_is/clang.h" #include "ruby/impl/compiler_is/intel.h" #if ! defined(__GNUC__) -# define RUBY3_COMPILER_IS_GCC 0 +# define RBIMPL_COMPILER_IS_GCC 0 -#elif RUBY3_COMPILER_IS(Apple) -# define RUBY3_COMPILER_IS_GCC 0 +#elif RBIMPL_COMPILER_IS(Apple) +# define RBIMPL_COMPILER_IS_GCC 0 -#elif RUBY3_COMPILER_IS(Clang) -# define RUBY3_COMPILER_IS_GCC 0 +#elif RBIMPL_COMPILER_IS(Clang) +# define RBIMPL_COMPILER_IS_GCC 0 -#elif RUBY3_COMPILER_IS(Intel) -# define RUBY3_COMPILER_IS_GCC 0 +#elif RBIMPL_COMPILER_IS(Intel) +# define RBIMPL_COMPILER_IS_GCC 0 #else -# define RUBY3_COMPILER_IS_GCC 1 -# define RUBY3_COMPILER_VERSION_MAJOR __GNUC__ -# define RUBY3_COMPILER_VERSION_MINOR __GNUC_MINOR__ -# define RUBY3_COMPILER_VERSION_PATCH __GNUC_PATCHLEVEL__ +# define RBIMPL_COMPILER_IS_GCC 1 +# define RBIMPL_COMPILER_VERSION_MAJOR __GNUC__ +# define RBIMPL_COMPILER_VERSION_MINOR __GNUC_MINOR__ +# define RBIMPL_COMPILER_VERSION_PATCH __GNUC_PATCHLEVEL__ #endif -#endif /* RUBY3_COMPILER_IS_GCC_H */ +#endif /* RBIMPL_COMPILER_IS_GCC_H */ diff --git a/include/ruby/impl/compiler_is/intel.h b/include/ruby/impl/compiler_is/intel.h index 605d2d3bdb..61b82d42e8 100644 --- a/include/ruby/impl/compiler_is/intel.h +++ b/include/ruby/impl/compiler_is/intel.h @@ -1,5 +1,5 @@ -#ifndef RUBY3_COMPILER_IS_INTEL_H /*-*-C++-*-vi:se ft=cpp:*/ -#define RUBY3_COMPILER_IS_INTEL_H +#ifndef RBIMPL_COMPILER_IS_INTEL_H /*-*-C++-*-vi:se ft=cpp:*/ +#define RBIMPL_COMPILER_IS_INTEL_H /** * @file * @author Ruby developers <ruby-core@ruby-lang.org> @@ -7,7 +7,7 @@ * Permission is hereby granted, to either redistribute and/or * modify this file, provided that the conditions mentioned in the * file COPYING are met. Consult the file for details. - * @warning Symbols prefixed with either `RUBY3` or `ruby3` are + * @warning Symbols prefixed with either `RBIMPL` or `ruby3` are * implementation details. Don't take them as canon. They could * rapidly appear then vanish. The name (path) of this header file * is also an implementation detail. Do not expect it to persist @@ -18,24 +18,24 @@ * Do not expect for instance `__VA_ARGS__` is always available. * We assume C99 for ruby itself but we don't assume languages of * extension libraries. They could be written in C++98. - * @brief Defines #RUBY3_COMPILER_IS_Intel. + * @brief Defines #RBIMPL_COMPILER_IS_Intel. */ #if ! defined(__INTEL_COMPILER) -# define RUBY3_COMPILER_IS_Intel 0 +# define RBIMPL_COMPILER_IS_Intel 0 #elif ! defined(__INTEL_COMPILER_UPDATE) -# define RUBY3_COMPILER_IS_Intel 1 +# define RBIMPL_COMPILER_IS_Intel 1 # /* __INTEL_COMPILER = XXYZ */ -# define RUBY3_COMPILER_VERSION_MAJOR (__INTEL_COMPILER / 100) -# define RUBY3_COMPILER_VERSION_MINOR (__INTEL_COMPILER % 100 / 10) -# define RUBY3_COMPILER_VERSION_PATCH (__INTEL_COMPILER % 10) +# define RBIMPL_COMPILER_VERSION_MAJOR (__INTEL_COMPILER / 100) +# define RBIMPL_COMPILER_VERSION_MINOR (__INTEL_COMPILER % 100 / 10) +# define RBIMPL_COMPILER_VERSION_PATCH (__INTEL_COMPILER % 10) #else -# define RUBY3_COMPILER_IS_Intel 1 +# define RBIMPL_COMPILER_IS_Intel 1 # /* __INTEL_COMPILER = XXYZ */ -# define RUBY3_COMPILER_VERSION_MAJOR (__INTEL_COMPILER / 100) -# define RUBY3_COMPILER_VERSION_MINOR (__INTEL_COMPILER % 100 / 10) -# define RUBY3_COMPILER_VERSION_PATCH __INTEL_COMPILER_UPDATE +# define RBIMPL_COMPILER_VERSION_MAJOR (__INTEL_COMPILER / 100) +# define RBIMPL_COMPILER_VERSION_MINOR (__INTEL_COMPILER % 100 / 10) +# define RBIMPL_COMPILER_VERSION_PATCH __INTEL_COMPILER_UPDATE #endif -#endif /* RUBY3_COMPILER_IS_INTEL_H */ +#endif /* RBIMPL_COMPILER_IS_INTEL_H */ diff --git a/include/ruby/impl/compiler_is/msvc.h b/include/ruby/impl/compiler_is/msvc.h index 89208797cb..6d380b5937 100644 --- a/include/ruby/impl/compiler_is/msvc.h +++ b/include/ruby/impl/compiler_is/msvc.h @@ -1,5 +1,5 @@ -#ifndef RUBY3_COMPILER_IS_MSVC_H /*-*-C++-*-vi:se ft=cpp:*/ -#define RUBY3_COMPILER_IS_MSVC_H +#ifndef RBIMPL_COMPILER_IS_MSVC_H /*-*-C++-*-vi:se ft=cpp:*/ +#define RBIMPL_COMPILER_IS_MSVC_H /** * @file * @author Ruby developers <ruby-core@ruby-lang.org> @@ -7,7 +7,7 @@ * Permission is hereby granted, to either redistribute and/or * modify this file, provided that the conditions mentioned in the * file COPYING are met. Consult the file for details. - * @warning Symbols prefixed with either `RUBY3` or `ruby3` are + * @warning Symbols prefixed with either `RBIMPL` or `ruby3` are * implementation details. Don't take them as canon. They could * rapidly appear then vanish. The name (path) of this header file * is also an implementation detail. Do not expect it to persist @@ -18,40 +18,40 @@ * Do not expect for instance `__VA_ARGS__` is always available. * We assume C99 for ruby itself but we don't assume languages of * extension libraries. They could be written in C++98. - * @brief Defines #RUBY3_COMPILER_IS_MSVC. + * @brief Defines #RBIMPL_COMPILER_IS_MSVC. */ #include "ruby/impl/compiler_is/clang.h" #include "ruby/impl/compiler_is/intel.h" #if ! defined(_MSC_VER) -# define RUBY3_COMPILER_IS_MSVC 0 +# define RBIMPL_COMPILER_IS_MSVC 0 -#elif RUBY3_COMPILER_IS(Clang) -# define RUBY3_COMPILER_IS_MSVC 0 +#elif RBIMPL_COMPILER_IS(Clang) +# define RBIMPL_COMPILER_IS_MSVC 0 -#elif RUBY3_COMPILER_IS(Intel) -# define RUBY3_COMPILER_IS_MSVC 0 +#elif RBIMPL_COMPILER_IS(Intel) +# define RBIMPL_COMPILER_IS_MSVC 0 #elif _MSC_VER >= 1400 -# define RUBY3_COMPILER_IS_MSVC 1 +# define RBIMPL_COMPILER_IS_MSVC 1 # /* _MSC_FULL_VER = XXYYZZZZZ */ -# define RUBY3_COMPILER_VERSION_MAJOR (_MSC_FULL_VER / 10000000) -# define RUBY3_COMPILER_VERSION_MINOR (_MSC_FULL_VER % 10000000 / 100000) -# define RUBY3_COMPILER_VERSION_PATCH (_MSC_FULL_VER % 100000) +# define RBIMPL_COMPILER_VERSION_MAJOR (_MSC_FULL_VER / 10000000) +# define RBIMPL_COMPILER_VERSION_MINOR (_MSC_FULL_VER % 10000000 / 100000) +# define RBIMPL_COMPILER_VERSION_PATCH (_MSC_FULL_VER % 100000) #elif defined(_MSC_FULL_VER) -# define RUBY3_COMPILER_IS_MSVC 1 +# define RBIMPL_COMPILER_IS_MSVC 1 # /* _MSC_FULL_VER = XXYYZZZZ */ -# define RUBY3_COMPILER_VERSION_MAJOR (_MSC_FULL_VER / 1000000) -# define RUBY3_COMPILER_VERSION_MINOR (_MSC_FULL_VER % 1000000 / 10000) -# define RUBY3_COMPILER_VERSION_PATCH (_MSC_FULL_VER % 10000) +# define RBIMPL_COMPILER_VERSION_MAJOR (_MSC_FULL_VER / 1000000) +# define RBIMPL_COMPILER_VERSION_MINOR (_MSC_FULL_VER % 1000000 / 10000) +# define RBIMPL_COMPILER_VERSION_PATCH (_MSC_FULL_VER % 10000) #else -# define RUBY3_COMPILER_IS_MSVC 1 +# define RBIMPL_COMPILER_IS_MSVC 1 # /* _MSC_VER = XXYY */ -# define RUBY3_COMPILER_VERSION_MAJOR (_MSC_VER / 100) -# define RUBY3_COMPILER_VERSION_MINOR (_MSC_VER % 100) -# define RUBY3_COMPILER_VERSION_PATCH 0 +# define RBIMPL_COMPILER_VERSION_MAJOR (_MSC_VER / 100) +# define RBIMPL_COMPILER_VERSION_MINOR (_MSC_VER % 100) +# define RBIMPL_COMPILER_VERSION_PATCH 0 #endif -#endif /* RUBY3_COMPILER_IS_MSVC_H */ +#endif /* RBIMPL_COMPILER_IS_MSVC_H */ diff --git a/include/ruby/impl/compiler_is/sunpro.h b/include/ruby/impl/compiler_is/sunpro.h index 4c90e09dff..c5fd22b43b 100644 --- a/include/ruby/impl/compiler_is/sunpro.h +++ b/include/ruby/impl/compiler_is/sunpro.h @@ -1,5 +1,5 @@ -#ifndef RUBY3_COMPILER_IS_SUNPRO_H /*-*-C++-*-vi:se ft=cpp:*/ -#define RUBY3_COMPILER_IS_SUNPRO_H +#ifndef RBIMPL_COMPILER_IS_SUNPRO_H /*-*-C++-*-vi:se ft=cpp:*/ +#define RBIMPL_COMPILER_IS_SUNPRO_H /** * @file * @author Ruby developers <ruby-core@ruby-lang.org> @@ -7,7 +7,7 @@ * Permission is hereby granted, to either redistribute and/or * modify this file, provided that the conditions mentioned in the * file COPYING are met. Consult the file for details. - * @warning Symbols prefixed with either `RUBY3` or `ruby3` are + * @warning Symbols prefixed with either `RBIMPL` or `ruby3` are * implementation details. Don't take them as canon. They could * rapidly appear then vanish. The name (path) of this header file * is also an implementation detail. Do not expect it to persist @@ -18,38 +18,38 @@ * Do not expect for instance `__VA_ARGS__` is always available. * We assume C99 for ruby itself but we don't assume languages of * extension libraries. They could be written in C++98. - * @brief Defines #RUBY3_COMPILER_IS_SunPro. + * @brief Defines #RBIMPL_COMPILER_IS_SunPro. */ #if ! (defined(__SUNPRO_C) || defined(__SUNPRO_CC)) -# define RUBY3_COMPILER_IS_SunPro 0 +# define RBIMPL_COMPILER_IS_SunPro 0 #elif defined(__SUNPRO_C) && __SUNPRO_C >= 0x5100 -# define RUBY3_COMPILER_IS_SunPro 1 +# define RBIMPL_COMPILER_IS_SunPro 1 # /* __SUNPRO_C = 0xXYYZ */ -# define TERSE_COMPILER_VERSION_MAJOR (__SUNPRO_C >> 12) -# define TERSE_COMPILER_VERSION_MINOR ((__SUNPRO_C >> 8 & 0xF) * 10 + (__SUNPRO_C >> 4 & 0xF)) -# define TERSE_COMPILER_VERSION_PATCH (__SUNPRO_C & 0xF) +# define RBIMPL_COMPILER_VERSION_MAJOR (__SUNPRO_C >> 12) +# define RBIMPL_COMPILER_VERSION_MINOR ((__SUNPRO_C >> 8 & 0xF) * 10 + (__SUNPRO_C >> 4 & 0xF)) +# define RBIMPL_COMPILER_VERSION_PATCH (__SUNPRO_C & 0xF) #elif defined(__SUNPRO_CC) && __SUNPRO_CC >= 0x5100 -# define RUBY3_COMPILER_IS_SunPro 1 +# define RBIMPL_COMPILER_IS_SunPro 1 # /* __SUNPRO_CC = 0xXYYZ */ -# define TERSE_COMPILER_VERSION_MAJOR (__SUNPRO_CC >> 12) -# define TERSE_COMPILER_VERSION_MINOR ((__SUNPRO_CC >> 8 & 0xF) * 10 + (__SUNPRO_CC >> 4 & 0xF)) -# define TERSE_COMPILER_VERSION_PATCH (__SUNPRO_CC & 0xF) +# define RBIMPL_COMPILER_VERSION_MAJOR (__SUNPRO_CC >> 12) +# define RBIMPL_COMPILER_VERSION_MINOR ((__SUNPRO_CC >> 8 & 0xF) * 10 + (__SUNPRO_CC >> 4 & 0xF)) +# define RBIMPL_COMPILER_VERSION_PATCH (__SUNPRO_CC & 0xF) #elif defined(__SUNPRO_C) -# define RUBY3_COMPILER_IS_SunPro 1 +# define RBIMPL_COMPILER_IS_SunPro 1 # /* __SUNPRO_C = 0xXYZ */ -# define TERSE_COMPILER_VERSION_MAJOR (__SUNPRO_C >> 8) -# define TERSE_COMPILER_VERSION_MINOR (__SUNPRO_C >> 4 & 0xF) -# define TERSE_COMPILER_VERSION_PATCH (__SUNPRO_C & 0xF) +# define RBIMPL_COMPILER_VERSION_MAJOR (__SUNPRO_C >> 8) +# define RBIMPL_COMPILER_VERSION_MINOR (__SUNPRO_C >> 4 & 0xF) +# define RBIMPL_COMPILER_VERSION_PATCH (__SUNPRO_C & 0xF) #else -# define RUBY3_COMPILER_IS_SunPro 1 +# define RBIMPL_COMPILER_IS_SunPro 1 # /* __SUNPRO_CC = 0xXYZ */ -# define TERSE_COMPILER_VERSION_MAJOR (__SUNPRO_CC >> 8) -# define TERSE_COMPILER_VERSION_MINOR (__SUNPRO_CC >> 4 & 0xF) -# define TERSE_COMPILER_VERSION_PATCH (__SUNPRO_CC & 0xF) +# define RBIMPL_COMPILER_VERSION_MAJOR (__SUNPRO_CC >> 8) +# define RBIMPL_COMPILER_VERSION_MINOR (__SUNPRO_CC >> 4 & 0xF) +# define RBIMPL_COMPILER_VERSION_PATCH (__SUNPRO_CC & 0xF) #endif -#endif /* RUBY3_COMPILER_IS_SUNPRO_H */ +#endif /* RBIMPL_COMPILER_IS_SUNPRO_H */ |