diff options
Diffstat (limited to 'include/ruby')
158 files changed, 673 insertions, 673 deletions
diff --git a/include/ruby/assert.h b/include/ruby/assert.h index 69e160cc39..7e59da6662 100644 --- a/include/ruby/assert.h +++ b/include/ruby/assert.h @@ -20,11 +20,11 @@ * We assume C99 for ruby itself but we don't assume languages of * extension libraries. They could be written in C++98. */ -#include "ruby/impl/assume.h" -#include "ruby/impl/attr/cold.h" -#include "ruby/impl/attr/noreturn.h" -#include "ruby/impl/cast.h" -#include "ruby/impl/dllexport.h" +#include "ruby/internal/assume.h" +#include "ruby/internal/attr/cold.h" +#include "ruby/internal/attr/noreturn.h" +#include "ruby/internal/cast.h" +#include "ruby/internal/dllexport.h" #include "ruby/backward/2/assume.h" #ifndef RUBY_DEBUG diff --git a/include/ruby/backward.h b/include/ruby/backward.h index 15040d5aaa..84abba2dab 100644 --- a/include/ruby/backward.h +++ b/include/ruby/backward.h @@ -8,9 +8,9 @@ * modify this file, provided that the conditions mentioned in the * file COPYING are met. Consult the file for details. */ -#include "ruby/impl/core/rbasic.h" -#include "ruby/impl/value.h" -#include "ruby/impl/interpreter.h" +#include "ruby/internal/core/rbasic.h" +#include "ruby/internal/value.h" +#include "ruby/internal/interpreter.h" #include "ruby/backward/2/attributes.h" #define RClass RClassDeprecated diff --git a/include/ruby/backward/2/assume.h b/include/ruby/backward/2/assume.h index e512ff2430..3fbb81439a 100644 --- a/include/ruby/backward/2/assume.h +++ b/include/ruby/backward/2/assume.h @@ -20,9 +20,9 @@ * extension libraries. They could be written in C++98. * @brief Defines #ASSUME / #RB_LIKELY / #UNREACHABLE */ -#include "ruby/impl/config.h" -#include "ruby/impl/assume.h" -#include "ruby/impl/has/builtin.h" +#include "ruby/internal/config.h" +#include "ruby/internal/assume.h" +#include "ruby/internal/has/builtin.h" #undef ASSUME /* Kill config.h definition */ #undef UNREACHABLE /* Kill config.h definition */ diff --git a/include/ruby/backward/2/attributes.h b/include/ruby/backward/2/attributes.h index fb59d91beb..8d00da0a9e 100644 --- a/include/ruby/backward/2/attributes.h +++ b/include/ruby/backward/2/attributes.h @@ -28,23 +28,23 @@ * - A: Don't know. Don't blame me. Backward compatibility is the key here. * I'm just preserving what they have been. */ -#include "ruby/impl/config.h" -#include "ruby/impl/attr/alloc_size.h" -#include "ruby/impl/attr/cold.h" -#include "ruby/impl/attr/const.h" -#include "ruby/impl/attr/deprecated.h" -#include "ruby/impl/attr/error.h" -#include "ruby/impl/attr/forceinline.h" -#include "ruby/impl/attr/format.h" -#include "ruby/impl/attr/maybe_unused.h" -#include "ruby/impl/attr/noinline.h" -#include "ruby/impl/attr/nonnull.h" -#include "ruby/impl/attr/noreturn.h" -#include "ruby/impl/attr/pure.h" -#include "ruby/impl/attr/restrict.h" -#include "ruby/impl/attr/returns_nonnull.h" -#include "ruby/impl/attr/warning.h" -#include "ruby/impl/has/attribute.h" +#include "ruby/internal/config.h" +#include "ruby/internal/attr/alloc_size.h" +#include "ruby/internal/attr/cold.h" +#include "ruby/internal/attr/const.h" +#include "ruby/internal/attr/deprecated.h" +#include "ruby/internal/attr/error.h" +#include "ruby/internal/attr/forceinline.h" +#include "ruby/internal/attr/format.h" +#include "ruby/internal/attr/maybe_unused.h" +#include "ruby/internal/attr/noinline.h" +#include "ruby/internal/attr/nonnull.h" +#include "ruby/internal/attr/noreturn.h" +#include "ruby/internal/attr/pure.h" +#include "ruby/internal/attr/restrict.h" +#include "ruby/internal/attr/returns_nonnull.h" +#include "ruby/internal/attr/warning.h" +#include "ruby/internal/has/attribute.h" /* function attributes */ #undef CONSTFUNC diff --git a/include/ruby/backward/2/bool.h b/include/ruby/backward/2/bool.h index 08c01fc4f3..53164eb3b8 100644 --- a/include/ruby/backward/2/bool.h +++ b/include/ruby/backward/2/bool.h @@ -20,7 +20,7 @@ * extension libraries. They could be written in C++98. * @brief Defines old #TRUE / #FALSE */ -#include "ruby/impl/stdbool.h" +#include "ruby/internal/stdbool.h" #ifndef FALSE # define FALSE false diff --git a/include/ruby/backward/2/extern.h b/include/ruby/backward/2/extern.h index d7c3e36df5..e858426b19 100644 --- a/include/ruby/backward/2/extern.h +++ b/include/ruby/backward/2/extern.h @@ -20,7 +20,7 @@ * extension libraries. They could be written in C++98. * @brief Defines old #EXTERN */ -#include "ruby/impl/config.h" /* for STRINGIZE */ +#include "ruby/internal/config.h" /* for STRINGIZE */ /** * @brief Synonym of #RUBY_EXTERN. diff --git a/include/ruby/backward/2/gcc_version_since.h b/include/ruby/backward/2/gcc_version_since.h index bc376bed10..2a5b76c102 100644 --- a/include/ruby/backward/2/gcc_version_since.h +++ b/include/ruby/backward/2/gcc_version_since.h @@ -20,7 +20,7 @@ * extension libraries. They could be written in C++98. * @brief Defines old #GCC_VERSION_SINCE */ -#include "ruby/impl/compiler_since.h" +#include "ruby/internal/compiler_since.h" #ifndef GCC_VERSION_SINCE #define GCC_VERSION_SINCE(x, y, z) RBIMPL_COMPILER_SINCE(GCC, (x), (y), (z)) diff --git a/include/ruby/backward/2/inttypes.h b/include/ruby/backward/2/inttypes.h index 732c8a17c5..c1e376a107 100644 --- a/include/ruby/backward/2/inttypes.h +++ b/include/ruby/backward/2/inttypes.h @@ -20,13 +20,13 @@ * extension libraries. They could be written in C++98. * @brief C99 shim for `<inttypes.h>` */ -#include "ruby/impl/config.h" /* PRI_LL_PREFIX etc. are here */ +#include "ruby/internal/config.h" /* PRI_LL_PREFIX etc. are here */ #ifdef HAVE_INTTYPES_H # include <inttypes.h> #endif -#include "ruby/impl/value.h" /* PRI_VALUE_PREFIX is here. */ +#include "ruby/internal/value.h" /* PRI_VALUE_PREFIX is here. */ #ifndef PRI_INT_PREFIX # define PRI_INT_PREFIX "" diff --git a/include/ruby/backward/2/limits.h b/include/ruby/backward/2/limits.h index f92db8b0d0..e38009b01a 100644 --- a/include/ruby/backward/2/limits.h +++ b/include/ruby/backward/2/limits.h @@ -23,7 +23,7 @@ * The macros in this header file are obsolescent. Does anyone really need our * own definition of #CHAR_BIT today? */ -#include "ruby/impl/config.h" +#include "ruby/internal/config.h" #ifdef HAVE_LIMITS_H # include <limits.h> diff --git a/include/ruby/backward/2/long_long.h b/include/ruby/backward/2/long_long.h index e2dcf9542e..83eabb459c 100644 --- a/include/ruby/backward/2/long_long.h +++ b/include/ruby/backward/2/long_long.h @@ -25,9 +25,9 @@ * while ago (some time back in 2013). The macros are for backwards * compatibility only. */ -#include "ruby/impl/config.h" -#include "ruby/impl/has/warning.h" -#include "ruby/impl/warning_push.h" +#include "ruby/internal/config.h" +#include "ruby/internal/has/warning.h" +#include "ruby/internal/warning_push.h" #if RBIMPL_HAS_WARNING("-Wc++11-long-long") # define HAVE_TRUE_LONG_LONG 1 diff --git a/include/ruby/backward/2/stdalign.h b/include/ruby/backward/2/stdalign.h index 26c9b1b904..2d3c333bde 100644 --- a/include/ruby/backward/2/stdalign.h +++ b/include/ruby/backward/2/stdalign.h @@ -20,7 +20,7 @@ * extension libraries. They could be written in C++98. * @brief Defines #RUBY_ALIGNAS / #RUBY_ALIGNOF */ -#include "ruby/impl/stdalign.h" +#include "ruby/internal/stdalign.h" #undef RUBY_ALIGNAS #undef RUBY_ALIGNOF diff --git a/include/ruby/backward/cxxanyargs.hpp b/include/ruby/backward/cxxanyargs.hpp index 3cc36c15d6..bc5745d850 100644 --- a/include/ruby/backward/cxxanyargs.hpp +++ b/include/ruby/backward/cxxanyargs.hpp @@ -10,18 +10,18 @@ /// meant to be a backwards compatibility shim. Please stick to /// C++ 98 and never use newer features, like `constexpr`. /// @brief Provides old prototypes for C++ programs. -#include "ruby/impl/config.h" -#include "ruby/impl/intern/class.h" -#include "ruby/impl/intern/cont.h" -#include "ruby/impl/intern/hash.h" -#include "ruby/impl/intern/proc.h" -#include "ruby/impl/intern/thread.h" -#include "ruby/impl/intern/variable.h" -#include "ruby/impl/intern/vm.h" -#include "ruby/impl/iterator.h" -#include "ruby/impl/method.h" -#include "ruby/impl/value.h" -#include "ruby/impl/variable.h" +#include "ruby/internal/config.h" +#include "ruby/internal/intern/class.h" +#include "ruby/internal/intern/cont.h" +#include "ruby/internal/intern/hash.h" +#include "ruby/internal/intern/proc.h" +#include "ruby/internal/intern/thread.h" +#include "ruby/internal/intern/variable.h" +#include "ruby/internal/intern/vm.h" +#include "ruby/internal/iterator.h" +#include "ruby/internal/method.h" +#include "ruby/internal/value.h" +#include "ruby/internal/variable.h" #include "ruby/backward/2/stdarg.h" #include "ruby/st.h" diff --git a/include/ruby/debug.h b/include/ruby/debug.h index bb187ce43a..16891e8458 100644 --- a/include/ruby/debug.h +++ b/include/ruby/debug.h @@ -10,9 +10,9 @@ * modify this file, provided that the conditions mentioned in the * file COPYING are met. Consult the file for details. */ -#include "ruby/impl/dllexport.h" -#include "ruby/impl/event.h" -#include "ruby/impl/value.h" +#include "ruby/internal/dllexport.h" +#include "ruby/internal/event.h" +#include "ruby/internal/value.h" RBIMPL_SYMBOL_EXPORT_BEGIN() diff --git a/include/ruby/defines.h b/include/ruby/defines.h index 6ea005be34..2c84739b39 100644 --- a/include/ruby/defines.h +++ b/include/ruby/defines.h @@ -10,7 +10,7 @@ * file COPYING are met. Consult the file for details. */ -#include "ruby/impl/config.h" +#include "ruby/internal/config.h" /* AC_INCLUDES_DEFAULT */ #include <stdio.h> @@ -67,9 +67,9 @@ # include <setjmpex.h> #endif -#include "ruby/impl/dllexport.h" -#include "ruby/impl/dosish.h" -#include "ruby/impl/xmalloc.h" +#include "ruby/internal/dllexport.h" +#include "ruby/internal/dosish.h" +#include "ruby/internal/xmalloc.h" #include "ruby/backward/2/assume.h" #include "ruby/backward/2/attributes.h" #include "ruby/backward/2/bool.h" diff --git a/include/ruby/encoding.h b/include/ruby/encoding.h index 06cc9ea56e..01cbf8bb75 100644 --- a/include/ruby/encoding.h +++ b/include/ruby/encoding.h @@ -10,11 +10,11 @@ * modify this file, provided that the conditions mentioned in the * file COPYING are met. Consult the file for details. */ -#include "ruby/impl/config.h" +#include "ruby/internal/config.h" #include <stdarg.h> #include "ruby/ruby.h" #include "ruby/oniguruma.h" -#include "ruby/impl/dllexport.h" +#include "ruby/internal/dllexport.h" RBIMPL_SYMBOL_EXPORT_BEGIN() diff --git a/include/ruby/intern.h b/include/ruby/intern.h index 38a48edf19..9ca521ad4f 100644 --- a/include/ruby/intern.h +++ b/include/ruby/intern.h @@ -12,7 +12,7 @@ * modify this file, provided that the conditions mentioned in the * file COPYING are met. Consult the file for details. */ -#include "ruby/impl/config.h" +#include "ruby/internal/config.h" #include "ruby/defines.h" #ifdef HAVE_STDARG_PROTOTYPES @@ -28,41 +28,41 @@ * the kernel. */ -#include "ruby/impl/intern/array.h" -#include "ruby/impl/intern/bignum.h" -#include "ruby/impl/intern/class.h" -#include "ruby/impl/intern/compar.h" -#include "ruby/impl/intern/complex.h" -#include "ruby/impl/intern/cont.h" -#include "ruby/impl/intern/dir.h" -#include "ruby/impl/intern/enum.h" -#include "ruby/impl/intern/enumerator.h" -#include "ruby/impl/intern/error.h" -#include "ruby/impl/intern/eval.h" -#include "ruby/impl/intern/file.h" -#include "ruby/impl/intern/gc.h" -#include "ruby/impl/intern/hash.h" -#include "ruby/impl/intern/io.h" -#include "ruby/impl/intern/load.h" -#include "ruby/impl/intern/marshal.h" -#include "ruby/impl/intern/numeric.h" -#include "ruby/impl/intern/object.h" -#include "ruby/impl/intern/parse.h" -#include "ruby/impl/intern/proc.h" -#include "ruby/impl/intern/process.h" -#include "ruby/impl/intern/random.h" -#include "ruby/impl/intern/range.h" -#include "ruby/impl/intern/rational.h" -#include "ruby/impl/intern/re.h" -#include "ruby/impl/intern/ruby.h" -#include "ruby/impl/intern/select.h" -#include "ruby/impl/intern/signal.h" -#include "ruby/impl/intern/sprintf.h" -#include "ruby/impl/intern/string.h" -#include "ruby/impl/intern/struct.h" -#include "ruby/impl/intern/thread.h" -#include "ruby/impl/intern/time.h" -#include "ruby/impl/intern/variable.h" -#include "ruby/impl/intern/vm.h" +#include "ruby/internal/intern/array.h" +#include "ruby/internal/intern/bignum.h" +#include "ruby/internal/intern/class.h" +#include "ruby/internal/intern/compar.h" +#include "ruby/internal/intern/complex.h" +#include "ruby/internal/intern/cont.h" +#include "ruby/internal/intern/dir.h" +#include "ruby/internal/intern/enum.h" +#include "ruby/internal/intern/enumerator.h" +#include "ruby/internal/intern/error.h" +#include "ruby/internal/intern/eval.h" +#include "ruby/internal/intern/file.h" +#include "ruby/internal/intern/gc.h" +#include "ruby/internal/intern/hash.h" +#include "ruby/internal/intern/io.h" +#include "ruby/internal/intern/load.h" +#include "ruby/internal/intern/marshal.h" +#include "ruby/internal/intern/numeric.h" +#include "ruby/internal/intern/object.h" +#include "ruby/internal/intern/parse.h" +#include "ruby/internal/intern/proc.h" +#include "ruby/internal/intern/process.h" +#include "ruby/internal/intern/random.h" +#include "ruby/internal/intern/range.h" +#include "ruby/internal/intern/rational.h" +#include "ruby/internal/intern/re.h" +#include "ruby/internal/intern/ruby.h" +#include "ruby/internal/intern/select.h" +#include "ruby/internal/intern/signal.h" +#include "ruby/internal/intern/sprintf.h" +#include "ruby/internal/intern/string.h" +#include "ruby/internal/intern/struct.h" +#include "ruby/internal/intern/thread.h" +#include "ruby/internal/intern/time.h" +#include "ruby/internal/intern/variable.h" +#include "ruby/internal/intern/vm.h" #endif /* RUBY_INTERN_H */ diff --git a/include/ruby/internal/anyargs.h b/include/ruby/internal/anyargs.h index 78c979eac0..f09a4e72e9 100644 --- a/include/ruby/internal/anyargs.h +++ b/include/ruby/internal/anyargs.h @@ -67,16 +67,16 @@ * `__builtin_types_compatible_p`, and in doing so we need to distinguish * ::rb_f_notimplement from others, by type. */ -#include "ruby/impl/attr/maybe_unused.h" -#include "ruby/impl/attr/nonnull.h" -#include "ruby/impl/attr/weakref.h" -#include "ruby/impl/cast.h" -#include "ruby/impl/config.h" -#include "ruby/impl/has/attribute.h" -#include "ruby/impl/intern/class.h" -#include "ruby/impl/intern/vm.h" -#include "ruby/impl/method.h" -#include "ruby/impl/value.h" +#include "ruby/internal/attr/maybe_unused.h" +#include "ruby/internal/attr/nonnull.h" +#include "ruby/internal/attr/weakref.h" +#include "ruby/internal/cast.h" +#include "ruby/internal/config.h" +#include "ruby/internal/has/attribute.h" +#include "ruby/internal/intern/class.h" +#include "ruby/internal/intern/vm.h" +#include "ruby/internal/method.h" +#include "ruby/internal/value.h" #include "ruby/backward/2/stdarg.h" #if defined(__cplusplus) diff --git a/include/ruby/internal/arithmetic.h b/include/ruby/internal/arithmetic.h index f93fa581cd..c3806db444 100644 --- a/include/ruby/internal/arithmetic.h +++ b/include/ruby/internal/arithmetic.h @@ -20,19 +20,19 @@ * extension libraries. They could be written in C++98. * @brief Conversion between C's arithmtic types and Ruby's numeric types. */ -#include "ruby/impl/arithmetic/char.h" -#include "ruby/impl/arithmetic/double.h" -#include "ruby/impl/arithmetic/fixnum.h" -#include "ruby/impl/arithmetic/gid_t.h" -#include "ruby/impl/arithmetic/int.h" -#include "ruby/impl/arithmetic/intptr_t.h" -#include "ruby/impl/arithmetic/long.h" -#include "ruby/impl/arithmetic/long_long.h" -#include "ruby/impl/arithmetic/mode_t.h" -#include "ruby/impl/arithmetic/off_t.h" -#include "ruby/impl/arithmetic/pid_t.h" -#include "ruby/impl/arithmetic/short.h" -#include "ruby/impl/arithmetic/size_t.h" -#include "ruby/impl/arithmetic/st_data_t.h" -#include "ruby/impl/arithmetic/uid_t.h" +#include "ruby/internal/arithmetic/char.h" +#include "ruby/internal/arithmetic/double.h" +#include "ruby/internal/arithmetic/fixnum.h" +#include "ruby/internal/arithmetic/gid_t.h" +#include "ruby/internal/arithmetic/int.h" +#include "ruby/internal/arithmetic/intptr_t.h" +#include "ruby/internal/arithmetic/long.h" +#include "ruby/internal/arithmetic/long_long.h" +#include "ruby/internal/arithmetic/mode_t.h" +#include "ruby/internal/arithmetic/off_t.h" +#include "ruby/internal/arithmetic/pid_t.h" +#include "ruby/internal/arithmetic/short.h" +#include "ruby/internal/arithmetic/size_t.h" +#include "ruby/internal/arithmetic/st_data_t.h" +#include "ruby/internal/arithmetic/uid_t.h" #endif /* RBIMPL_ARITHMETIC_H */ diff --git a/include/ruby/internal/arithmetic/char.h b/include/ruby/internal/arithmetic/char.h index 138ba63f58..485bbd545c 100644 --- a/include/ruby/internal/arithmetic/char.h +++ b/include/ruby/internal/arithmetic/char.h @@ -20,14 +20,14 @@ * extension libraries. They could be written in C++98. * @brief Arithmetic conversion between C's `char` and Ruby's. */ -#include "ruby/impl/arithmetic/int.h" /* NUM2INT is here, but */ -#include "ruby/impl/arithmetic/long.h" /* INT2FIX is here.*/ -#include "ruby/impl/attr/artificial.h" -#include "ruby/impl/attr/const.h" -#include "ruby/impl/attr/constexpr.h" -#include "ruby/impl/cast.h" -#include "ruby/impl/core/rstring.h" -#include "ruby/impl/value_type.h" +#include "ruby/internal/arithmetic/int.h" /* NUM2INT is here, but */ +#include "ruby/internal/arithmetic/long.h" /* INT2FIX is here.*/ +#include "ruby/internal/attr/artificial.h" +#include "ruby/internal/attr/const.h" +#include "ruby/internal/attr/constexpr.h" +#include "ruby/internal/cast.h" +#include "ruby/internal/core/rstring.h" +#include "ruby/internal/value_type.h" #define RB_NUM2CHR rb_num2char_inline #define NUM2CHR RB_NUM2CHR diff --git a/include/ruby/internal/arithmetic/double.h b/include/ruby/internal/arithmetic/double.h index 2c3426ae6b..69d8630dbb 100644 --- a/include/ruby/internal/arithmetic/double.h +++ b/include/ruby/internal/arithmetic/double.h @@ -20,9 +20,9 @@ * extension libraries. They could be written in C++98. * @brief Arithmetic conversion between C's `double` and Ruby's. */ -#include "ruby/impl/attr/pure.h" -#include "ruby/impl/dllexport.h" -#include "ruby/impl/value.h" +#include "ruby/internal/attr/pure.h" +#include "ruby/internal/dllexport.h" +#include "ruby/internal/value.h" #define NUM2DBL rb_num2dbl #define RFLOAT_VALUE rb_float_value diff --git a/include/ruby/internal/arithmetic/gid_t.h b/include/ruby/internal/arithmetic/gid_t.h index 2d4a230a1f..32e3578bd2 100644 --- a/include/ruby/internal/arithmetic/gid_t.h +++ b/include/ruby/internal/arithmetic/gid_t.h @@ -20,8 +20,8 @@ * extension libraries. They could be written in C++98. * @brief Arithmetic conversion between C's `gid_t` and Ruby's. */ -#include "ruby/impl/config.h" -#include "ruby/impl/arithmetic/long.h" +#include "ruby/internal/config.h" +#include "ruby/internal/arithmetic/long.h" #ifndef GIDT2NUM # define GIDT2NUM RB_LONG2NUM diff --git a/include/ruby/internal/arithmetic/int.h b/include/ruby/internal/arithmetic/int.h index 374d10540b..346fa9258b 100644 --- a/include/ruby/internal/arithmetic/int.h +++ b/include/ruby/internal/arithmetic/int.h @@ -20,18 +20,18 @@ * extension libraries. They could be written in C++98. * @brief Arithmetic conversion between C's `int` and Ruby's. */ -#include "ruby/impl/config.h" -#include "ruby/impl/arithmetic/fixnum.h" -#include "ruby/impl/arithmetic/intptr_t.h" -#include "ruby/impl/arithmetic/long.h" -#include "ruby/impl/attr/artificial.h" -#include "ruby/impl/attr/const.h" -#include "ruby/impl/attr/constexpr.h" -#include "ruby/impl/compiler_is.h" -#include "ruby/impl/dllexport.h" -#include "ruby/impl/special_consts.h" -#include "ruby/impl/value.h" -#include "ruby/impl/warning_push.h" +#include "ruby/internal/config.h" +#include "ruby/internal/arithmetic/fixnum.h" +#include "ruby/internal/arithmetic/intptr_t.h" +#include "ruby/internal/arithmetic/long.h" +#include "ruby/internal/attr/artificial.h" +#include "ruby/internal/attr/const.h" +#include "ruby/internal/attr/constexpr.h" +#include "ruby/internal/compiler_is.h" +#include "ruby/internal/dllexport.h" +#include "ruby/internal/special_consts.h" +#include "ruby/internal/value.h" +#include "ruby/internal/warning_push.h" #include "ruby/assert.h" #define RB_INT2NUM rb_int2num_inline diff --git a/include/ruby/internal/arithmetic/intptr_t.h b/include/ruby/internal/arithmetic/intptr_t.h index 2bbbf652db..442c87144c 100644 --- a/include/ruby/internal/arithmetic/intptr_t.h +++ b/include/ruby/internal/arithmetic/intptr_t.h @@ -20,14 +20,14 @@ * extension libraries. They could be written in C++98. * @brief Arithmetic conversion between C's `intptr_t` and Ruby's. */ -#include "ruby/impl/config.h" +#include "ruby/internal/config.h" #ifdef HAVE_STDINT_H # include <stdint.h> #endif -#include "ruby/impl/value.h" -#include "ruby/impl/dllexport.h" +#include "ruby/internal/value.h" +#include "ruby/internal/dllexport.h" #define rb_int_new rb_int2inum #define rb_uint_new rb_uint2inum diff --git a/include/ruby/internal/arithmetic/long.h b/include/ruby/internal/arithmetic/long.h index d429974eaf..c0235b9a64 100644 --- a/include/ruby/internal/arithmetic/long.h +++ b/include/ruby/internal/arithmetic/long.h @@ -28,19 +28,19 @@ * understand the difference of `int` and `long` when they designed those * macros. */ -#include "ruby/impl/config.h" -#include "ruby/impl/arithmetic/fixnum.h" /* FIXABLE */ -#include "ruby/impl/arithmetic/intptr_t.h" /* rb_int2big etc.*/ -#include "ruby/impl/assume.h" -#include "ruby/impl/attr/artificial.h" -#include "ruby/impl/attr/cold.h" -#include "ruby/impl/attr/const.h" -#include "ruby/impl/attr/constexpr.h" -#include "ruby/impl/attr/noreturn.h" -#include "ruby/impl/cast.h" -#include "ruby/impl/dllexport.h" -#include "ruby/impl/special_consts.h" /* FIXNUM_FLAG */ -#include "ruby/impl/value.h" +#include "ruby/internal/config.h" +#include "ruby/internal/arithmetic/fixnum.h" /* FIXABLE */ +#include "ruby/internal/arithmetic/intptr_t.h" /* rb_int2big etc.*/ +#include "ruby/internal/assume.h" +#include "ruby/internal/attr/artificial.h" +#include "ruby/internal/attr/cold.h" +#include "ruby/internal/attr/const.h" +#include "ruby/internal/attr/constexpr.h" +#include "ruby/internal/attr/noreturn.h" +#include "ruby/internal/cast.h" +#include "ruby/internal/dllexport.h" +#include "ruby/internal/special_consts.h" /* FIXNUM_FLAG */ +#include "ruby/internal/value.h" #include "ruby/assert.h" #define FIX2LONG RB_FIX2LONG diff --git a/include/ruby/internal/arithmetic/long_long.h b/include/ruby/internal/arithmetic/long_long.h index 3469421f0e..96ffb37d57 100644 --- a/include/ruby/internal/arithmetic/long_long.h +++ b/include/ruby/internal/arithmetic/long_long.h @@ -20,9 +20,9 @@ * extension libraries. They could be written in C++98. * @brief Arithmetic conversion between C's `long long` and Ruby's. */ -#include "ruby/impl/value.h" -#include "ruby/impl/dllexport.h" -#include "ruby/impl/special_consts.h" +#include "ruby/internal/value.h" +#include "ruby/internal/dllexport.h" +#include "ruby/internal/special_consts.h" #include "ruby/backward/2/long_long.h" #define RB_LL2NUM rb_ll2inum diff --git a/include/ruby/internal/arithmetic/mode_t.h b/include/ruby/internal/arithmetic/mode_t.h index 81ae129924..ee47eb8221 100644 --- a/include/ruby/internal/arithmetic/mode_t.h +++ b/include/ruby/internal/arithmetic/mode_t.h @@ -20,8 +20,8 @@ * extension libraries. They could be written in C++98. * @brief Arithmetic conversion between C's `mode_t` and Ruby's. */ -#include "ruby/impl/config.h" -#include "ruby/impl/arithmetic/int.h" +#include "ruby/internal/config.h" +#include "ruby/internal/arithmetic/int.h" #ifndef NUM2MODET # define NUM2MODET RB_NUM2INT diff --git a/include/ruby/internal/arithmetic/off_t.h b/include/ruby/internal/arithmetic/off_t.h index 2abada5441..84ec807e3d 100644 --- a/include/ruby/internal/arithmetic/off_t.h +++ b/include/ruby/internal/arithmetic/off_t.h @@ -20,10 +20,10 @@ * extension libraries. They could be written in C++98. * @brief Arithmetic conversion between C's `off_t` and Ruby's. */ -#include "ruby/impl/config.h" -#include "ruby/impl/arithmetic/int.h" -#include "ruby/impl/arithmetic/long.h" -#include "ruby/impl/arithmetic/long_long.h" +#include "ruby/internal/config.h" +#include "ruby/internal/arithmetic/int.h" +#include "ruby/internal/arithmetic/long.h" +#include "ruby/internal/arithmetic/long_long.h" #include "ruby/backward/2/long_long.h" #ifdef OFFT2NUM diff --git a/include/ruby/internal/arithmetic/pid_t.h b/include/ruby/internal/arithmetic/pid_t.h index 7af279a698..eaca402776 100644 --- a/include/ruby/internal/arithmetic/pid_t.h +++ b/include/ruby/internal/arithmetic/pid_t.h @@ -20,8 +20,8 @@ * extension libraries. They could be written in C++98. * @brief Arithmetic conversion between C's `pid_t` and Ruby's. */ -#include "ruby/impl/config.h" -#include "ruby/impl/arithmetic/long.h" +#include "ruby/internal/config.h" +#include "ruby/internal/arithmetic/long.h" #ifndef PIDT2NUM # define PIDT2NUM RB_LONG2NUM diff --git a/include/ruby/internal/arithmetic/short.h b/include/ruby/internal/arithmetic/short.h index d952e5ba99..ef213a8d3e 100644 --- a/include/ruby/internal/arithmetic/short.h +++ b/include/ruby/internal/arithmetic/short.h @@ -23,9 +23,9 @@ * Shyouhei wonders: why there is no SHORT2NUM, given there are both * #USHORT2NUM and #CHR2FIX? */ -#include "ruby/impl/value.h" -#include "ruby/impl/dllexport.h" -#include "ruby/impl/special_consts.h" +#include "ruby/internal/value.h" +#include "ruby/internal/dllexport.h" +#include "ruby/internal/special_consts.h" #define RB_NUM2SHORT rb_num2short_inline #define RB_NUM2USHORT rb_num2ushort diff --git a/include/ruby/internal/arithmetic/size_t.h b/include/ruby/internal/arithmetic/size_t.h index 661e18ed41..8341c80a35 100644 --- a/include/ruby/internal/arithmetic/size_t.h +++ b/include/ruby/internal/arithmetic/size_t.h @@ -20,10 +20,10 @@ * extension libraries. They could be written in C++98. * @brief Arithmetic conversion between C's `size_t` and Ruby's. */ -#include "ruby/impl/config.h" -#include "ruby/impl/arithmetic/int.h" -#include "ruby/impl/arithmetic/long.h" -#include "ruby/impl/arithmetic/long_long.h" +#include "ruby/internal/config.h" +#include "ruby/internal/arithmetic/int.h" +#include "ruby/internal/arithmetic/long.h" +#include "ruby/internal/arithmetic/long_long.h" #include "ruby/backward/2/long_long.h" #if SIZEOF_SIZE_T == SIZEOF_LONG_LONG diff --git a/include/ruby/internal/arithmetic/st_data_t.h b/include/ruby/internal/arithmetic/st_data_t.h index 148816c265..01917ab3c0 100644 --- a/include/ruby/internal/arithmetic/st_data_t.h +++ b/include/ruby/internal/arithmetic/st_data_t.h @@ -20,13 +20,13 @@ * extension libraries. They could be written in C++98. * @brief Arithmetic conversion between C's `st_data_t` and Ruby's. */ -#include "ruby/impl/arithmetic/fixnum.h" -#include "ruby/impl/arithmetic/long.h" -#include "ruby/impl/attr/artificial.h" -#include "ruby/impl/attr/const.h" -#include "ruby/impl/attr/constexpr.h" -#include "ruby/impl/cast.h" -#include "ruby/impl/value.h" +#include "ruby/internal/arithmetic/fixnum.h" +#include "ruby/internal/arithmetic/long.h" +#include "ruby/internal/attr/artificial.h" +#include "ruby/internal/attr/const.h" +#include "ruby/internal/attr/constexpr.h" +#include "ruby/internal/cast.h" +#include "ruby/internal/value.h" #include "ruby/assert.h" #include "ruby/st.h" diff --git a/include/ruby/internal/arithmetic/uid_t.h b/include/ruby/internal/arithmetic/uid_t.h index 8ea42f5c92..bdcf42f049 100644 --- a/include/ruby/internal/arithmetic/uid_t.h +++ b/include/ruby/internal/arithmetic/uid_t.h @@ -20,8 +20,8 @@ * extension libraries. They could be written in C++98. * @brief Arithmetic conversion between C's `uid_t` and Ruby's. */ -#include "ruby/impl/config.h" -#include "ruby/impl/arithmetic/long.h" +#include "ruby/internal/config.h" +#include "ruby/internal/arithmetic/long.h" #ifndef UIDT2NUM # define UIDT2NUM RB_LONG2NUM diff --git a/include/ruby/internal/assume.h b/include/ruby/internal/assume.h index fa4a89514a..e95b2fb12a 100644 --- a/include/ruby/internal/assume.h +++ b/include/ruby/internal/assume.h @@ -25,11 +25,11 @@ * - #RBIMPL_ASSUME could fallback to #RBIMPL_UNREACHABLE. * - #RBIMPL_UNREACHABLE could fallback to #RBIMPL_ASSUME. */ -#include "ruby/impl/config.h" -#include "ruby/impl/cast.h" -#include "ruby/impl/compiler_since.h" -#include "ruby/impl/has/builtin.h" -#include "ruby/impl/warning_push.h" +#include "ruby/internal/config.h" +#include "ruby/internal/cast.h" +#include "ruby/internal/compiler_since.h" +#include "ruby/internal/has/builtin.h" +#include "ruby/internal/warning_push.h" /** @cond INTERNAL_MACRO */ #if RBIMPL_COMPILER_SINCE(MSVC, 13, 10, 0) diff --git a/include/ruby/internal/attr/alloc_size.h b/include/ruby/internal/attr/alloc_size.h index 9dd79f15fc..ea96feec99 100644 --- a/include/ruby/internal/attr/alloc_size.h +++ b/include/ruby/internal/attr/alloc_size.h @@ -20,7 +20,7 @@ * extension libraries. They could be written in C++98. * @brief Defines #RBIMPL_ATTR_ALLOC_SIZE. */ -#include "ruby/impl/has/attribute.h" +#include "ruby/internal/has/attribute.h" /** Wraps (or simulates) `__attribute__((alloc_size))` */ #if RBIMPL_HAS_ATTRIBUTE(alloc_size) diff --git a/include/ruby/internal/attr/artificial.h b/include/ruby/internal/attr/artificial.h index 7c9dc3e175..fa9a3814cc 100644 --- a/include/ruby/internal/attr/artificial.h +++ b/include/ruby/internal/attr/artificial.h @@ -34,7 +34,7 @@ * case it gets vital to know where the inlining happened in the callee. * See also https://stackoverflow.com/a/21936099 */ -#include "ruby/impl/has/attribute.h" +#include "ruby/internal/has/attribute.h" /** Wraps (or simulates) `__attribute__((artificial))` */ #if RBIMPL_HAS_ATTRIBUTE(artificial) diff --git a/include/ruby/internal/attr/cold.h b/include/ruby/internal/attr/cold.h index 85877b6136..fcee507456 100644 --- a/include/ruby/internal/attr/cold.h +++ b/include/ruby/internal/attr/cold.h @@ -20,8 +20,8 @@ * extension libraries. They could be written in C++98. * @brief Defines #RBIMPL_ATTR_COLD. */ -#include "ruby/impl/compiler_is.h" -#include "ruby/impl/has/attribute.h" +#include "ruby/internal/compiler_is.h" +#include "ruby/internal/has/attribute.h" /** Wraps (or simulates) `__attribute__((cold))` */ #if RBIMPL_COMPILER_IS(SunPro) diff --git a/include/ruby/internal/attr/const.h b/include/ruby/internal/attr/const.h index 85892ea464..ca9baa78a5 100644 --- a/include/ruby/internal/attr/const.h +++ b/include/ruby/internal/attr/const.h @@ -20,9 +20,9 @@ * extension libraries. They could be written in C++98. * @brief Defines #RBIMPL_ATTR_CONST. */ -#include "ruby/impl/compiler_since.h" -#include "ruby/impl/has/attribute.h" -#include "ruby/impl/has/declspec_attribute.h" +#include "ruby/internal/compiler_since.h" +#include "ruby/internal/has/attribute.h" +#include "ruby/internal/has/declspec_attribute.h" /** Wraps (or simulates) `__attribute__((const))` */ #if RBIMPL_HAS_ATTRIBUTE(const) diff --git a/include/ruby/internal/attr/constexpr.h b/include/ruby/internal/attr/constexpr.h index 4b6cc81e3b..0ccd8f2b0f 100644 --- a/include/ruby/internal/attr/constexpr.h +++ b/include/ruby/internal/attr/constexpr.h @@ -20,9 +20,9 @@ * extension libraries. They could be written in C++98. * @brief #RBIMPL_ATTR_CONSTEXPR. */ -#include "ruby/impl/has/feature.h" -#include "ruby/impl/compiler_is.h" -#include "ruby/impl/token_paste.h" +#include "ruby/internal/has/feature.h" +#include "ruby/internal/compiler_is.h" +#include "ruby/internal/token_paste.h" /** @cond INTERNAL_MACRO */ #if ! defined(__cplusplus) diff --git a/include/ruby/internal/attr/deprecated.h b/include/ruby/internal/attr/deprecated.h index c603d58a1f..0cdf12606a 100644 --- a/include/ruby/internal/attr/deprecated.h +++ b/include/ruby/internal/attr/deprecated.h @@ -20,12 +20,12 @@ * extension libraries. They could be written in C++98. * @brief Defines #RBIMPL_ATTR_DEPRECATED. */ -#include "ruby/impl/compiler_since.h" -#include "ruby/impl/has/attribute.h" -#include "ruby/impl/has/c_attribute.h" -#include "ruby/impl/has/cpp_attribute.h" -#include "ruby/impl/has/declspec_attribute.h" -#include "ruby/impl/has/extension.h" +#include "ruby/internal/compiler_since.h" +#include "ruby/internal/has/attribute.h" +#include "ruby/internal/has/c_attribute.h" +#include "ruby/internal/has/cpp_attribute.h" +#include "ruby/internal/has/declspec_attribute.h" +#include "ruby/internal/has/extension.h" /** Wraps (or simulates) `[[deprecated]]` */ #if RBIMPL_HAS_EXTENSION(attribute_deprecated_with_message) diff --git a/include/ruby/internal/attr/diagnose_if.h b/include/ruby/internal/attr/diagnose_if.h index ba6e8626e3..6a79e904b7 100644 --- a/include/ruby/internal/attr/diagnose_if.h +++ b/include/ruby/internal/attr/diagnose_if.h @@ -20,8 +20,8 @@ * extension libraries. They could be written in C++98. * @brief Defines #RBIMPL_ATTR_DIAGNOSE_IF. */ -#include "ruby/impl/has/attribute.h" -#include "ruby/impl/warning_push.h" +#include "ruby/internal/has/attribute.h" +#include "ruby/internal/warning_push.h" /** Wraps (or simulates) `__attribute__((diagnose_if))` */ #if RBIMPL_COMPILER_BEFORE(Clang, 5, 0, 0) diff --git a/include/ruby/internal/attr/enum_extensibility.h b/include/ruby/internal/attr/enum_extensibility.h index d5d25e03d7..6faa58185a 100644 --- a/include/ruby/internal/attr/enum_extensibility.h +++ b/include/ruby/internal/attr/enum_extensibility.h @@ -20,7 +20,7 @@ * extension libraries. They could be written in C++98. * @brief #RBIMPL_ATTR_ENUM_EXTENSIBILITY. */ -#include "ruby/impl/has/attribute.h" +#include "ruby/internal/has/attribute.h" /** Wraps (or simulates) `__attribute__((enum_extensibility))` */ #if RBIMPL_HAS_ATTRIBUTE(enum_extensibility) diff --git a/include/ruby/internal/attr/error.h b/include/ruby/internal/attr/error.h index b46b306fb9..da19b73c2b 100644 --- a/include/ruby/internal/attr/error.h +++ b/include/ruby/internal/attr/error.h @@ -20,7 +20,7 @@ * extension libraries. They could be written in C++98. * @brief Defines #RBIMPL_ATTR_ERROR. */ -#include "ruby/impl/has/attribute.h" +#include "ruby/internal/has/attribute.h" /** Wraps (or simulates) `__attribute__((error))` */ #if RBIMPL_HAS_ATTRIBUTE(error) diff --git a/include/ruby/internal/attr/flag_enum.h b/include/ruby/internal/attr/flag_enum.h index e769708d93..148384d842 100644 --- a/include/ruby/internal/attr/flag_enum.h +++ b/include/ruby/internal/attr/flag_enum.h @@ -21,7 +21,7 @@ * @brief Defines #RBIMPL_ATTR_FLAG_ENUM. * @see https://clang.llvm.org/docs/AttributeReference.html#flag_enum */ -#include "ruby/impl/has/attribute.h" +#include "ruby/internal/has/attribute.h" /** Wraps (or simulates) `__attribute__((flag_enum)` */ #if RBIMPL_HAS_ATTRIBUTE(flag_enum) diff --git a/include/ruby/internal/attr/forceinline.h b/include/ruby/internal/attr/forceinline.h index 8d60a63437..6b31f1016f 100644 --- a/include/ruby/internal/attr/forceinline.h +++ b/include/ruby/internal/attr/forceinline.h @@ -20,8 +20,8 @@ * extension libraries. They could be written in C++98. * @brief Defines #RBIMPL_ATTR_FORCEINLINE. */ -#include "ruby/impl/compiler_since.h" -#include "ruby/impl/has/attribute.h" +#include "ruby/internal/compiler_since.h" +#include "ruby/internal/has/attribute.h" /** * Wraps (or simulates) `__forceinline`. MSVC complains on declarations like diff --git a/include/ruby/internal/attr/format.h b/include/ruby/internal/attr/format.h index 368c9f8797..fcbf7b6cfe 100644 --- a/include/ruby/internal/attr/format.h +++ b/include/ruby/internal/attr/format.h @@ -20,7 +20,7 @@ * extension libraries. They could be written in C++98. * @brief Defines #RBIMPL_ATTR_FORMAT. */ -#include "ruby/impl/has/attribute.h" +#include "ruby/internal/has/attribute.h" /** Wraps (or simulates) `__attribute__((format))` */ #if RBIMPL_HAS_ATTRIBUTE(format) diff --git a/include/ruby/internal/attr/maybe_unused.h b/include/ruby/internal/attr/maybe_unused.h index d554603db5..f46d1bc670 100644 --- a/include/ruby/internal/attr/maybe_unused.h +++ b/include/ruby/internal/attr/maybe_unused.h @@ -20,9 +20,9 @@ * extension libraries. They could be written in C++98. * @brief Defines #RBIMPL_ATTR_MAYBE_UNUSED. */ -#include "ruby/impl/has/attribute.h" -#include "ruby/impl/has/c_attribute.h" -#include "ruby/impl/has/cpp_attribute.h" +#include "ruby/internal/has/attribute.h" +#include "ruby/internal/has/c_attribute.h" +#include "ruby/internal/has/cpp_attribute.h" /** Wraps (or simulates) `[[maybe_unused]]` */ #if RBIMPL_HAS_CPP_ATTRIBUTE(maybe_unused) diff --git a/include/ruby/internal/attr/noalias.h b/include/ruby/internal/attr/noalias.h index 0180d0c4ec..63324b7184 100644 --- a/include/ruby/internal/attr/noalias.h +++ b/include/ruby/internal/attr/noalias.h @@ -46,7 +46,7 @@ * that has to be passed to the function as a pointer. ::VALUE -taking * functions thus cannot be attributed as such. */ -#include "ruby/impl/has/declspec_attribute.h" +#include "ruby/internal/has/declspec_attribute.h" /** Wraps (or simulates) `__declspec((noalias))` */ #if RBIMPL_HAS_DECLSPEC_ATTRIBUTE(noalias) diff --git a/include/ruby/internal/attr/nodiscard.h b/include/ruby/internal/attr/nodiscard.h index ee3a1347df..5fd71b1c23 100644 --- a/include/ruby/internal/attr/nodiscard.h +++ b/include/ruby/internal/attr/nodiscard.h @@ -20,9 +20,9 @@ * extension libraries. They could be written in C++98. * @brief Defines #RBIMPL_ATTR_NODISCARD. */ -#include "ruby/impl/has/attribute.h" -#include "ruby/impl/has/c_attribute.h" -#include "ruby/impl/has/cpp_attribute.h" +#include "ruby/internal/has/attribute.h" +#include "ruby/internal/has/c_attribute.h" +#include "ruby/internal/has/cpp_attribute.h" /** * Wraps (or simulates) `[[nodiscard]]`. In C++ (at least since C++20) a diff --git a/include/ruby/internal/attr/noexcept.h b/include/ruby/internal/attr/noexcept.h index ac0ec4c10d..968a7742b9 100644 --- a/include/ruby/internal/attr/noexcept.h +++ b/include/ruby/internal/attr/noexcept.h @@ -61,8 +61,8 @@ * Itanium C++ ABI has zero-cost exception handling), but does impact on * generated binary size. This is bad. */ -#include "ruby/impl/compiler_since.h" -#include "ruby/impl/has/feature.h" +#include "ruby/internal/compiler_since.h" +#include "ruby/internal/has/feature.h" /** Wraps (or simulates) C++11 `noexcept` */ #if ! defined(__cplusplus) diff --git a/include/ruby/internal/attr/noinline.h b/include/ruby/internal/attr/noinline.h index c2cc007969..619f99a171 100644 --- a/include/ruby/internal/attr/noinline.h +++ b/include/ruby/internal/attr/noinline.h @@ -20,8 +20,8 @@ * extension libraries. They could be written in C++98. * @brief Defines #RBIMPL_ATTR_NOINLINE. */ -#include "ruby/impl/has/attribute.h" -#include "ruby/impl/has/declspec_attribute.h" +#include "ruby/internal/has/attribute.h" +#include "ruby/internal/has/declspec_attribute.h" /** Wraps (or simulates) `__declspec(noinline)` */ #if RBIMPL_HAS_DECLSPEC_ATTRIBUTE(noinline) diff --git a/include/ruby/internal/attr/nonnull.h b/include/ruby/internal/attr/nonnull.h index a1d0320e1d..cfced0bf74 100644 --- a/include/ruby/internal/attr/nonnull.h +++ b/include/ruby/internal/attr/nonnull.h @@ -20,7 +20,7 @@ * extension libraries. They could be written in C++98. * @brief Defines #RBIMPL_ATTR_NONNULL. */ -#include "ruby/impl/has/attribute.h" +#include "ruby/internal/has/attribute.h" /** Wraps (or simulates) `__attribute__((nonnull))` */ #if RBIMPL_HAS_ATTRIBUTE(nonnull) diff --git a/include/ruby/internal/attr/noreturn.h b/include/ruby/internal/attr/noreturn.h index 66a9b42947..9a0916c4ee 100644 --- a/include/ruby/internal/attr/noreturn.h +++ b/include/ruby/internal/attr/noreturn.h @@ -20,10 +20,10 @@ * extension libraries. They could be written in C++98. * @brief Defines #RBIMPL_ATTR_NORETURN. */ -#include "ruby/impl/compiler_since.h" -#include "ruby/impl/has/attribute.h" -#include "ruby/impl/has/cpp_attribute.h" -#include "ruby/impl/has/declspec_attribute.h" +#include "ruby/internal/compiler_since.h" +#include "ruby/internal/has/attribute.h" +#include "ruby/internal/has/cpp_attribute.h" +#include "ruby/internal/has/declspec_attribute.h" /** Wraps (or simulates) `[[noreturn]]` */ #if RBIMPL_COMPILER_SINCE(SunPro, 5, 10, 0) diff --git a/include/ruby/internal/attr/pure.h b/include/ruby/internal/attr/pure.h index a5bb51b76f..b6aca7b720 100644 --- a/include/ruby/internal/attr/pure.h +++ b/include/ruby/internal/attr/pure.h @@ -20,8 +20,8 @@ * extension libraries. They could be written in C++98. * @brief Defines #RBIMPL_ATTR_PURE. */ -#include "ruby/impl/compiler_since.h" -#include "ruby/impl/has/attribute.h" +#include "ruby/internal/compiler_since.h" +#include "ruby/internal/has/attribute.h" #include "ruby/assert.h" /** Wraps (or simulates) `__attribute__((pure))` */ diff --git a/include/ruby/internal/attr/restrict.h b/include/ruby/internal/attr/restrict.h index 518906f6da..3f4b7db165 100644 --- a/include/ruby/internal/attr/restrict.h +++ b/include/ruby/internal/attr/restrict.h @@ -20,9 +20,9 @@ * extension libraries. They could be written in C++98. * @brief Defines #RBIMPL_ATTR_RESTRICT. */ -#include "ruby/impl/compiler_since.h" -#include "ruby/impl/has/attribute.h" -#include "ruby/impl/token_paste.h" +#include "ruby/internal/compiler_since.h" +#include "ruby/internal/has/attribute.h" +#include "ruby/internal/token_paste.h" /* :FIXME: config.h includes conflicting `#define restrict`. MSVC can be * detected using `RBIMPL_COMPILER_SINCE()`, but Clang & family cannot use diff --git a/include/ruby/internal/attr/returns_nonnull.h b/include/ruby/internal/attr/returns_nonnull.h index f656d70c8c..91c7be15cd 100644 --- a/include/ruby/internal/attr/returns_nonnull.h +++ b/include/ruby/internal/attr/returns_nonnull.h @@ -20,7 +20,7 @@ * extension libraries. They could be written in C++98. * @brief Defines #RBIMPL_ATTR_RETURNS_NONNULL. */ -#include "ruby/impl/has/attribute.h" +#include "ruby/internal/has/attribute.h" /** Wraps (or simulates) `__attribute__((returns_nonnull))` */ #if defined(_Ret_nonnull_) diff --git a/include/ruby/internal/attr/warning.h b/include/ruby/internal/attr/warning.h index e7585e0417..fb6b214828 100644 --- a/include/ruby/internal/attr/warning.h +++ b/include/ruby/internal/attr/warning.h @@ -20,7 +20,7 @@ * extension libraries. They could be written in C++98. * @brief Defines #RBIMPL_ATTR_WARNING. */ -#include "ruby/impl/has/attribute.h" +#include "ruby/internal/has/attribute.h" /** Wraps (or simulates) `__attribute__((warning))` */ #if RBIMPL_HAS_ATTRIBUTE(warning) diff --git a/include/ruby/internal/attr/weakref.h b/include/ruby/internal/attr/weakref.h index 769ce017e0..59dba678fa 100644 --- a/include/ruby/internal/attr/weakref.h +++ b/include/ruby/internal/attr/weakref.h @@ -20,7 +20,7 @@ * extension libraries. They could be written in C++98. * @brief Defines #RBIMPL_ATTR_WEAKREF. */ -#include "ruby/impl/has/attribute.h" +#include "ruby/internal/has/attribute.h" /** Wraps (or simulates) `__attribute__((weakref))` */ #if RBIMPL_HAS_ATTRIBUTE(weakref) diff --git a/include/ruby/internal/cast.h b/include/ruby/internal/cast.h index 4524d63f17..065a5d01c2 100644 --- a/include/ruby/internal/cast.h +++ b/include/ruby/internal/cast.h @@ -25,9 +25,9 @@ * public headers. They could be used from C++, and C-style casts could issue * warnings. Ruby internals are pure C so they should not bother. */ -#include "ruby/impl/compiler_since.h" -#include "ruby/impl/has/warning.h" -#include "ruby/impl/warning_push.h" +#include "ruby/internal/compiler_since.h" +#include "ruby/internal/has/warning.h" +#include "ruby/internal/warning_push.h" #if ! defined(__cplusplus) # define RBIMPL_CAST(expr) (expr) diff --git a/include/ruby/internal/compiler_is.h b/include/ruby/internal/compiler_is.h index 3f34bc1a15..776d7add4f 100644 --- a/include/ruby/internal/compiler_is.h +++ b/include/ruby/internal/compiler_is.h @@ -29,12 +29,12 @@ */ #define RBIMPL_COMPILER_IS(cc) RBIMPL_COMPILER_IS_ ## cc -#include "ruby/impl/compiler_is/apple.h" -#include "ruby/impl/compiler_is/clang.h" -#include "ruby/impl/compiler_is/gcc.h" -#include "ruby/impl/compiler_is/intel.h" -#include "ruby/impl/compiler_is/msvc.h" -#include "ruby/impl/compiler_is/sunpro.h" +#include "ruby/internal/compiler_is/apple.h" +#include "ruby/internal/compiler_is/clang.h" +#include "ruby/internal/compiler_is/gcc.h" +#include "ruby/internal/compiler_is/intel.h" +#include "ruby/internal/compiler_is/msvc.h" +#include "ruby/internal/compiler_is/sunpro.h" /* :TODO: Other possible compilers to support: * * - IBM XL: recent XL are clang-backended so some tweaks like we do for diff --git a/include/ruby/internal/compiler_is/clang.h b/include/ruby/internal/compiler_is/clang.h index 40646750cb..30655f2f25 100644 --- a/include/ruby/internal/compiler_is/clang.h +++ b/include/ruby/internal/compiler_is/clang.h @@ -20,7 +20,7 @@ * extension libraries. They could be written in C++98. * @brief Defines #RBIMPL_COMPILER_IS_Clang. */ -#include "ruby/impl/compiler_is/apple.h" +#include "ruby/internal/compiler_is/apple.h" #if ! defined(__clang__) # define RBIMPL_COMPILER_IS_Clang 0 diff --git a/include/ruby/internal/compiler_is/gcc.h b/include/ruby/internal/compiler_is/gcc.h index 06f0b2b9f6..6eabfb61a2 100644 --- a/include/ruby/internal/compiler_is/gcc.h +++ b/include/ruby/internal/compiler_is/gcc.h @@ -20,9 +20,9 @@ * extension libraries. They could be written in C++98. * @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" +#include "ruby/internal/compiler_is/apple.h" +#include "ruby/internal/compiler_is/clang.h" +#include "ruby/internal/compiler_is/intel.h" #if ! defined(__GNUC__) # define RBIMPL_COMPILER_IS_GCC 0 diff --git a/include/ruby/internal/compiler_is/msvc.h b/include/ruby/internal/compiler_is/msvc.h index f66050e9c4..60189da1a3 100644 --- a/include/ruby/internal/compiler_is/msvc.h +++ b/include/ruby/internal/compiler_is/msvc.h @@ -20,8 +20,8 @@ * extension libraries. They could be written in C++98. * @brief Defines #RBIMPL_COMPILER_IS_MSVC. */ -#include "ruby/impl/compiler_is/clang.h" -#include "ruby/impl/compiler_is/intel.h" +#include "ruby/internal/compiler_is/clang.h" +#include "ruby/internal/compiler_is/intel.h" #if ! defined(_MSC_VER) # define RBIMPL_COMPILER_IS_MSVC 0 diff --git a/include/ruby/internal/compiler_since.h b/include/ruby/internal/compiler_since.h index bdc6cac526..92abb8acc8 100644 --- a/include/ruby/internal/compiler_since.h +++ b/include/ruby/internal/compiler_since.h @@ -20,7 +20,7 @@ * extension libraries. They could be written in C++98. * @brief Defines #RBIMPL_COMPILER_SINCE. */ -#include "ruby/impl/compiler_is.h" +#include "ruby/internal/compiler_is.h" /** * @brief Checks if the compiler is of given brand and is newer than or equal diff --git a/include/ruby/internal/config.h b/include/ruby/internal/config.h index e6c4d12488..49f673ef93 100644 --- a/include/ruby/internal/config.h +++ b/include/ruby/internal/config.h @@ -26,7 +26,7 @@ # include RUBY_EXTCONF_H #endif -#include "ruby/impl/compiler_since.h" +#include "ruby/internal/compiler_since.h" #if defined(__cplusplus) #/* __builtin_choose_expr and __builtin_types_compatible aren't available diff --git a/include/ruby/internal/constant_p.h b/include/ruby/internal/constant_p.h index bfc8d05580..e54a8d85b9 100644 --- a/include/ruby/internal/constant_p.h +++ b/include/ruby/internal/constant_p.h @@ -26,7 +26,7 @@ * @see https://bugs.llvm.org/show_bug.cgi?id=4898 * @see https://gcc.gnu.org/onlinedocs/gcc/Other-Builtins.html */ -#include "ruby/impl/has/builtin.h" +#include "ruby/internal/has/builtin.h" #if RBIMPL_HAS_BUILTIN(__builtin_constant_p) # define RBIMPL_CONSTANT_P(expr) __builtin_constant_p(expr) diff --git a/include/ruby/internal/core.h b/include/ruby/internal/core.h index a9c8c080db..53a00a4603 100644 --- a/include/ruby/internal/core.h +++ b/include/ruby/internal/core.h @@ -20,16 +20,16 @@ * extension libraries. They could be written in C++98. * @brief Core data structures, definitions and manupulations. */ -#include "ruby/impl/core/rarray.h" -#include "ruby/impl/core/rbasic.h" -#include "ruby/impl/core/rbignum.h" -#include "ruby/impl/core/rclass.h" -#include "ruby/impl/core/rdata.h" -#include "ruby/impl/core/rfile.h" -#include "ruby/impl/core/rhash.h" -#include "ruby/impl/core/robject.h" -#include "ruby/impl/core/rregexp.h" -#include "ruby/impl/core/rstring.h" -#include "ruby/impl/core/rstruct.h" -#include "ruby/impl/core/rtypeddata.h" +#include "ruby/internal/core/rarray.h" +#include "ruby/internal/core/rbasic.h" +#include "ruby/internal/core/rbignum.h" +#include "ruby/internal/core/rclass.h" +#include "ruby/internal/core/rdata.h" +#include "ruby/internal/core/rfile.h" +#include "ruby/internal/core/rhash.h" +#include "ruby/internal/core/robject.h" +#include "ruby/internal/core/rregexp.h" +#include "ruby/internal/core/rstring.h" +#include "ruby/internal/core/rstruct.h" +#include "ruby/internal/core/rtypeddata.h" #endif /* RBIMPL_CORE_H */ diff --git a/include/ruby/internal/core/rarray.h b/include/ruby/internal/core/rarray.h index 04f8f0dd49..ea2abe6618 100644 --- a/include/ruby/internal/core/rarray.h +++ b/include/ruby/internal/core/rarray.h @@ -20,19 +20,19 @@ * extension libraries. They could be written in C++98. * @brief Defines struct ::RArray. */ -#include "ruby/impl/arithmetic/long.h" -#include "ruby/impl/attr/artificial.h" -#include "ruby/impl/attr/constexpr.h" -#include "ruby/impl/attr/maybe_unused.h" -#include "ruby/impl/attr/pure.h" -#include "ruby/impl/cast.h" -#include "ruby/impl/core/rbasic.h" -#include "ruby/impl/dllexport.h" -#include "ruby/impl/fl_type.h" -#include "ruby/impl/rgengc.h" -#include "ruby/impl/stdbool.h" -#include "ruby/impl/value.h" -#include "ruby/impl/value_type.h" +#include "ruby/internal/arithmetic/long.h" +#include "ruby/internal/attr/artificial.h" +#include "ruby/internal/attr/constexpr.h" +#include "ruby/internal/attr/maybe_unused.h" +#include "ruby/internal/attr/pure.h" +#include "ruby/internal/cast.h" +#include "ruby/internal/core/rbasic.h" +#include "ruby/internal/dllexport.h" +#include "ruby/internal/fl_type.h" +#include "ruby/internal/rgengc.h" +#include "ruby/internal/stdbool.h" +#include "ruby/internal/value.h" +#include "ruby/internal/value_type.h" #include "ruby/assert.h" #ifndef USE_TRANSIENT_HEAP diff --git a/include/ruby/internal/core/rbasic.h b/include/ruby/internal/core/rbasic.h index 751b30c24c..76333fd78e 100644 --- a/include/ruby/internal/core/rbasic.h +++ b/include/ruby/internal/core/rbasic.h @@ -20,15 +20,15 @@ * extension libraries. They could be written in C++98. * @brief Defines struct ::RBasic. */ -#include "ruby/impl/attr/artificial.h" -#include "ruby/impl/attr/constexpr.h" -#include "ruby/impl/attr/forceinline.h" -#include "ruby/impl/attr/noalias.h" -#include "ruby/impl/attr/pure.h" -#include "ruby/impl/cast.h" -#include "ruby/impl/dllexport.h" -#include "ruby/impl/special_consts.h" -#include "ruby/impl/value.h" +#include "ruby/internal/attr/artificial.h" +#include "ruby/internal/attr/constexpr.h" +#include "ruby/internal/attr/forceinline.h" +#include "ruby/internal/attr/noalias.h" +#include "ruby/internal/attr/pure.h" +#include "ruby/internal/cast.h" +#include "ruby/internal/dllexport.h" +#include "ruby/internal/special_consts.h" +#include "ruby/internal/value.h" #include "ruby/assert.h" #define RBASIC(obj) RBIMPL_CAST((struct RBasic *)(obj)) diff --git a/include/ruby/internal/core/rbignum.h b/include/ruby/internal/core/rbignum.h index 9a77456ba3..89db566501 100644 --- a/include/ruby/internal/core/rbignum.h +++ b/include/ruby/internal/core/rbignum.h @@ -20,10 +20,10 @@ * extension libraries. They could be written in C++98. * @brief Routines to manipulate struct ::RBignum. */ -#include "ruby/impl/dllexport.h" -#include "ruby/impl/value.h" -#include "ruby/impl/value_type.h" -#include "ruby/impl/stdbool.h" +#include "ruby/internal/dllexport.h" +#include "ruby/internal/value.h" +#include "ruby/internal/value_type.h" +#include "ruby/internal/stdbool.h" #define RBIGNUM_SIGN rb_big_sign diff --git a/include/ruby/internal/core/rclass.h b/include/ruby/internal/core/rclass.h index c9864e2436..0aa6b1290e 100644 --- a/include/ruby/internal/core/rclass.h +++ b/include/ruby/internal/core/rclass.h @@ -20,9 +20,9 @@ * extension libraries. They could be written in C++98. * @brief Routines to manipulate struct ::RClass. */ -#include "ruby/impl/dllexport.h" -#include "ruby/impl/value.h" -#include "ruby/impl/cast.h" +#include "ruby/internal/dllexport.h" +#include "ruby/internal/value.h" +#include "ruby/internal/cast.h" #define RMODULE_IS_OVERLAID RMODULE_IS_OVERLAID #define RMODULE_IS_REFINEMENT RMODULE_IS_REFINEMENT diff --git a/include/ruby/internal/core/rdata.h b/include/ruby/internal/core/rdata.h index 4a0b09498c..0824bbcc16 100644 --- a/include/ruby/internal/core/rdata.h +++ b/include/ruby/internal/core/rdata.h @@ -20,21 +20,21 @@ * extension libraries. They could be written in C++98. * @brief Defines struct ::RData. */ -#include "ruby/impl/config.h" +#include "ruby/internal/config.h" #ifdef STDC_HEADERS # include <stddef.h> #endif -#include "ruby/impl/attr/deprecated.h" -#include "ruby/impl/attr/warning.h" -#include "ruby/impl/cast.h" -#include "ruby/impl/core/rbasic.h" -#include "ruby/impl/dllexport.h" -#include "ruby/impl/fl_type.h" -#include "ruby/impl/token_paste.h" -#include "ruby/impl/value.h" -#include "ruby/impl/value_type.h" +#include "ruby/internal/attr/deprecated.h" +#include "ruby/internal/attr/warning.h" +#include "ruby/internal/cast.h" +#include "ruby/internal/core/rbasic.h" +#include "ruby/internal/dllexport.h" +#include "ruby/internal/fl_type.h" +#include "ruby/internal/token_paste.h" +#include "ruby/internal/value.h" +#include "ruby/internal/value_type.h" #include "ruby/defines.h" #ifdef RUBY_UNTYPED_DATA_WARNING diff --git a/include/ruby/internal/core/rfile.h b/include/ruby/internal/core/rfile.h index 4f3ff3f8af..464625b2bd 100644 --- a/include/ruby/internal/core/rfile.h +++ b/include/ruby/internal/core/rfile.h @@ -20,8 +20,8 @@ * extension libraries. They could be written in C++98. * @brief Defines struct ::RFile. */ -#include "ruby/impl/core/rbasic.h" -#include "ruby/impl/cast.h" +#include "ruby/internal/core/rbasic.h" +#include "ruby/internal/cast.h" /* rb_io_t is in ruby/io.h. The header file has historically not been included * into ruby/ruby.h. We follow that tradition. */ diff --git a/include/ruby/internal/core/rhash.h b/include/ruby/internal/core/rhash.h index a4be7a3a11..9bedf0af80 100644 --- a/include/ruby/internal/core/rhash.h +++ b/include/ruby/internal/core/rhash.h @@ -32,14 +32,14 @@ * * Shyouhei stopped thinking. Let them be as is. */ -#include "ruby/impl/config.h" +#include "ruby/internal/config.h" #ifdef STDC_HEADERS # include <stddef.h> #endif -#include "ruby/impl/dllexport.h" -#include "ruby/impl/value.h" +#include "ruby/internal/dllexport.h" +#include "ruby/internal/value.h" #if !defined RUBY_EXPORT && !defined RUBY_NO_OLD_COMPATIBILITY # include "ruby/backward.h" #endif diff --git a/include/ruby/internal/core/rmatch.h b/include/ruby/internal/core/rmatch.h index 9474b82e4c..56b3765555 100644 --- a/include/ruby/internal/core/rmatch.h +++ b/include/ruby/internal/core/rmatch.h @@ -20,13 +20,13 @@ * extension libraries. They could be written in C++98. * @brief Defines struct ::RMatch. */ -#include "ruby/impl/attr/artificial.h" -#include "ruby/impl/attr/pure.h" -#include "ruby/impl/attr/returns_nonnull.h" -#include "ruby/impl/cast.h" -#include "ruby/impl/core/rbasic.h" -#include "ruby/impl/value.h" -#include "ruby/impl/value_type.h" +#include "ruby/internal/attr/artificial.h" +#include "ruby/internal/attr/pure.h" +#include "ruby/internal/attr/returns_nonnull.h" +#include "ruby/internal/cast.h" +#include "ruby/internal/core/rbasic.h" +#include "ruby/internal/value.h" +#include "ruby/internal/value_type.h" #include "ruby/assert.h" #define RMATCH(obj) RBIMPL_CAST((struct RMatch *)(obj)) diff --git a/include/ruby/internal/core/robject.h b/include/ruby/internal/core/robject.h index 5a65bc1d0a..7fd2c6d025 100644 --- a/include/ruby/internal/core/robject.h +++ b/include/ruby/internal/core/robject.h @@ -20,18 +20,18 @@ * extension libraries. They could be written in C++98. * @brief Defines struct ::RObject. */ -#include "ruby/impl/config.h" +#include "ruby/internal/config.h" #ifdef HAVE_STDINT_H # include <stdint.h> #endif -#include "ruby/impl/attr/artificial.h" -#include "ruby/impl/attr/pure.h" -#include "ruby/impl/cast.h" -#include "ruby/impl/fl_type.h" -#include "ruby/impl/value.h" -#include "ruby/impl/value_type.h" +#include "ruby/internal/attr/artificial.h" +#include "ruby/internal/attr/pure.h" +#include "ruby/internal/cast.h" +#include "ruby/internal/fl_type.h" +#include "ruby/internal/value.h" +#include "ruby/internal/value_type.h" #define ROBJECT(obj) RBIMPL_CAST((struct RObject *)(obj)) #define ROBJECT_EMBED_LEN_MAX ROBJECT_EMBED_LEN_MAX diff --git a/include/ruby/internal/core/rregexp.h b/include/ruby/internal/core/rregexp.h index eff7bcc6e9..c6ece314b4 100644 --- a/include/ruby/internal/core/rregexp.h +++ b/include/ruby/internal/core/rregexp.h @@ -20,13 +20,13 @@ * extension libraries. They could be written in C++98. * @brief Defines struct ::RRegexp. */ -#include "ruby/impl/attr/artificial.h" -#include "ruby/impl/attr/pure.h" -#include "ruby/impl/cast.h" -#include "ruby/impl/core/rbasic.h" -#include "ruby/impl/core/rstring.h" -#include "ruby/impl/value.h" -#include "ruby/impl/value_type.h" +#include "ruby/internal/attr/artificial.h" +#include "ruby/internal/attr/pure.h" +#include "ruby/internal/cast.h" +#include "ruby/internal/core/rbasic.h" +#include "ruby/internal/core/rstring.h" +#include "ruby/internal/value.h" +#include "ruby/internal/value_type.h" #define RREGEXP(obj) RBIMPL_CAST((struct RRegexp *)(obj)) #define RREGEXP_PTR(obj) (RREGEXP(obj)->ptr) diff --git a/include/ruby/internal/core/rstring.h b/include/ruby/internal/core/rstring.h index 683635c5ac..be378cfa58 100644 --- a/include/ruby/internal/core/rstring.h +++ b/include/ruby/internal/core/rstring.h @@ -20,16 +20,16 @@ * extension libraries. They could be written in C++98. * @brief Defines struct ::RString. */ -#include "ruby/impl/config.h" -#include "ruby/impl/arithmetic/long.h" -#include "ruby/impl/attr/artificial.h" -#include "ruby/impl/attr/pure.h" -#include "ruby/impl/cast.h" -#include "ruby/impl/core/rbasic.h" -#include "ruby/impl/dllexport.h" -#include "ruby/impl/fl_type.h" -#include "ruby/impl/value_type.h" -#include "ruby/impl/warning_push.h" +#include "ruby/internal/config.h" +#include "ruby/internal/arithmetic/long.h" +#include "ruby/internal/attr/artificial.h" +#include "ruby/internal/attr/pure.h" +#include "ruby/internal/cast.h" +#include "ruby/internal/core/rbasic.h" +#include "ruby/internal/dllexport.h" +#include "ruby/internal/fl_type.h" +#include "ruby/internal/value_type.h" +#include "ruby/internal/warning_push.h" #include "ruby/assert.h" #define RSTRING(obj) RBIMPL_CAST((struct RString *)(obj)) diff --git a/include/ruby/internal/core/rstruct.h b/include/ruby/internal/core/rstruct.h index 9f873adad2..17454f7cbe 100644 --- a/include/ruby/internal/core/rstruct.h +++ b/include/ruby/internal/core/rstruct.h @@ -20,12 +20,12 @@ * extension libraries. They could be written in C++98. * @brief Routines to manipulate struct ::RStruct. */ -#include "ruby/impl/attr/artificial.h" -#include "ruby/impl/dllexport.h" -#include "ruby/impl/value.h" -#include "ruby/impl/value_type.h" -#include "ruby/impl/arithmetic/long.h" -#include "ruby/impl/arithmetic/int.h" +#include "ruby/internal/attr/artificial.h" +#include "ruby/internal/dllexport.h" +#include "ruby/internal/value.h" +#include "ruby/internal/value_type.h" +#include "ruby/internal/arithmetic/long.h" +#include "ruby/internal/arithmetic/int.h" #if !defined RUBY_EXPORT && !defined RUBY_NO_OLD_COMPATIBILITY # include "ruby/backward.h" #endif diff --git a/include/ruby/internal/core/rtypeddata.h b/include/ruby/internal/core/rtypeddata.h index 49e55dcf91..e5d365c4e9 100644 --- a/include/ruby/internal/core/rtypeddata.h +++ b/include/ruby/internal/core/rtypeddata.h @@ -20,23 +20,23 @@ * extension libraries. They could be written in C++98. * @brief Defines struct ::RTypedData. */ -#include "ruby/impl/config.h" +#include "ruby/internal/config.h" #ifdef STDC_HEADERS # include <stddef.h> #endif -#include "ruby/impl/assume.h" -#include "ruby/impl/attr/artificial.h" -#include "ruby/impl/attr/pure.h" -#include "ruby/impl/cast.h" -#include "ruby/impl/core/rbasic.h" -#include "ruby/impl/core/rdata.h" -#include "ruby/impl/dllexport.h" -#include "ruby/impl/error.h" -#include "ruby/impl/fl_type.h" -#include "ruby/impl/stdbool.h" -#include "ruby/impl/value_type.h" +#include "ruby/internal/assume.h" +#include "ruby/internal/attr/artificial.h" +#include "ruby/internal/attr/pure.h" +#include "ruby/internal/cast.h" +#include "ruby/internal/core/rbasic.h" +#include "ruby/internal/core/rdata.h" +#include "ruby/internal/dllexport.h" +#include "ruby/internal/error.h" +#include "ruby/internal/fl_type.h" +#include "ruby/internal/stdbool.h" +#include "ruby/internal/value_type.h" #define HAVE_TYPE_RB_DATA_TYPE_T 1 #define HAVE_RB_DATA_TYPE_T_FUNCTION 1 diff --git a/include/ruby/internal/ctype.h b/include/ruby/internal/ctype.h index 7a8f032c58..aea3e0ca3d 100644 --- a/include/ruby/internal/ctype.h +++ b/include/ruby/internal/ctype.h @@ -20,16 +20,16 @@ * extension libraries. They could be written in C++98. * @brief Our own, locale independent, character handling routines. */ -#include "ruby/impl/config.h" +#include "ruby/internal/config.h" #ifdef STDC_HEADERS # include <ctype.h> #endif -#include "ruby/impl/attr/artificial.h" -#include "ruby/impl/attr/const.h" -#include "ruby/impl/attr/constexpr.h" -#include "ruby/impl/dllexport.h" +#include "ruby/internal/attr/artificial.h" +#include "ruby/internal/attr/const.h" +#include "ruby/internal/attr/constexpr.h" +#include "ruby/internal/dllexport.h" #ifndef ISPRINT # define ISASCII rb_isascii diff --git a/include/ruby/internal/dllexport.h b/include/ruby/internal/dllexport.h index ae1589d811..1488140854 100644 --- a/include/ruby/internal/dllexport.h +++ b/include/ruby/internal/dllexport.h @@ -20,8 +20,8 @@ * extension libraries. They could be written in C++98. * @brief Tewaking visibility of C variables/functions. */ -#include "ruby/impl/config.h" -#include "ruby/impl/compiler_is.h" +#include "ruby/internal/config.h" +#include "ruby/internal/compiler_is.h" /* For MinGW, we need __declspec(dllimport) for RUBY_EXTERN on MJIT. mswin's RUBY_EXTERN already has that. See also: win32/Makefile.sub */ diff --git a/include/ruby/internal/error.h b/include/ruby/internal/error.h index a7458f8e1b..98f016d995 100644 --- a/include/ruby/internal/error.h +++ b/include/ruby/internal/error.h @@ -20,8 +20,8 @@ * extension libraries. They could be written in C++98. * @brief Declares ::rb_raise(). */ -#include "ruby/impl/dllexport.h" -#include "ruby/impl/value.h" +#include "ruby/internal/dllexport.h" +#include "ruby/internal/value.h" #include "ruby/backward/2/attributes.h" RBIMPL_SYMBOL_EXPORT_BEGIN() diff --git a/include/ruby/internal/eval.h b/include/ruby/internal/eval.h index ea59b4c6fd..934611fbb9 100644 --- a/include/ruby/internal/eval.h +++ b/include/ruby/internal/eval.h @@ -20,8 +20,8 @@ * extension libraries. They could be written in C++98. * @brief Declares ::rb_eval_string(). */ -#include "ruby/impl/dllexport.h" -#include "ruby/impl/value.h" +#include "ruby/internal/dllexport.h" +#include "ruby/internal/value.h" RBIMPL_SYMBOL_EXPORT_BEGIN() diff --git a/include/ruby/internal/event.h b/include/ruby/internal/event.h index 7af74261b0..f20e01dc01 100644 --- a/include/ruby/internal/event.h +++ b/include/ruby/internal/event.h @@ -20,8 +20,8 @@ * extension libraries. They could be written in C++98. * @brief Debugging and tracing APIs. */ -#include "ruby/impl/dllexport.h" -#include "ruby/impl/value.h" +#include "ruby/internal/dllexport.h" +#include "ruby/internal/value.h" RBIMPL_SYMBOL_EXPORT_BEGIN() diff --git a/include/ruby/internal/fl_type.h b/include/ruby/internal/fl_type.h index cca1bad391..88a13b87f5 100644 --- a/include/ruby/internal/fl_type.h +++ b/include/ruby/internal/fl_type.h @@ -20,19 +20,19 @@ * extension libraries. They could be written in C++98. * @brief Defines enum ::ruby_fl_type. */ -#include "ruby/impl/config.h" /* for ENUM_OVER_INT */ -#include "ruby/impl/attr/artificial.h" -#include "ruby/impl/attr/flag_enum.h" -#include "ruby/impl/attr/forceinline.h" -#include "ruby/impl/attr/noalias.h" -#include "ruby/impl/attr/pure.h" -#include "ruby/impl/cast.h" -#include "ruby/impl/core/rbasic.h" -#include "ruby/impl/dllexport.h" -#include "ruby/impl/special_consts.h" -#include "ruby/impl/stdbool.h" -#include "ruby/impl/value.h" -#include "ruby/impl/value_type.h" +#include "ruby/internal/config.h" /* for ENUM_OVER_INT */ +#include "ruby/internal/attr/artificial.h" +#include "ruby/internal/attr/flag_enum.h" +#include "ruby/internal/attr/forceinline.h" +#include "ruby/internal/attr/noalias.h" +#include "ruby/internal/attr/pure.h" +#include "ruby/internal/cast.h" +#include "ruby/internal/core/rbasic.h" +#include "ruby/internal/dllexport.h" +#include "ruby/internal/special_consts.h" +#include "ruby/internal/stdbool.h" +#include "ruby/internal/value.h" +#include "ruby/internal/value_type.h" #include "ruby/assert.h" #include "ruby/defines.h" diff --git a/include/ruby/internal/gc.h b/include/ruby/internal/gc.h index 029bbe4fc2..7f335ca8f7 100644 --- a/include/ruby/internal/gc.h +++ b/include/ruby/internal/gc.h @@ -20,8 +20,8 @@ * extension libraries. They could be written in C++98. * @brief Registering values to the GC. */ -#include "ruby/impl/dllexport.h" -#include "ruby/impl/value.h" +#include "ruby/internal/dllexport.h" +#include "ruby/internal/value.h" RBIMPL_SYMBOL_EXPORT_BEGIN() diff --git a/include/ruby/internal/glob.h b/include/ruby/internal/glob.h index 2764b94d02..b78bb75b88 100644 --- a/include/ruby/internal/glob.h +++ b/include/ruby/internal/glob.h @@ -20,8 +20,8 @@ * extension libraries. They could be written in C++98. * @brief Declares ::rb_glob(). */ -#include "ruby/impl/dllexport.h" -#include "ruby/impl/value.h" +#include "ruby/internal/dllexport.h" +#include "ruby/internal/value.h" RBIMPL_SYMBOL_EXPORT_BEGIN() diff --git a/include/ruby/internal/globals.h b/include/ruby/internal/globals.h index cfffd0504d..8269591690 100644 --- a/include/ruby/internal/globals.h +++ b/include/ruby/internal/globals.h @@ -20,12 +20,12 @@ * extension libraries. They could be written in C++98. * @brief Ruby-level global variables / constants, visible from C. */ -#include "ruby/impl/attr/pure.h" -#include "ruby/impl/dllexport.h" -#include "ruby/impl/fl_type.h" -#include "ruby/impl/special_consts.h" -#include "ruby/impl/value.h" -#include "ruby/impl/value_type.h" +#include "ruby/internal/attr/pure.h" +#include "ruby/internal/dllexport.h" +#include "ruby/internal/fl_type.h" +#include "ruby/internal/special_consts.h" +#include "ruby/internal/value.h" +#include "ruby/internal/value_type.h" RBIMPL_SYMBOL_EXPORT_BEGIN() diff --git a/include/ruby/internal/has/attribute.h b/include/ruby/internal/has/attribute.h index af51b93298..512f061dc5 100644 --- a/include/ruby/internal/has/attribute.h +++ b/include/ruby/internal/has/attribute.h @@ -20,9 +20,9 @@ * extension libraries. They could be written in C++98. * @brief Defines #RBIMPL_HAS_ATTRIBUTE. */ -#include "ruby/impl/config.h" -#include "ruby/impl/compiler_since.h" -#include "ruby/impl/token_paste.h" +#include "ruby/internal/config.h" +#include "ruby/internal/compiler_since.h" +#include "ruby/internal/token_paste.h" #if defined(__has_attribute) # if __has_attribute(pure) || RBIMPL_COMPILER_IS(GCC) diff --git a/include/ruby/internal/has/builtin.h b/include/ruby/internal/has/builtin.h index 46f587c2cf..18cfc69e19 100644 --- a/include/ruby/internal/has/builtin.h +++ b/include/ruby/internal/has/builtin.h @@ -20,9 +20,9 @@ * extension libraries. They could be written in C++98. * @brief Defines #RBIMPL_HAS_BUILTIN. */ -#include "ruby/impl/config.h" -#include "ruby/impl/compiler_since.h" -#include "ruby/impl/token_paste.h" +#include "ruby/internal/config.h" +#include "ruby/internal/compiler_since.h" +#include "ruby/internal/token_paste.h" #if defined(__has_builtin) # if RBIMPL_COMPILER_IS(Intel) diff --git a/include/ruby/internal/has/cpp_attribute.h b/include/ruby/internal/has/cpp_attribute.h index 12847a11d6..9c12765e58 100644 --- a/include/ruby/internal/has/cpp_attribute.h +++ b/include/ruby/internal/has/cpp_attribute.h @@ -20,9 +20,9 @@ * extension libraries. They could be written in C++98. * @brief Defines #RBIMPL_HAS_CPP_ATTRIBUTE. */ -#include "ruby/impl/compiler_is.h" -#include "ruby/impl/compiler_since.h" -#include "ruby/impl/token_paste.h" +#include "ruby/internal/compiler_is.h" +#include "ruby/internal/compiler_since.h" +#include "ruby/internal/token_paste.h" /** @cond INTERNAL_MACRO */ #if defined(__has_cpp_attribute) diff --git a/include/ruby/internal/has/declspec_attribute.h b/include/ruby/internal/has/declspec_attribute.h index ba6ad98fce..02610338b8 100644 --- a/include/ruby/internal/has/declspec_attribute.h +++ b/include/ruby/internal/has/declspec_attribute.h @@ -20,8 +20,8 @@ * extension libraries. They could be written in C++98. * @brief Defines #RBIMPL_HAS_DECLSPEC_ATTRIBUTE. */ -#include "ruby/impl/compiler_since.h" -#include "ruby/impl/token_paste.h" +#include "ruby/internal/compiler_since.h" +#include "ruby/internal/token_paste.h" /** Wraps (or simulates) `__has_declspec_attribute`. */ #if defined(__has_declspec_attribute) diff --git a/include/ruby/internal/has/extension.h b/include/ruby/internal/has/extension.h index 02a48bc74c..9ceb365ab9 100644 --- a/include/ruby/internal/has/extension.h +++ b/include/ruby/internal/has/extension.h @@ -20,7 +20,7 @@ * extension libraries. They could be written in C++98. * @brief Defines #RBIMPL_HAS_EXTENSION. */ -#include "ruby/impl/has/feature.h" +#include "ruby/internal/has/feature.h" /** Wraps (or simulates) `__has_extension`. */ #if defined(__has_extension) diff --git a/include/ruby/internal/intern/array.h b/include/ruby/internal/intern/array.h index bfa12191c4..aafe0d1350 100644 --- a/include/ruby/internal/intern/array.h +++ b/include/ruby/internal/intern/array.h @@ -20,8 +20,8 @@ * extension libraries. They could be written in C++98. * @brief Public APIs related to ::rb_cArray. */ -#include "ruby/impl/dllexport.h" -#include "ruby/impl/value.h" +#include "ruby/internal/dllexport.h" +#include "ruby/internal/value.h" RBIMPL_SYMBOL_EXPORT_BEGIN() diff --git a/include/ruby/internal/intern/bignum.h b/include/ruby/internal/intern/bignum.h index 5af4c0ae42..1ac92e9c90 100644 --- a/include/ruby/internal/intern/bignum.h +++ b/include/ruby/internal/intern/bignum.h @@ -20,14 +20,14 @@ * extension libraries. They could be written in C++98. * @brief Public APIs related to so-called rb_cBignum. */ -#include "ruby/impl/config.h" +#include "ruby/internal/config.h" #ifdef STDC_HEADERS # include <stddef.h> #endif -#include "ruby/impl/dllexport.h" -#include "ruby/impl/value.h" +#include "ruby/internal/dllexport.h" +#include "ruby/internal/value.h" #include "ruby/backward/2/long_long.h" RBIMPL_SYMBOL_EXPORT_BEGIN() diff --git a/include/ruby/internal/intern/class.h b/include/ruby/internal/intern/class.h index 7a1cadd5b4..d3be80d283 100644 --- a/include/ruby/internal/intern/class.h +++ b/include/ruby/internal/intern/class.h @@ -20,8 +20,8 @@ * extension libraries. They could be written in C++98. * @brief Public APIs related to ::rb_cClass/::rb_cModule. */ -#include "ruby/impl/dllexport.h" -#include "ruby/impl/value.h" +#include "ruby/internal/dllexport.h" +#include "ruby/internal/value.h" #include "ruby/backward/2/stdarg.h" RBIMPL_SYMBOL_EXPORT_BEGIN() diff --git a/include/ruby/internal/intern/compar.h b/include/ruby/internal/intern/compar.h index c762dc1e24..d226ca37b1 100644 --- a/include/ruby/internal/intern/compar.h +++ b/include/ruby/internal/intern/compar.h @@ -20,8 +20,8 @@ * extension libraries. They could be written in C++98. * @brief Public APIs related to ::rb_mComparable. */ -#include "ruby/impl/dllexport.h" -#include "ruby/impl/value.h" +#include "ruby/internal/dllexport.h" +#include "ruby/internal/value.h" RBIMPL_SYMBOL_EXPORT_BEGIN() diff --git a/include/ruby/internal/intern/complex.h b/include/ruby/internal/intern/complex.h index c3841cfdb6..70343221f6 100644 --- a/include/ruby/internal/intern/complex.h +++ b/include/ruby/internal/intern/complex.h @@ -20,9 +20,9 @@ * extension libraries. They could be written in C++98. * @brief Public APIs related to ::rb_cComplex. */ -#include "ruby/impl/dllexport.h" -#include "ruby/impl/value.h" -#include "ruby/impl/arithmetic/long.h" /* INT2FIX is here. */ +#include "ruby/internal/dllexport.h" +#include "ruby/internal/value.h" +#include "ruby/internal/arithmetic/long.h" /* INT2FIX is here. */ RBIMPL_SYMBOL_EXPORT_BEGIN() diff --git a/include/ruby/internal/intern/cont.h b/include/ruby/internal/intern/cont.h index 16c3cf8be1..6988f753c3 100644 --- a/include/ruby/internal/intern/cont.h +++ b/include/ruby/internal/intern/cont.h @@ -20,9 +20,9 @@ * extension libraries. They could be written in C++98. * @brief Public APIs related to rb_cFiber. */ -#include "ruby/impl/dllexport.h" -#include "ruby/impl/value.h" -#include "ruby/impl/iterator.h" +#include "ruby/internal/dllexport.h" +#include "ruby/internal/value.h" +#include "ruby/internal/iterator.h" RBIMPL_SYMBOL_EXPORT_BEGIN() diff --git a/include/ruby/internal/intern/dir.h b/include/ruby/internal/intern/dir.h index 6fcf274a28..936f4e1f36 100644 --- a/include/ruby/internal/intern/dir.h +++ b/include/ruby/internal/intern/dir.h @@ -20,8 +20,8 @@ * extension libraries. They could be written in C++98. * @brief Public APIs related to ::rb_cDir. */ -#include "ruby/impl/dllexport.h" -#include "ruby/impl/value.h" +#include "ruby/internal/dllexport.h" +#include "ruby/internal/value.h" RBIMPL_SYMBOL_EXPORT_BEGIN() diff --git a/include/ruby/internal/intern/enum.h b/include/ruby/internal/intern/enum.h index ef6fffe444..17c20c1c0a 100644 --- a/include/ruby/internal/intern/enum.h +++ b/include/ruby/internal/intern/enum.h @@ -20,8 +20,8 @@ * extension libraries. They could be written in C++98. * @brief Public APIs related to ::rb_mEnumerable. */ -#include "ruby/impl/dllexport.h" -#include "ruby/impl/value.h" +#include "ruby/internal/dllexport.h" +#include "ruby/internal/value.h" RBIMPL_SYMBOL_EXPORT_BEGIN() diff --git a/include/ruby/internal/intern/enumerator.h b/include/ruby/internal/intern/enumerator.h index 8f64b58de2..7698e24538 100644 --- a/include/ruby/internal/intern/enumerator.h +++ b/include/ruby/internal/intern/enumerator.h @@ -20,11 +20,11 @@ * extension libraries. They could be written in C++98. * @brief Public APIs related to ::rb_cEnumerator. */ -#include "ruby/impl/dllexport.h" -#include "ruby/impl/intern/eval.h" /* rb_frame_this_func */ -#include "ruby/impl/iterator.h" /* rb_block_given_p */ -#include "ruby/impl/symbol.h" -#include "ruby/impl/value.h" +#include "ruby/internal/dllexport.h" +#include "ruby/internal/intern/eval.h" /* rb_frame_this_func */ +#include "ruby/internal/iterator.h" /* rb_block_given_p */ +#include "ruby/internal/symbol.h" +#include "ruby/internal/value.h" RBIMPL_SYMBOL_EXPORT_BEGIN() diff --git a/include/ruby/internal/intern/error.h b/include/ruby/internal/intern/error.h index 0cc5e1c858..aa9fe2daba 100644 --- a/include/ruby/internal/intern/error.h +++ b/include/ruby/internal/intern/error.h @@ -20,9 +20,9 @@ * extension libraries. They could be written in C++98. * @brief Public APIs related to ::rb_eException. */ -#include "ruby/impl/dllexport.h" -#include "ruby/impl/value.h" -#include "ruby/impl/fl_type.h" +#include "ruby/internal/dllexport.h" +#include "ruby/internal/value.h" +#include "ruby/internal/fl_type.h" #include "ruby/backward/2/assume.h" #include "ruby/backward/2/attributes.h" diff --git a/include/ruby/internal/intern/eval.h b/include/ruby/internal/intern/eval.h index 75374df6be..11957053d7 100644 --- a/include/ruby/internal/intern/eval.h +++ b/include/ruby/internal/intern/eval.h @@ -20,9 +20,9 @@ * extension libraries. They could be written in C++98. * @brief Pre-1.9 era evaluator APIs (now considered miscellaneous). */ -#include "ruby/impl/attr/noreturn.h" -#include "ruby/impl/dllexport.h" -#include "ruby/impl/value.h" +#include "ruby/internal/attr/noreturn.h" +#include "ruby/internal/dllexport.h" +#include "ruby/internal/value.h" RBIMPL_SYMBOL_EXPORT_BEGIN() diff --git a/include/ruby/internal/intern/file.h b/include/ruby/internal/intern/file.h index ed8e50cba6..5a52d570e4 100644 --- a/include/ruby/internal/intern/file.h +++ b/include/ruby/internal/intern/file.h @@ -20,8 +20,8 @@ * extension libraries. They could be written in C++98. * @brief Public APIs related to ::rb_cFile. */ -#include "ruby/impl/dllexport.h" -#include "ruby/impl/value.h" +#include "ruby/internal/dllexport.h" +#include "ruby/internal/value.h" RBIMPL_SYMBOL_EXPORT_BEGIN() diff --git a/include/ruby/internal/intern/gc.h b/include/ruby/internal/intern/gc.h index a75785cc49..30759e0ded 100644 --- a/include/ruby/internal/intern/gc.h +++ b/include/ruby/internal/intern/gc.h @@ -20,8 +20,8 @@ * extension libraries. They could be written in C++98. * @brief Public APIs related to ::rb_mGC. */ -#include "ruby/impl/dllexport.h" -#include "ruby/impl/value.h" +#include "ruby/internal/dllexport.h" +#include "ruby/internal/value.h" #include "ruby/backward/2/attributes.h" RBIMPL_SYMBOL_EXPORT_BEGIN() diff --git a/include/ruby/internal/intern/hash.h b/include/ruby/internal/intern/hash.h index 3f0a930131..c7a27c2cfa 100644 --- a/include/ruby/internal/intern/hash.h +++ b/include/ruby/internal/intern/hash.h @@ -20,8 +20,8 @@ * extension libraries. They could be written in C++98. * @brief Public APIs related to ::rb_cHash. */ -#include "ruby/impl/dllexport.h" -#include "ruby/impl/value.h" +#include "ruby/internal/dllexport.h" +#include "ruby/internal/value.h" #include "ruby/st.h" RBIMPL_SYMBOL_EXPORT_BEGIN() diff --git a/include/ruby/internal/intern/io.h b/include/ruby/internal/intern/io.h index 6b0133dddf..d2f2e53486 100644 --- a/include/ruby/internal/intern/io.h +++ b/include/ruby/internal/intern/io.h @@ -20,8 +20,8 @@ * extension libraries. They could be written in C++98. * @brief Public APIs related to ::rb_cIO. */ -#include "ruby/impl/dllexport.h" -#include "ruby/impl/value.h" +#include "ruby/internal/dllexport.h" +#include "ruby/internal/value.h" RBIMPL_SYMBOL_EXPORT_BEGIN() diff --git a/include/ruby/internal/intern/load.h b/include/ruby/internal/intern/load.h index d165237bfc..b4c42a0f54 100644 --- a/include/ruby/internal/intern/load.h +++ b/include/ruby/internal/intern/load.h @@ -20,8 +20,8 @@ * extension libraries. They could be written in C++98. * @brief Public APIs related to ::rb_f_require(). */ -#include "ruby/impl/dllexport.h" -#include "ruby/impl/value.h" +#include "ruby/internal/dllexport.h" +#include "ruby/internal/value.h" RBIMPL_SYMBOL_EXPORT_BEGIN() diff --git a/include/ruby/internal/intern/marshal.h b/include/ruby/internal/intern/marshal.h index 88473ba4e3..6b0243244e 100644 --- a/include/ruby/internal/intern/marshal.h +++ b/include/ruby/internal/intern/marshal.h @@ -20,8 +20,8 @@ * extension libraries. They could be written in C++98. * @brief Public APIs related to rb_mMarshal. */ -#include "ruby/impl/dllexport.h" -#include "ruby/impl/value.h" +#include "ruby/internal/dllexport.h" +#include "ruby/internal/value.h" RBIMPL_SYMBOL_EXPORT_BEGIN() diff --git a/include/ruby/internal/intern/numeric.h b/include/ruby/internal/intern/numeric.h index fa4b1daa74..effc583756 100644 --- a/include/ruby/internal/intern/numeric.h +++ b/include/ruby/internal/intern/numeric.h @@ -20,8 +20,8 @@ * extension libraries. They could be written in C++98. * @brief Public APIs related to ::rb_cNumeric. */ -#include "ruby/impl/dllexport.h" -#include "ruby/impl/value.h" +#include "ruby/internal/dllexport.h" +#include "ruby/internal/value.h" #include "ruby/backward/2/attributes.h" RBIMPL_SYMBOL_EXPORT_BEGIN() diff --git a/include/ruby/internal/intern/object.h b/include/ruby/internal/intern/object.h index 808836fbda..d55178584b 100644 --- a/include/ruby/internal/intern/object.h +++ b/include/ruby/internal/intern/object.h @@ -20,9 +20,9 @@ * extension libraries. They could be written in C++98. * @brief Public APIs related to ::rb_cObject. */ -#include "ruby/impl/attr/pure.h" -#include "ruby/impl/dllexport.h" -#include "ruby/impl/value.h" +#include "ruby/internal/attr/pure.h" +#include "ruby/internal/dllexport.h" +#include "ruby/internal/value.h" RBIMPL_SYMBOL_EXPORT_BEGIN() diff --git a/include/ruby/internal/intern/parse.h b/include/ruby/internal/intern/parse.h index cc6424f539..4a5b8cb147 100644 --- a/include/ruby/internal/intern/parse.h +++ b/include/ruby/internal/intern/parse.h @@ -20,9 +20,9 @@ * extension libraries. They could be written in C++98. * @brief Public APIs related to ::rb_cSymbol. */ -#include "ruby/impl/attr/const.h" -#include "ruby/impl/dllexport.h" -#include "ruby/impl/value.h" +#include "ruby/internal/attr/const.h" +#include "ruby/internal/dllexport.h" +#include "ruby/internal/value.h" RBIMPL_SYMBOL_EXPORT_BEGIN() diff --git a/include/ruby/internal/intern/proc.h b/include/ruby/internal/intern/proc.h index 7ee864d9a3..d6f77cbd4d 100644 --- a/include/ruby/internal/intern/proc.h +++ b/include/ruby/internal/intern/proc.h @@ -20,9 +20,9 @@ * extension libraries. They could be written in C++98. * @brief Public APIs related to ::rb_cProc. */ -#include "ruby/impl/dllexport.h" -#include "ruby/impl/iterator.h" -#include "ruby/impl/value.h" +#include "ruby/internal/dllexport.h" +#include "ruby/internal/iterator.h" +#include "ruby/internal/value.h" RBIMPL_SYMBOL_EXPORT_BEGIN() diff --git a/include/ruby/internal/intern/process.h b/include/ruby/internal/intern/process.h index bbbea1f86a..2b1005a205 100644 --- a/include/ruby/internal/intern/process.h +++ b/include/ruby/internal/intern/process.h @@ -20,10 +20,10 @@ * extension libraries. They could be written in C++98. * @brief Public APIs related to ::rb_mProcess. */ -#include "ruby/impl/attr/noreturn.h" -#include "ruby/impl/config.h" /* rb_pid_t is defined here. */ -#include "ruby/impl/dllexport.h" -#include "ruby/impl/value.h" +#include "ruby/internal/attr/noreturn.h" +#include "ruby/internal/config.h" /* rb_pid_t is defined here. */ +#include "ruby/internal/dllexport.h" +#include "ruby/internal/value.h" RBIMPL_SYMBOL_EXPORT_BEGIN() diff --git a/include/ruby/internal/intern/random.h b/include/ruby/internal/intern/random.h index 2f054cd688..25c52f4ce4 100644 --- a/include/ruby/internal/intern/random.h +++ b/include/ruby/internal/intern/random.h @@ -24,8 +24,8 @@ * generator", ACM Trans. on Modeling and Computer Simulation, 8 * (1): pp 3-30, 1998. https://doi.org/10.1145/272991.272995 */ -#include "ruby/impl/dllexport.h" -#include "ruby/impl/value.h" +#include "ruby/internal/dllexport.h" +#include "ruby/internal/value.h" RBIMPL_SYMBOL_EXPORT_BEGIN() diff --git a/include/ruby/internal/intern/range.h b/include/ruby/internal/intern/range.h index 0841baa0d5..7ca47915e2 100644 --- a/include/ruby/internal/intern/range.h +++ b/include/ruby/internal/intern/range.h @@ -20,8 +20,8 @@ * extension libraries. They could be written in C++98. * @brief Public APIs related to ::rb_cRange. */ -#include "ruby/impl/dllexport.h" -#include "ruby/impl/value.h" +#include "ruby/internal/dllexport.h" +#include "ruby/internal/value.h" RBIMPL_SYMBOL_EXPORT_BEGIN() diff --git a/include/ruby/internal/intern/rational.h b/include/ruby/internal/intern/rational.h index d56a6ec752..30a87ff31f 100644 --- a/include/ruby/internal/intern/rational.h +++ b/include/ruby/internal/intern/rational.h @@ -20,9 +20,9 @@ * extension libraries. They could be written in C++98. * @brief Public APIs related to ::rb_cRational. */ -#include "ruby/impl/dllexport.h" -#include "ruby/impl/value.h" -#include "ruby/impl/arithmetic/long.h" /* INT2FIX is here. */ +#include "ruby/internal/dllexport.h" +#include "ruby/internal/value.h" +#include "ruby/internal/arithmetic/long.h" /* INT2FIX is here. */ RBIMPL_SYMBOL_EXPORT_BEGIN() diff --git a/include/ruby/internal/intern/re.h b/include/ruby/internal/intern/re.h index 4392cef1a2..dd7baef954 100644 --- a/include/ruby/internal/intern/re.h +++ b/include/ruby/internal/intern/re.h @@ -20,8 +20,8 @@ * extension libraries. They could be written in C++98. * @brief Public APIs related to ::rb_cRegexp. */ -#include "ruby/impl/dllexport.h" -#include "ruby/impl/value.h" +#include "ruby/internal/dllexport.h" +#include "ruby/internal/value.h" RBIMPL_SYMBOL_EXPORT_BEGIN() diff --git a/include/ruby/internal/intern/ruby.h b/include/ruby/internal/intern/ruby.h index bbfda510d5..9d9a71cf7a 100644 --- a/include/ruby/internal/intern/ruby.h +++ b/include/ruby/internal/intern/ruby.h @@ -20,8 +20,8 @@ * extension libraries. They could be written in C++98. * @brief Process-global APIs. */ -#include "ruby/impl/dllexport.h" -#include "ruby/impl/value.h" +#include "ruby/internal/dllexport.h" +#include "ruby/internal/value.h" RBIMPL_SYMBOL_EXPORT_BEGIN() diff --git a/include/ruby/internal/intern/select.h b/include/ruby/internal/intern/select.h index 09244dcce5..43d4cf354c 100644 --- a/include/ruby/internal/intern/select.h +++ b/include/ruby/internal/intern/select.h @@ -22,22 +22,22 @@ * @note Functions and structs defined in this header file are not * necessarily ruby-specific. They don't need ::VALUE etc. */ -#include "ruby/impl/config.h" +#include "ruby/internal/config.h" #ifdef HAVE_SYS_TYPES_H # include <sys/types.h> /* for NFDBITS (BSD Net/2) */ #endif -#include "ruby/impl/dllexport.h" +#include "ruby/internal/dllexport.h" /* thread.c */ #if defined(NFDBITS) && defined(HAVE_RB_FD_INIT) -# include "ruby/impl/intern/select/largesize.h" +# include "ruby/internal/intern/select/largesize.h" #elif defined(_WIN32) -# include "ruby/impl/intern/select/win32.h" +# include "ruby/internal/intern/select/win32.h" # define rb_fd_resize(n, f) ((void)(f)) #else -# include "ruby/impl/intern/select/posix.h" +# include "ruby/internal/intern/select/posix.h" # define rb_fd_resize(n, f) ((void)(f)) #endif diff --git a/include/ruby/internal/intern/select/largesize.h b/include/ruby/internal/intern/select/largesize.h index c5f321f1dc..ba56a159b1 100644 --- a/include/ruby/internal/intern/select/largesize.h +++ b/include/ruby/internal/intern/select/largesize.h @@ -55,9 +55,9 @@ * * So `rb_fd_set` doesn't reject file descriptors bigger than `FD_SETSIZE`. */ -#include "ruby/impl/attr/nonnull.h" -#include "ruby/impl/attr/pure.h" -#include "ruby/impl/dllexport.h" +#include "ruby/internal/attr/nonnull.h" +#include "ruby/internal/attr/pure.h" +#include "ruby/internal/dllexport.h" /**@cond INTERNAL_MACRO */ #define rb_fd_ptr rb_fd_ptr diff --git a/include/ruby/internal/intern/select/posix.h b/include/ruby/internal/intern/select/posix.h index a2ac51df92..6c1092b39d 100644 --- a/include/ruby/internal/intern/select/posix.h +++ b/include/ruby/internal/intern/select/posix.h @@ -20,7 +20,7 @@ * extension libraries. They could be written in C++98. * @brief Public APIs to provide ::rb_fd_select(). */ -#include "ruby/impl/config.h" +#include "ruby/internal/config.h" #ifdef HAVE_SYS_SELECT_H # include <sys/select.h> /* for select(2) (modern POSIX) */ @@ -30,8 +30,8 @@ # include <unistd.h> /* for select(2) (archaic UNIX) */ #endif -#include "ruby/impl/attr/pure.h" -#include "ruby/impl/attr/const.h" +#include "ruby/internal/attr/pure.h" +#include "ruby/internal/attr/const.h" typedef fd_set rb_fdset_t; diff --git a/include/ruby/internal/intern/select/win32.h b/include/ruby/internal/intern/select/win32.h index 0a1da61e63..ef75a0f760 100644 --- a/include/ruby/internal/intern/select/win32.h +++ b/include/ruby/internal/intern/select/win32.h @@ -20,11 +20,11 @@ * extension libraries. They could be written in C++98. * @brief Public APIs to provide ::rb_fd_select(). */ -#include "ruby/impl/dosish.h" /* for rb_w32_select */ -#include "ruby/impl/attr/nonnull.h" -#include "ruby/impl/attr/pure.h" -#include "ruby/impl/attr/noalias.h" -#include "ruby/impl/dllexport.h" +#include "ruby/internal/dosish.h" /* for rb_w32_select */ +#include "ruby/internal/attr/nonnull.h" +#include "ruby/internal/attr/pure.h" +#include "ruby/internal/attr/noalias.h" +#include "ruby/internal/dllexport.h" #include "ruby/assert.h" /**@cond INTERNAL_MACRO */ diff --git a/include/ruby/internal/intern/signal.h b/include/ruby/internal/intern/signal.h index 43ce470c2e..b6171d1bf4 100644 --- a/include/ruby/internal/intern/signal.h +++ b/include/ruby/internal/intern/signal.h @@ -20,9 +20,9 @@ * extension libraries. They could be written in C++98. * @brief Signal handling APIs. */ -#include "ruby/impl/config.h" /* POSIX_SIGNAL / RETSIGTYPE */ -#include "ruby/impl/dllexport.h" -#include "ruby/impl/value.h" +#include "ruby/internal/config.h" /* POSIX_SIGNAL / RETSIGTYPE */ +#include "ruby/internal/dllexport.h" +#include "ruby/internal/value.h" RBIMPL_SYMBOL_EXPORT_BEGIN() diff --git a/include/ruby/internal/intern/sprintf.h b/include/ruby/internal/intern/sprintf.h index c2b1818cdf..2c90548353 100644 --- a/include/ruby/internal/intern/sprintf.h +++ b/include/ruby/internal/intern/sprintf.h @@ -20,9 +20,9 @@ * extension libraries. They could be written in C++98. * @brief Our own private printf(3). */ -#include "ruby/impl/attr/format.h" -#include "ruby/impl/dllexport.h" -#include "ruby/impl/value.h" +#include "ruby/internal/attr/format.h" +#include "ruby/internal/dllexport.h" +#include "ruby/internal/value.h" RBIMPL_SYMBOL_EXPORT_BEGIN() diff --git a/include/ruby/internal/intern/string.h b/include/ruby/internal/intern/string.h index ba4107c79f..e08029f20f 100644 --- a/include/ruby/internal/intern/string.h +++ b/include/ruby/internal/intern/string.h @@ -20,7 +20,7 @@ * extension libraries. They could be written in C++98. * @brief Public APIs related to ::rb_cString. */ -#include "ruby/impl/config.h" +#include "ruby/internal/config.h" #ifdef STDC_HEADERS # include <stddef.h> @@ -34,12 +34,12 @@ # include <stdint.h> #endif -#include "ruby/impl/attr/nonnull.h" -#include "ruby/impl/attr/pure.h" -#include "ruby/impl/constant_p.h" -#include "ruby/impl/dllexport.h" -#include "ruby/impl/value.h" -#include "ruby/impl/variable.h" /* rb_gvar_setter_t */ +#include "ruby/internal/attr/nonnull.h" +#include "ruby/internal/attr/pure.h" +#include "ruby/internal/constant_p.h" +#include "ruby/internal/dllexport.h" +#include "ruby/internal/value.h" +#include "ruby/internal/variable.h" /* rb_gvar_setter_t */ #include "ruby/st.h" /* st_index_t */ RBIMPL_SYMBOL_EXPORT_BEGIN() diff --git a/include/ruby/internal/intern/struct.h b/include/ruby/internal/intern/struct.h index 18d1058d9f..8818da96c7 100644 --- a/include/ruby/internal/intern/struct.h +++ b/include/ruby/internal/intern/struct.h @@ -20,9 +20,9 @@ * extension libraries. They could be written in C++98. * @brief Public APIs related to ::rb_cStruct. */ -#include "ruby/impl/dllexport.h" -#include "ruby/impl/intern/vm.h" /* rb_alloc_func_t */ -#include "ruby/impl/value.h" +#include "ruby/internal/dllexport.h" +#include "ruby/internal/intern/vm.h" /* rb_alloc_func_t */ +#include "ruby/internal/value.h" RBIMPL_SYMBOL_EXPORT_BEGIN() diff --git a/include/ruby/internal/intern/thread.h b/include/ruby/internal/intern/thread.h index 38784fcca3..a12a371058 100644 --- a/include/ruby/internal/intern/thread.h +++ b/include/ruby/internal/intern/thread.h @@ -20,10 +20,10 @@ * extension libraries. They could be written in C++98. * @brief Public APIs related to ::rb_cThread. */ -#include "ruby/impl/config.h" -#include "ruby/impl/cast.h" -#include "ruby/impl/dllexport.h" -#include "ruby/impl/value.h" +#include "ruby/internal/config.h" +#include "ruby/internal/cast.h" +#include "ruby/internal/dllexport.h" +#include "ruby/internal/value.h" RBIMPL_SYMBOL_EXPORT_BEGIN() diff --git a/include/ruby/internal/intern/time.h b/include/ruby/internal/intern/time.h index b49802ccf4..e01f40cfe8 100644 --- a/include/ruby/internal/intern/time.h +++ b/include/ruby/internal/intern/time.h @@ -20,14 +20,14 @@ * extension libraries. They could be written in C++98. * @brief Public APIs related to ::rb_cTime. */ -#include "ruby/impl/config.h" +#include "ruby/internal/config.h" #ifdef HAVE_TIME_H # include <time.h> /* for time_t */ #endif -#include "ruby/impl/dllexport.h" -#include "ruby/impl/value.h" +#include "ruby/internal/dllexport.h" +#include "ruby/internal/value.h" RBIMPL_SYMBOL_EXPORT_BEGIN() diff --git a/include/ruby/internal/intern/variable.h b/include/ruby/internal/intern/variable.h index d8de93a8d6..8210662fa0 100644 --- a/include/ruby/internal/intern/variable.h +++ b/include/ruby/internal/intern/variable.h @@ -20,9 +20,9 @@ * extension libraries. They could be written in C++98. * @brief Public APIs related to names inside of a Ruby program. */ -#include "ruby/impl/attr/noreturn.h" -#include "ruby/impl/dllexport.h" -#include "ruby/impl/value.h" +#include "ruby/internal/attr/noreturn.h" +#include "ruby/internal/dllexport.h" +#include "ruby/internal/value.h" #include "ruby/st.h" RBIMPL_SYMBOL_EXPORT_BEGIN() diff --git a/include/ruby/internal/intern/vm.h b/include/ruby/internal/intern/vm.h index 1fc8423dde..706f160ad8 100644 --- a/include/ruby/internal/intern/vm.h +++ b/include/ruby/internal/intern/vm.h @@ -20,9 +20,9 @@ * extension libraries. They could be written in C++98. * @brief Public APIs related to ::rb_cRubyVM. */ -#include "ruby/impl/attr/noreturn.h" -#include "ruby/impl/dllexport.h" -#include "ruby/impl/value.h" +#include "ruby/internal/attr/noreturn.h" +#include "ruby/internal/dllexport.h" +#include "ruby/internal/value.h" RBIMPL_SYMBOL_EXPORT_BEGIN() diff --git a/include/ruby/internal/interpreter.h b/include/ruby/internal/interpreter.h index 23b70b2926..a500265c17 100644 --- a/include/ruby/internal/interpreter.h +++ b/include/ruby/internal/interpreter.h @@ -20,9 +20,9 @@ * extension libraries. They could be written in C++98. * @brief Interpreter embedding APIs. */ -#include "ruby/impl/attr/noreturn.h" -#include "ruby/impl/dllexport.h" -#include "ruby/impl/value.h" +#include "ruby/internal/attr/noreturn.h" +#include "ruby/internal/dllexport.h" +#include "ruby/internal/value.h" RBIMPL_SYMBOL_EXPORT_BEGIN() diff --git a/include/ruby/internal/iterator.h b/include/ruby/internal/iterator.h index 980c6ebf7f..99c0831b13 100644 --- a/include/ruby/internal/iterator.h +++ b/include/ruby/internal/iterator.h @@ -20,9 +20,9 @@ * extension libraries. They could be written in C++98. * @brief Block related APIs. */ -#include "ruby/impl/attr/noreturn.h" -#include "ruby/impl/dllexport.h" -#include "ruby/impl/value.h" +#include "ruby/internal/attr/noreturn.h" +#include "ruby/internal/dllexport.h" +#include "ruby/internal/value.h" RBIMPL_SYMBOL_EXPORT_BEGIN() diff --git a/include/ruby/internal/memory.h b/include/ruby/internal/memory.h index 8525cff96c..5214f2b391 100644 --- a/include/ruby/internal/memory.h +++ b/include/ruby/internal/memory.h @@ -20,7 +20,7 @@ * extension libraries. They could be written in C++98. * @brief Memory management stuff. */ -#include "ruby/impl/config.h" +#include "ruby/internal/config.h" #ifdef STDC_HEADERS # include <stddef.h> @@ -43,20 +43,20 @@ # pragma intrinsic(_umul128) #endif -#include "ruby/impl/attr/alloc_size.h" -#include "ruby/impl/attr/const.h" -#include "ruby/impl/attr/constexpr.h" -#include "ruby/impl/attr/noalias.h" -#include "ruby/impl/attr/nonnull.h" -#include "ruby/impl/attr/noreturn.h" -#include "ruby/impl/attr/restrict.h" -#include "ruby/impl/attr/returns_nonnull.h" -#include "ruby/impl/cast.h" -#include "ruby/impl/dllexport.h" -#include "ruby/impl/has/builtin.h" -#include "ruby/impl/stdalign.h" -#include "ruby/impl/stdbool.h" -#include "ruby/impl/xmalloc.h" +#include "ruby/internal/attr/alloc_size.h" +#include "ruby/internal/attr/const.h" +#include "ruby/internal/attr/constexpr.h" +#include "ruby/internal/attr/noalias.h" +#include "ruby/internal/attr/nonnull.h" +#include "ruby/internal/attr/noreturn.h" +#include "ruby/internal/attr/restrict.h" +#include "ruby/internal/attr/returns_nonnull.h" +#include "ruby/internal/cast.h" +#include "ruby/internal/dllexport.h" +#include "ruby/internal/has/builtin.h" +#include "ruby/internal/stdalign.h" +#include "ruby/internal/stdbool.h" +#include "ruby/internal/xmalloc.h" #include "ruby/backward/2/limits.h" #include "ruby/backward/2/long_long.h" #include "ruby/backward/2/assume.h" diff --git a/include/ruby/internal/method.h b/include/ruby/internal/method.h index fd2d9af070..67600e8732 100644 --- a/include/ruby/internal/method.h +++ b/include/ruby/internal/method.h @@ -20,8 +20,8 @@ * extension libraries. They could be written in C++98. * @brief Creation and modification of Ruby methods. */ -#include "ruby/impl/dllexport.h" -#include "ruby/impl/value.h" +#include "ruby/internal/dllexport.h" +#include "ruby/internal/value.h" #include "ruby/backward/2/stdarg.h" RBIMPL_SYMBOL_EXPORT_BEGIN() diff --git a/include/ruby/internal/module.h b/include/ruby/internal/module.h index 8dc1988b5b..0f2dfdb1be 100644 --- a/include/ruby/internal/module.h +++ b/include/ruby/internal/module.h @@ -20,8 +20,8 @@ * extension libraries. They could be written in C++98. * @brief Creation and modification of Ruby modules. */ -#include "ruby/impl/dllexport.h" -#include "ruby/impl/value.h" +#include "ruby/internal/dllexport.h" +#include "ruby/internal/value.h" RBIMPL_SYMBOL_EXPORT_BEGIN() diff --git a/include/ruby/internal/newobj.h b/include/ruby/internal/newobj.h index 0f7e9ba06c..684226e54b 100644 --- a/include/ruby/internal/newobj.h +++ b/include/ruby/internal/newobj.h @@ -20,12 +20,12 @@ * extension libraries. They could be written in C++98. * @brief Defines #NEWOBJ. */ -#include "ruby/impl/cast.h" -#include "ruby/impl/core/rbasic.h" -#include "ruby/impl/dllexport.h" -#include "ruby/impl/fl_type.h" -#include "ruby/impl/special_consts.h" -#include "ruby/impl/value.h" +#include "ruby/internal/cast.h" +#include "ruby/internal/core/rbasic.h" +#include "ruby/internal/dllexport.h" +#include "ruby/internal/fl_type.h" +#include "ruby/internal/special_consts.h" +#include "ruby/internal/value.h" #include "ruby/assert.h" #define RB_NEWOBJ(obj,type) type *(obj) = RBIMPL_CAST((type *)rb_newobj()) diff --git a/include/ruby/internal/rgengc.h b/include/ruby/internal/rgengc.h index 34096455fb..610e8f10a5 100644 --- a/include/ruby/internal/rgengc.h +++ b/include/ruby/internal/rgengc.h @@ -24,12 +24,12 @@ * International Symposium on Memory Management (ISMM 2019), pp * 115-121, 2019. https://doi.org/10.1145/3315573.3329986 */ -#include "ruby/impl/attr/artificial.h" -#include "ruby/impl/attr/pure.h" -#include "ruby/impl/dllexport.h" -#include "ruby/impl/special_consts.h" -#include "ruby/impl/stdbool.h" -#include "ruby/impl/value.h" +#include "ruby/internal/attr/artificial.h" +#include "ruby/internal/attr/pure.h" +#include "ruby/internal/dllexport.h" +#include "ruby/internal/special_consts.h" +#include "ruby/internal/stdbool.h" +#include "ruby/internal/value.h" #include "ruby/assert.h" #include "ruby/backward/2/attributes.h" diff --git a/include/ruby/internal/scan_args.h b/include/ruby/internal/scan_args.h index ca31786175..3ad4e9531d 100644 --- a/include/ruby/internal/scan_args.h +++ b/include/ruby/internal/scan_args.h @@ -23,21 +23,21 @@ * This is a beast. It statically analyses the argument spec string, and * expands the assignment of variables into dedicated codes. */ -#include "ruby/impl/attr/diagnose_if.h" -#include "ruby/impl/attr/error.h" -#include "ruby/impl/attr/forceinline.h" -#include "ruby/impl/attr/noreturn.h" -#include "ruby/impl/config.h" -#include "ruby/impl/dllexport.h" -#include "ruby/impl/has/attribute.h" -#include "ruby/impl/intern/array.h" /* rb_ary_new_from_values */ -#include "ruby/impl/intern/error.h" /* rb_error_arity */ -#include "ruby/impl/intern/hash.h" /* rb_hash_dup */ -#include "ruby/impl/intern/proc.h" /* rb_block_proc */ -#include "ruby/impl/iterator.h" /* rb_block_given_p / rb_keyword_given_p */ -#include "ruby/impl/static_assert.h" -#include "ruby/impl/stdbool.h" -#include "ruby/impl/value.h" +#include "ruby/internal/attr/diagnose_if.h" +#include "ruby/internal/attr/error.h" +#include "ruby/internal/attr/forceinline.h" +#include "ruby/internal/attr/noreturn.h" +#include "ruby/internal/config.h" +#include "ruby/internal/dllexport.h" +#include "ruby/internal/has/attribute.h" +#include "ruby/internal/intern/array.h" /* rb_ary_new_from_values */ +#include "ruby/internal/intern/error.h" /* rb_error_arity */ +#include "ruby/internal/intern/hash.h" /* rb_hash_dup */ +#include "ruby/internal/intern/proc.h" /* rb_block_proc */ +#include "ruby/internal/iterator.h" /* rb_block_given_p / rb_keyword_given_p */ +#include "ruby/internal/static_assert.h" +#include "ruby/internal/stdbool.h" +#include "ruby/internal/value.h" #include "ruby/assert.h" #define RB_SCAN_ARGS_PASS_CALLED_KEYWORDS 0 diff --git a/include/ruby/internal/special_consts.h b/include/ruby/internal/special_consts.h index 5fb3b8eb94..f36a230af2 100644 --- a/include/ruby/internal/special_consts.h +++ b/include/ruby/internal/special_consts.h @@ -24,12 +24,12 @@ * SIGPPL Workshop on Programming and Programming Languages * (PPL2008), pp. 9-16, 2008. */ -#include "ruby/impl/attr/artificial.h" -#include "ruby/impl/attr/const.h" -#include "ruby/impl/attr/constexpr.h" -#include "ruby/impl/attr/enum_extensibility.h" -#include "ruby/impl/stdbool.h" -#include "ruby/impl/value.h" +#include "ruby/internal/attr/artificial.h" +#include "ruby/internal/attr/const.h" +#include "ruby/internal/attr/constexpr.h" +#include "ruby/internal/attr/enum_extensibility.h" +#include "ruby/internal/stdbool.h" +#include "ruby/internal/value.h" #if defined(USE_FLONUM) # /* Take that. */ diff --git a/include/ruby/internal/static_assert.h b/include/ruby/internal/static_assert.h index e7788ab31a..d4bdadf196 100644 --- a/include/ruby/internal/static_assert.h +++ b/include/ruby/internal/static_assert.h @@ -21,8 +21,8 @@ * @brief Defines #RBIMPL_STATIC_ASSERT. */ #include <assert.h> -#include "ruby/impl/has/extension.h" -#include "ruby/impl/compiler_since.h" +#include "ruby/internal/has/extension.h" +#include "ruby/internal/compiler_since.h" /** @cond INTERNAL_MACRO */ #if defined(__cplusplus) && defined(__cpp_static_assert) diff --git a/include/ruby/internal/stdalign.h b/include/ruby/internal/stdalign.h index a3dcfb90ef..8c56fbbd69 100644 --- a/include/ruby/internal/stdalign.h +++ b/include/ruby/internal/stdalign.h @@ -20,18 +20,18 @@ * extension libraries. They could be written in C++98. * @brief Defines #RBIMPL_ALIGNAS / #RBIMPL_ALIGNOF */ -#include "ruby/impl/config.h" +#include "ruby/internal/config.h" #ifdef HAVE_STDALIGN_H # include <stdalign.h> #endif -#include "ruby/impl/compiler_is.h" -#include "ruby/impl/compiler_since.h" -#include "ruby/impl/has/feature.h" -#include "ruby/impl/has/extension.h" -#include "ruby/impl/has/attribute.h" -#include "ruby/impl/has/declspec_attribute.h" +#include "ruby/internal/compiler_is.h" +#include "ruby/internal/compiler_since.h" +#include "ruby/internal/has/feature.h" +#include "ruby/internal/has/extension.h" +#include "ruby/internal/has/attribute.h" +#include "ruby/internal/has/declspec_attribute.h" /** * Wraps (or simulates) `alignas`. This is C++11's `alignas` and is _different_ diff --git a/include/ruby/internal/stdbool.h b/include/ruby/internal/stdbool.h index 36ccaa0c6f..0cd5103a05 100644 --- a/include/ruby/internal/stdbool.h +++ b/include/ruby/internal/stdbool.h @@ -20,7 +20,7 @@ * extension libraries. They could be written in C++98. * @brief C99 shim for <stdbool.h> */ -#include "ruby/impl/config.h" +#include "ruby/internal/config.h" #if defined(__bool_true_false_are_defined) # /* Take that. */ diff --git a/include/ruby/internal/symbol.h b/include/ruby/internal/symbol.h index a7b2358894..762f1e8f9b 100644 --- a/include/ruby/internal/symbol.h +++ b/include/ruby/internal/symbol.h @@ -20,7 +20,7 @@ * extension libraries. They could be written in C++98. * @brief Defines #rb_intern */ -#include "ruby/impl/config.h" +#include "ruby/internal/config.h" #ifdef HAVE_STDDEF_H # include <stddef.h> @@ -30,14 +30,14 @@ # include <string.h> #endif -#include "ruby/impl/attr/nonnull.h" -#include "ruby/impl/attr/pure.h" -#include "ruby/impl/attr/noalias.h" -#include "ruby/impl/cast.h" -#include "ruby/impl/constant_p.h" -#include "ruby/impl/dllexport.h" -#include "ruby/impl/has/builtin.h" -#include "ruby/impl/value.h" +#include "ruby/internal/attr/nonnull.h" +#include "ruby/internal/attr/pure.h" +#include "ruby/internal/attr/noalias.h" +#include "ruby/internal/cast.h" +#include "ruby/internal/constant_p.h" +#include "ruby/internal/dllexport.h" +#include "ruby/internal/has/builtin.h" +#include "ruby/internal/value.h" #define RB_ID2SYM rb_id2sym #define RB_SYM2ID rb_sym2id diff --git a/include/ruby/internal/token_paste.h b/include/ruby/internal/token_paste.h index 473fd597f8..c42f7a67ef 100644 --- a/include/ruby/internal/token_paste.h +++ b/include/ruby/internal/token_paste.h @@ -20,10 +20,10 @@ * extension libraries. They could be written in C++98. * @brief Defines #RBIMPL_TOKEN_PASTE. */ -#include "ruby/impl/config.h" -#include "ruby/impl/compiler_since.h" -#include "ruby/impl/has/warning.h" -#include "ruby/impl/warning_push.h" +#include "ruby/internal/config.h" +#include "ruby/internal/compiler_since.h" +#include "ruby/internal/has/warning.h" +#include "ruby/internal/warning_push.h" /* :TODO: add your compiler here. There are many compilers that can suppress * warnings via pragmas, but not all of them accept such things inside of `#if` diff --git a/include/ruby/internal/value.h b/include/ruby/internal/value.h index 905cc04187..b87fe140af 100644 --- a/include/ruby/internal/value.h +++ b/include/ruby/internal/value.h @@ -20,7 +20,7 @@ * extension libraries. They could be written in C++98. * @brief Defines ::VALUE and ::ID. */ -#include "ruby/impl/static_assert.h" +#include "ruby/internal/static_assert.h" #include "ruby/backward/2/long_long.h" #include "ruby/backward/2/limits.h" diff --git a/include/ruby/internal/value_type.h b/include/ruby/internal/value_type.h index be1b3559b6..70a89a4854 100644 --- a/include/ruby/internal/value_type.h +++ b/include/ruby/internal/value_type.h @@ -20,20 +20,20 @@ * extension libraries. They could be written in C++98. * @brief Defines enum ::ruby_value_type. */ -#include "ruby/impl/assume.h" -#include "ruby/impl/attr/artificial.h" -#include "ruby/impl/attr/cold.h" -#include "ruby/impl/attr/enum_extensibility.h" -#include "ruby/impl/attr/forceinline.h" -#include "ruby/impl/attr/pure.h" -#include "ruby/impl/cast.h" -#include "ruby/impl/constant_p.h" -#include "ruby/impl/core/rbasic.h" -#include "ruby/impl/dllexport.h" -#include "ruby/impl/has/builtin.h" -#include "ruby/impl/special_consts.h" -#include "ruby/impl/stdbool.h" -#include "ruby/impl/value.h" +#include "ruby/internal/assume.h" +#include "ruby/internal/attr/artificial.h" +#include "ruby/internal/attr/cold.h" +#include "ruby/internal/attr/enum_extensibility.h" +#include "ruby/internal/attr/forceinline.h" +#include "ruby/internal/attr/pure.h" +#include "ruby/internal/cast.h" +#include "ruby/internal/constant_p.h" +#include "ruby/internal/core/rbasic.h" +#include "ruby/internal/dllexport.h" +#include "ruby/internal/has/builtin.h" +#include "ruby/internal/special_consts.h" +#include "ruby/internal/stdbool.h" +#include "ruby/internal/value.h" #include "ruby/assert.h" #if defined(T_DATA) @@ -321,7 +321,7 @@ RB_TYPE_P(VALUE obj, enum ruby_value_type t) RBIMPL_ATTR_PURE() RBIMPL_ATTR_ARTIFICIAL() -/* Defined in ruby/impl/core/rtypeddata.h */ +/* Defined in ruby/internal/core/rtypeddata.h */ static inline bool rbimpl_rtypeddata_p(VALUE obj); RBIMPL_ATTR_ARTIFICIAL() diff --git a/include/ruby/internal/variable.h b/include/ruby/internal/variable.h index 70aa43ea44..b0cfa61a62 100644 --- a/include/ruby/internal/variable.h +++ b/include/ruby/internal/variable.h @@ -20,9 +20,9 @@ * extension libraries. They could be written in C++98. * @brief C-function backended Ruby-global variables. */ -#include "ruby/impl/dllexport.h" -#include "ruby/impl/value.h" -#include "ruby/impl/attr/noreturn.h" +#include "ruby/internal/dllexport.h" +#include "ruby/internal/value.h" +#include "ruby/internal/attr/noreturn.h" RBIMPL_SYMBOL_EXPORT_BEGIN() diff --git a/include/ruby/internal/warning_push.h b/include/ruby/internal/warning_push.h index e13e749b82..b8a21aaeab 100644 --- a/include/ruby/internal/warning_push.h +++ b/include/ruby/internal/warning_push.h @@ -43,8 +43,8 @@ * RBIMPL_WARNING_POP() * ``` */ -#include "ruby/impl/compiler_is.h" -#include "ruby/impl/compiler_since.h" +#include "ruby/internal/compiler_is.h" +#include "ruby/internal/compiler_since.h" #if RBIMPL_COMPILER_SINCE(MSVC, 12, 0, 0) # /* Not sure exactly when but it seems VC++ 6.0 is a version with it.*/ diff --git a/include/ruby/internal/xmalloc.h b/include/ruby/internal/xmalloc.h index 145a3e236f..b0fe863139 100644 --- a/include/ruby/internal/xmalloc.h +++ b/include/ruby/internal/xmalloc.h @@ -20,7 +20,7 @@ * extension libraries. They could be written in C++98. * @brief Declares ::ruby_xmalloc(). */ -#include "ruby/impl/config.h" +#include "ruby/internal/config.h" #ifdef STDC_HEADERS # include <stddef.h> @@ -30,12 +30,12 @@ # include <stdlib.h> #endif -#include "ruby/impl/attr/alloc_size.h" -#include "ruby/impl/attr/nodiscard.h" -#include "ruby/impl/attr/noexcept.h" -#include "ruby/impl/attr/restrict.h" -#include "ruby/impl/attr/returns_nonnull.h" -#include "ruby/impl/dllexport.h" +#include "ruby/internal/attr/alloc_size.h" +#include "ruby/internal/attr/nodiscard.h" +#include "ruby/internal/attr/noexcept.h" +#include "ruby/internal/attr/restrict.h" +#include "ruby/internal/attr/returns_nonnull.h" +#include "ruby/internal/dllexport.h" #ifndef USE_GC_MALLOC_OBJ_INFO_DETAILS # define USE_GC_MALLOC_OBJ_INFO_DETAILS 0 diff --git a/include/ruby/io.h b/include/ruby/io.h index 118298c59b..5527b02b2e 100644 --- a/include/ruby/io.h +++ b/include/ruby/io.h @@ -10,7 +10,7 @@ * modify this file, provided that the conditions mentioned in the * file COPYING are met. Consult the file for details. */ -#include "ruby/impl/config.h" +#include "ruby/internal/config.h" #include <stdio.h> #include "ruby/encoding.h" @@ -41,7 +41,7 @@ # define RB_WAITFD_OUT 0x004 #endif -#include "ruby/impl/dllexport.h" +#include "ruby/internal/dllexport.h" RBIMPL_SYMBOL_EXPORT_BEGIN() PACKED_STRUCT_UNALIGNED(struct rb_io_buffer_t { diff --git a/include/ruby/missing.h b/include/ruby/missing.h index ecbcf22674..f83f1b695c 100644 --- a/include/ruby/missing.h +++ b/include/ruby/missing.h @@ -10,7 +10,7 @@ * file COPYING are met. Consult the file for details. * @brief Prototype for *.c in ./missing, and for missing timeval struct. */ -#include "ruby/impl/config.h" +#include "ruby/internal/config.h" #ifdef STDC_HEADERS # include <stddef.h> @@ -38,7 +38,7 @@ # include <ieeefp.h> #endif -#include "ruby/impl/dllexport.h" +#include "ruby/internal/dllexport.h" #ifndef M_PI # define M_PI 3.14159265358979323846 diff --git a/include/ruby/re.h b/include/ruby/re.h index c52e6e55c4..ec0f425db0 100644 --- a/include/ruby/re.h +++ b/include/ruby/re.h @@ -10,13 +10,13 @@ * modify this file, provided that the conditions mentioned in the * file COPYING are met. Consult the file for details. */ -#include "ruby/impl/config.h" +#include "ruby/internal/config.h" #include <sys/types.h> #include <stdio.h> #include "ruby/regex.h" -#include "ruby/impl/core/rmatch.h" -#include "ruby/impl/dllexport.h" +#include "ruby/internal/core/rmatch.h" +#include "ruby/internal/dllexport.h" RBIMPL_SYMBOL_EXPORT_BEGIN() diff --git a/include/ruby/ruby.h b/include/ruby/ruby.h index c8374a15ed..0f11d423f2 100644 --- a/include/ruby/ruby.h +++ b/include/ruby/ruby.h @@ -12,7 +12,7 @@ * modify this file, provided that the conditions mentioned in the * file COPYING are met. Consult the file for details. */ -#include "ruby/impl/config.h" +#include "ruby/internal/config.h" #ifdef HAVE_INTRINSICS_H # include <intrinsics.h> @@ -21,32 +21,32 @@ #include <stdarg.h> #include "defines.h" -#include "ruby/impl/anyargs.h" -#include "ruby/impl/arithmetic.h" -#include "ruby/impl/core.h" -#include "ruby/impl/ctype.h" -#include "ruby/impl/dllexport.h" -#include "ruby/impl/error.h" -#include "ruby/impl/eval.h" -#include "ruby/impl/event.h" -#include "ruby/impl/fl_type.h" -#include "ruby/impl/gc.h" -#include "ruby/impl/glob.h" -#include "ruby/impl/globals.h" -#include "ruby/impl/has/warning.h" -#include "ruby/impl/interpreter.h" -#include "ruby/impl/iterator.h" -#include "ruby/impl/memory.h" -#include "ruby/impl/method.h" -#include "ruby/impl/module.h" -#include "ruby/impl/newobj.h" -#include "ruby/impl/rgengc.h" -#include "ruby/impl/scan_args.h" -#include "ruby/impl/special_consts.h" -#include "ruby/impl/symbol.h" -#include "ruby/impl/value.h" -#include "ruby/impl/value_type.h" -#include "ruby/impl/variable.h" +#include "ruby/internal/anyargs.h" +#include "ruby/internal/arithmetic.h" +#include "ruby/internal/core.h" +#include "ruby/internal/ctype.h" +#include "ruby/internal/dllexport.h" +#include "ruby/internal/error.h" +#include "ruby/internal/eval.h" +#include "ruby/internal/event.h" +#include "ruby/internal/fl_type.h" +#include "ruby/internal/gc.h" +#include "ruby/internal/glob.h" +#include "ruby/internal/globals.h" +#include "ruby/internal/has/warning.h" +#include "ruby/internal/interpreter.h" +#include "ruby/internal/iterator.h" +#include "ruby/internal/memory.h" +#include "ruby/internal/method.h" +#include "ruby/internal/module.h" +#include "ruby/internal/newobj.h" +#include "ruby/internal/rgengc.h" +#include "ruby/internal/scan_args.h" +#include "ruby/internal/special_consts.h" +#include "ruby/internal/symbol.h" +#include "ruby/internal/value.h" +#include "ruby/internal/value_type.h" +#include "ruby/internal/variable.h" #include "ruby/assert.h" #include "ruby/backward/2/assume.h" #include "ruby/backward/2/inttypes.h" diff --git a/include/ruby/thread.h b/include/ruby/thread.h index 1f8e5a66f7..b05537badb 100644 --- a/include/ruby/thread.h +++ b/include/ruby/thread.h @@ -11,7 +11,7 @@ * file COPYING are met. Consult the file for details. */ #include "ruby/intern.h" -#include "ruby/impl/dllexport.h" +#include "ruby/internal/dllexport.h" /* flags for rb_nogvl */ #define RB_NOGVL_INTR_FAIL (0x1) diff --git a/include/ruby/util.h b/include/ruby/util.h index 61b58365cf..07d9f323c4 100644 --- a/include/ruby/util.h +++ b/include/ruby/util.h @@ -10,8 +10,8 @@ * modify this file, provided that the conditions mentioned in the * file COPYING are met. Consult the file for details. */ -#include "ruby/impl/config.h" -#include "ruby/impl/dllexport.h" +#include "ruby/internal/config.h" +#include "ruby/internal/dllexport.h" #include "ruby/defines.h" #ifndef _ diff --git a/include/ruby/vm.h b/include/ruby/vm.h index 921abf958f..7bdd567453 100644 --- a/include/ruby/vm.h +++ b/include/ruby/vm.h @@ -10,7 +10,7 @@ * modify this file, provided that the conditions mentioned in the * file COPYING are met. Consult the file for details. */ -#include "ruby/impl/dllexport.h" +#include "ruby/internal/dllexport.h" RBIMPL_SYMBOL_EXPORT_BEGIN() |