From d7f4d732c199df24620a162372c71ee83ed21e62 Mon Sep 17 00:00:00 2001 From: 卜部昌平 Date: Mon, 4 May 2020 15:35:26 +0900 Subject: sed -i s|ruby/3|ruby/impl|g This shall fix compile errors. --- internal/array.h | 4 ++-- internal/bignum.h | 4 ++-- internal/bits.h | 2 +- internal/class.h | 2 +- internal/compile.h | 2 +- internal/compilers.h | 16 ++++++++-------- internal/complex.h | 2 +- internal/error.h | 4 ++-- internal/fixnum.h | 4 ++-- internal/gc.h | 2 +- internal/hash.h | 4 ++-- internal/imemo.h | 4 ++-- internal/missing.h | 2 +- internal/mjit.h | 2 +- internal/process.h | 2 +- internal/rational.h | 2 +- internal/re.h | 2 +- internal/sanitizers.h | 4 ++-- internal/serial.h | 2 +- internal/static_assert.h | 2 +- internal/string.h | 4 ++-- internal/struct.h | 2 +- internal/time.h | 2 +- internal/transcode.h | 2 +- internal/util.h | 2 +- internal/variable.h | 4 ++-- internal/vm.h | 2 +- internal/warnings.h | 2 +- 28 files changed, 44 insertions(+), 44 deletions(-) (limited to 'internal') diff --git a/internal/array.h b/internal/array.h index 8f346aad63..97735d38eb 100644 --- a/internal/array.h +++ b/internal/array.h @@ -9,10 +9,10 @@ * file COPYING are met. Consult the file for details. * @brief Internal header for Array. */ -#include "ruby/3/config.h" +#include "ruby/impl/config.h" #include /* for size_t */ #include "internal/static_assert.h" /* for STATIC_ASSERT */ -#include "ruby/3/stdbool.h" /* for bool */ +#include "ruby/impl/stdbool.h" /* for bool */ #include "ruby/ruby.h" /* for RARRAY_LEN */ #ifndef ARRAY_DEBUG diff --git a/internal/bignum.h b/internal/bignum.h index 6850a14399..884689eaa3 100644 --- a/internal/bignum.h +++ b/internal/bignum.h @@ -9,14 +9,14 @@ * file COPYING are met. Consult the file for details. * @brief Internal header for Bignums. */ -#include "ruby/3/config.h" /* for HAVE_LIBGMP */ +#include "ruby/impl/config.h" /* for HAVE_LIBGMP */ #include /* for size_t */ #ifdef HAVE_SYS_TYPES_H # include /* for ssize_t (note: on Windows ssize_t is */ #endif /* `#define`d in ruby/config.h) */ -#include "ruby/3/stdbool.h" /* for bool */ +#include "ruby/impl/stdbool.h" /* for bool */ #include "ruby/ruby.h" /* for struct RBasic */ #ifndef BDIGIT diff --git a/internal/bits.h b/internal/bits.h index 1dc5531d8c..40ad01eaf3 100644 --- a/internal/bits.h +++ b/internal/bits.h @@ -26,7 +26,7 @@ * @see https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_rotr64 * @see https://stackoverflow.com/a/776523 */ -#include "ruby/3/config.h" +#include "ruby/impl/config.h" #include /* for CHAR_BITS */ #include /* for uintptr_t */ #include "internal/compilers.h" /* for MSC_VERSION_SINCE */ diff --git a/internal/class.h b/internal/class.h index 7b9400b38b..ba80e7e395 100644 --- a/internal/class.h +++ b/internal/class.h @@ -12,7 +12,7 @@ #include "id_table.h" /* for struct rb_id_table */ #include "internal/gc.h" /* for RB_OBJ_WRITE */ #include "internal/serial.h" /* for rb_serial_t */ -#include "ruby/3/stdbool.h" /* for bool */ +#include "ruby/impl/stdbool.h" /* for bool */ #include "ruby/intern.h" /* for rb_alloc_func_t */ #include "ruby/ruby.h" /* for struct RBasic */ diff --git a/internal/compile.h b/internal/compile.h index 435fbfe22a..0276f0ad04 100644 --- a/internal/compile.h +++ b/internal/compile.h @@ -9,7 +9,7 @@ * file COPYING are met. Consult the file for details. * @brief Internal header for the compiler. */ -#include "ruby/3/config.h" +#include "ruby/impl/config.h" #include /* for size_t */ #include "ruby/ruby.h" /* for rb_event_flag_t */ diff --git a/internal/compilers.h b/internal/compilers.h index 10b119b61b..f5b5f8b70d 100644 --- a/internal/compilers.h +++ b/internal/compilers.h @@ -9,14 +9,14 @@ * file COPYING are met. Consult the file for details. * @brief Internal header absorbing C compipler differences. */ -#include "ruby/3/compiler_since.h" -#include "ruby/3/has/attribute.h" -#include "ruby/3/has/builtin.h" -#include "ruby/3/has/c_attribute.h" -#include "ruby/3/has/declspec_attribute.h" -#include "ruby/3/has/extension.h" -#include "ruby/3/has/feature.h" -#include "ruby/3/has/warning.h" +#include "ruby/impl/compiler_since.h" +#include "ruby/impl/has/attribute.h" +#include "ruby/impl/has/builtin.h" +#include "ruby/impl/has/c_attribute.h" +#include "ruby/impl/has/declspec_attribute.h" +#include "ruby/impl/has/extension.h" +#include "ruby/impl/has/feature.h" +#include "ruby/impl/has/warning.h" #include "ruby/backward/2/gcc_version_since.h" #define MSC_VERSION_SINCE(_) RUBY3_COMPILER_SINCE(MSVC, (_) / 100, (_) % 100, 0) diff --git a/internal/complex.h b/internal/complex.h index afabd36fbc..effee4b0ad 100644 --- a/internal/complex.h +++ b/internal/complex.h @@ -9,7 +9,7 @@ * file COPYING are met. Consult the file for details. * @brief Internal header for Complex. */ -#include "ruby/3/value.h" /* for struct RBasic */ +#include "ruby/impl/value.h" /* for struct RBasic */ struct RComplex { struct RBasic basic; diff --git a/internal/error.h b/internal/error.h index b6fd25b915..c9605c781f 100644 --- a/internal/error.h +++ b/internal/error.h @@ -9,10 +9,10 @@ * file COPYING are met. Consult the file for details. * @brief Internal header for Exception. */ -#include "ruby/3/config.h" +#include "ruby/impl/config.h" #include /* for va_list */ #include "internal/string.h" /* for rb_fstring_cstr */ -#include "ruby/3/stdbool.h" /* for bool */ +#include "ruby/impl/stdbool.h" /* for bool */ #include "ruby/encoding.h" /* for rb_encoding */ #include "ruby/intern.h" /* for rb_exc_raise */ #include "ruby/ruby.h" /* for enum ruby_value_type */ diff --git a/internal/fixnum.h b/internal/fixnum.h index 5d081488f7..c4c73c9481 100644 --- a/internal/fixnum.h +++ b/internal/fixnum.h @@ -9,10 +9,10 @@ * file COPYING are met. Consult the file for details. * @brief Internal header for Fixnums. */ -#include "ruby/3/config.h" /* for HAVE_LONG_LONG */ +#include "ruby/impl/config.h" /* for HAVE_LONG_LONG */ #include /* for CHAR_BIT */ #include "internal/compilers.h" /* for __has_builtin */ -#include "ruby/3/stdbool.h" /* for bool */ +#include "ruby/impl/stdbool.h" /* for bool */ #include "ruby/intern.h" /* for rb_big_mul */ #include "ruby/ruby.h" /* for RB_FIXABLE */ diff --git a/internal/gc.h b/internal/gc.h index fb4b1bbde9..68a7a88903 100644 --- a/internal/gc.h +++ b/internal/gc.h @@ -9,7 +9,7 @@ * file COPYING are met. Consult the file for details. * @brief Internal header for GC. */ -#include "ruby/3/config.h" +#include "ruby/impl/config.h" #include /* for size_t */ diff --git a/internal/hash.h b/internal/hash.h index f33d225953..25a6969e8a 100644 --- a/internal/hash.h +++ b/internal/hash.h @@ -9,9 +9,9 @@ * file COPYING are met. Consult the file for details. * @brief Internal header for Hash. */ -#include "ruby/3/config.h" +#include "ruby/impl/config.h" #include /* for size_t */ -#include "ruby/3/stdbool.h" /* for bool */ +#include "ruby/impl/stdbool.h" /* for bool */ #include "ruby/ruby.h" /* for struct RBasic */ #include "ruby/st.h" /* for struct st_table */ diff --git a/internal/imemo.h b/internal/imemo.h index 0fbbac3a4c..c9117976ff 100644 --- a/internal/imemo.h +++ b/internal/imemo.h @@ -9,11 +9,11 @@ * file COPYING are met. Consult the file for details. * @brief IMEMO: Internal memo object. */ -#include "ruby/3/config.h" +#include "ruby/impl/config.h" #include /* for size_t */ #include "internal/array.h" /* for rb_ary_tmp_new_fill */ #include "internal/gc.h" /* for RB_OBJ_WRITE */ -#include "ruby/3/stdbool.h" /* for bool */ +#include "ruby/impl/stdbool.h" /* for bool */ #include "ruby/ruby.h" /* for rb_block_call_func_t */ #ifndef IMEMO_DEBUG diff --git a/internal/missing.h b/internal/missing.h index cff5f94729..9e4cafb1b1 100644 --- a/internal/missing.h +++ b/internal/missing.h @@ -9,7 +9,7 @@ * file COPYING are met. Consult the file for details. * @brief Internal header corresponding missing. */ -#include "ruby/3/config.h" /* for HAVE_SETPROCTITLE */ +#include "ruby/impl/config.h" /* for HAVE_SETPROCTITLE */ /* missing/setproctitle.c */ #ifndef HAVE_SETPROCTITLE diff --git a/internal/mjit.h b/internal/mjit.h index 0f8540592b..d2331ba3fc 100644 --- a/internal/mjit.h +++ b/internal/mjit.h @@ -9,7 +9,7 @@ * file COPYING are met. Consult the file for details. * @brief Internal header for MJIT. */ -#include "ruby/3/stdbool.h" /* for bool */ +#include "ruby/impl/stdbool.h" /* for bool */ #include "ruby/ruby.h" /* for VALUE */ /* mjit.c */ diff --git a/internal/process.h b/internal/process.h index 1ee9b03cca..b5b3c9462f 100644 --- a/internal/process.h +++ b/internal/process.h @@ -9,7 +9,7 @@ * file COPYING are met. Consult the file for details. * @brief Internal header for Process. */ -#include "ruby/3/config.h" /* for rb_pid_t */ +#include "ruby/impl/config.h" /* for rb_pid_t */ #include /* for size_t */ #ifdef HAVE_SYS_TYPES_H diff --git a/internal/rational.h b/internal/rational.h index 8006470df7..e9a156277e 100644 --- a/internal/rational.h +++ b/internal/rational.h @@ -9,7 +9,7 @@ * file COPYING are met. Consult the file for details. * @brief Internal header for Rational. */ -#include "ruby/3/config.h" /* for HAVE_LIBGMP */ +#include "ruby/impl/config.h" /* for HAVE_LIBGMP */ #include "ruby/ruby.h" /* for struct RBasic */ #include "internal/gc.h" /* for RB_OBJ_WRITE */ #include "internal/numeric.h" /* for INT_POSITIVE_P */ diff --git a/internal/re.h b/internal/re.h index f771c4e8a0..5b9170b643 100644 --- a/internal/re.h +++ b/internal/re.h @@ -9,7 +9,7 @@ * file COPYING are met. Consult the file for details. * @brief Internal header for Regexp. */ -#include "ruby/3/stdbool.h" /* for bool */ +#include "ruby/impl/stdbool.h" /* for bool */ #include "ruby/ruby.h" /* for VALUE */ /* re.c */ diff --git a/internal/sanitizers.h b/internal/sanitizers.h index 628c225439..d54306250c 100644 --- a/internal/sanitizers.h +++ b/internal/sanitizers.h @@ -9,7 +9,7 @@ * file COPYING are met. Consult the file for details. * @brief Internal header for ASAN / MSAN / etc. */ -#include "ruby/3/config.h" +#include "ruby/impl/config.h" #include "internal/compilers.h" /* for __has_feature */ #ifdef HAVE_VALGRIND_MEMCHECK_H @@ -26,7 +26,7 @@ # endif #endif -#include "ruby/3/stdbool.h" /* for bool */ +#include "ruby/impl/stdbool.h" /* for bool */ #include "ruby/ruby.h" /* for VALUE */ #if 0 diff --git a/internal/serial.h b/internal/serial.h index 518cef4e93..021f201e0b 100644 --- a/internal/serial.h +++ b/internal/serial.h @@ -9,7 +9,7 @@ * file COPYING are met. Consult the file for details. * @brief Internal header for rb_serial_t. */ -#include "ruby/3/config.h" /* for HAVE_LONG_LONG */ +#include "ruby/impl/config.h" /* for HAVE_LONG_LONG */ #include "ruby/defines.h" /* for LONG_LONG */ #ifndef HAVE_LONG_LONG diff --git a/internal/static_assert.h b/internal/static_assert.h index cc6a59713f..b7abc07b09 100644 --- a/internal/static_assert.h +++ b/internal/static_assert.h @@ -9,7 +9,7 @@ * file COPYING are met. Consult the file for details. * @brief C11 shim for _Static_assert. */ -#include "ruby/3/static_assert.h" +#include "ruby/impl/static_assert.h" #ifndef STATIC_ASSERT # define STATIC_ASSERT RUBY3_STATIC_ASSERT #endif diff --git a/internal/string.h b/internal/string.h index f550719f96..e12bd82a0c 100644 --- a/internal/string.h +++ b/internal/string.h @@ -9,10 +9,10 @@ * file COPYING are met. Consult the file for details. * @brief Internal header for String. */ -#include "ruby/3/config.h" +#include "ruby/impl/config.h" #include /* for size_t */ #include "internal/compilers.h" /* for __has_builtin */ -#include "ruby/3/stdbool.h" /* for bool */ +#include "ruby/impl/stdbool.h" /* for bool */ #include "ruby/encoding.h" /* for rb_encoding */ #include "ruby/ruby.h" /* for VALUE */ diff --git a/internal/struct.h b/internal/struct.h index 2fdd6631de..4166415576 100644 --- a/internal/struct.h +++ b/internal/struct.h @@ -9,7 +9,7 @@ * file COPYING are met. Consult the file for details. * @brief Internal header for Struct. */ -#include "ruby/3/stdbool.h" /* for bool */ +#include "ruby/impl/stdbool.h" /* for bool */ #include "internal/gc.h" /* for RB_OBJ_WRITE */ #include "ruby/ruby.h" /* for struct RBasic */ diff --git a/internal/time.h b/internal/time.h index d7dc34e3dd..75eae6ed19 100644 --- a/internal/time.h +++ b/internal/time.h @@ -9,7 +9,7 @@ * file COPYING are met. Consult the file for details. * @brief Internal header for Time. */ -#include "ruby/3/config.h" /* for SIGNEDNESS_OF_TIME_T */ +#include "ruby/impl/config.h" /* for SIGNEDNESS_OF_TIME_T */ #include "internal/bits.h" /* for SIGNED_INTEGER_MAX */ #include "ruby/ruby.h" /* for VALUE */ diff --git a/internal/transcode.h b/internal/transcode.h index 452e13a1a6..4531ffebcc 100644 --- a/internal/transcode.h +++ b/internal/transcode.h @@ -9,7 +9,7 @@ * file COPYING are met. Consult the file for details. * @brief Internal header for Encoding::Converter. */ -#include "ruby/3/config.h" +#include "ruby/impl/config.h" #include /* for size_t */ #include "ruby/ruby.h" /* for VALUE */ #include "ruby/encoding.h" /* for rb_econv_t */ diff --git a/internal/util.h b/internal/util.h index fdb3f3020a..f0f970a7ef 100644 --- a/internal/util.h +++ b/internal/util.h @@ -10,7 +10,7 @@ * @brief Internal header corresponding util.c. * @warning DO NOT ADD RANDOM GARBAGE HERE THIS FILE IS FOR util.c */ -#include "ruby/3/config.h" +#include "ruby/impl/config.h" #include /* for size_t */ #ifdef HAVE_SYS_TYPES_H diff --git a/internal/variable.h b/internal/variable.h index 8defc1523c..daf7784f16 100644 --- a/internal/variable.h +++ b/internal/variable.h @@ -9,10 +9,10 @@ * file COPYING are met. Consult the file for details. * @brief Internal header for variables. */ -#include "ruby/3/config.h" +#include "ruby/impl/config.h" #include /* for size_t */ #include "constant.h" /* for rb_const_entry_t */ -#include "ruby/3/stdbool.h" /* for bool */ +#include "ruby/impl/stdbool.h" /* for bool */ #include "ruby/ruby.h" /* for VALUE */ /* global variable */ diff --git a/internal/vm.h b/internal/vm.h index 6bd45007be..116cc2897c 100644 --- a/internal/vm.h +++ b/internal/vm.h @@ -9,7 +9,7 @@ * file COPYING are met. Consult the file for details. * @brief Internal header for RubyVM. */ -#include "ruby/3/stdbool.h" /* for bool */ +#include "ruby/impl/stdbool.h" /* for bool */ #include "internal/serial.h" /* for rb_serial_t */ #include "internal/static_assert.h" /* for STATIC_ASSERT */ #include "ruby/ruby.h" /* for ID */ diff --git a/internal/warnings.h b/internal/warnings.h index ae41dcba23..9a8017997b 100644 --- a/internal/warnings.h +++ b/internal/warnings.h @@ -9,7 +9,7 @@ * file COPYING are met. Consult the file for details. * @brief Internal header to suppres / mandate warnings. */ -#include "ruby/3/warning_push.h" +#include "ruby/impl/warning_push.h" #define COMPILER_WARNING_PUSH RUBY3_WARNING_PUSH() #define COMPILER_WARNING_POP RUBY3_WARNING_POP() #define COMPILER_WARNING_ERROR(flag) RUBY3_WARNING_ERROR(flag) -- cgit v1.2.3