ruby-changes:61187
From: =E5=8D=9C=E9=83=A8=E6=98=8C=E5=B9=B3 <ko1@a...>
Date: Mon, 11 May 2020 09:24:33 +0900 (JST)
Subject: [ruby-changes:61187] 122f96c362 (master): sed -i s/ruby3/rbimpl/g
https://git.ruby-lang.org/ruby.git/commit/?id=122f96c362 From 122f96c362c0391045d9b10d81d3681cb2455da5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8D=9C=E9=83=A8=E6=98=8C=E5=B9=B3?= <shyouhei@r...> Date: Mon, 4 May 2020 16:27:48 +0900 Subject: sed -i s/ruby3/rbimpl/g diff --git a/gc.c b/gc.c index 3b2a2d8..063f793 100644 --- a/gc.c +++ b/gc.c @@ -109,7 +109,7 @@ https://github.com/ruby/ruby/blob/trunk/gc.c#L109 #define rb_jmp_buf rb_jmpbuf_t #undef rb_data_object_wrap -static inline struct ruby3_size_mul_overflow_tag +static inline struct rbimpl_size_mul_overflow_tag size_add_overflow(size_t x, size_t y) { size_t z; @@ -131,24 +131,24 @@ size_add_overflow(size_t x, size_t y) https://github.com/ruby/ruby/blob/trunk/gc.c#L131 p = z < y; #endif - return (struct ruby3_size_mul_overflow_tag) { p, z, }; + return (struct rbimpl_size_mul_overflow_tag) { p, z, }; } -static inline struct ruby3_size_mul_overflow_tag +static inline struct rbimpl_size_mul_overflow_tag size_mul_add_overflow(size_t x, size_t y, size_t z) /* x * y + z */ { - struct ruby3_size_mul_overflow_tag t = ruby3_size_mul_overflow(x, y); - struct ruby3_size_mul_overflow_tag u = size_add_overflow(t.right, z); - return (struct ruby3_size_mul_overflow_tag) { t.left || u.left, u.right }; + struct rbimpl_size_mul_overflow_tag t = rbimpl_size_mul_overflow(x, y); + struct rbimpl_size_mul_overflow_tag u = size_add_overflow(t.right, z); + return (struct rbimpl_size_mul_overflow_tag) { t.left || u.left, u.right }; } -static inline struct ruby3_size_mul_overflow_tag +static inline struct rbimpl_size_mul_overflow_tag size_mul_add_mul_overflow(size_t x, size_t y, size_t z, size_t w) /* x * y + z * w */ { - struct ruby3_size_mul_overflow_tag t = ruby3_size_mul_overflow(x, y); - struct ruby3_size_mul_overflow_tag u = ruby3_size_mul_overflow(z, w); - struct ruby3_size_mul_overflow_tag v = size_add_overflow(t.right, u.right); - return (struct ruby3_size_mul_overflow_tag) { t.left || u.left || v.left, v.right }; + struct rbimpl_size_mul_overflow_tag t = rbimpl_size_mul_overflow(x, y); + struct rbimpl_size_mul_overflow_tag u = rbimpl_size_mul_overflow(z, w); + struct rbimpl_size_mul_overflow_tag v = size_add_overflow(t.right, u.right); + return (struct rbimpl_size_mul_overflow_tag) { t.left || u.left || v.left, v.right }; } PRINTF_ARGS(NORETURN(static void gc_raise(VALUE, const char*, ...)), 2, 3); @@ -156,7 +156,7 @@ PRINTF_ARGS(NORETURN(static void gc_raise(VALUE, const char*, ...)), 2, 3); https://github.com/ruby/ruby/blob/trunk/gc.c#L156 static inline size_t size_mul_or_raise(size_t x, size_t y, VALUE exc) { - struct ruby3_size_mul_overflow_tag t = ruby3_size_mul_overflow(x, y); + struct rbimpl_size_mul_overflow_tag t = rbimpl_size_mul_overflow(x, y); if (LIKELY(!t.left)) { return t.right; } @@ -182,7 +182,7 @@ rb_size_mul_or_raise(size_t x, size_t y, VALUE exc) https://github.com/ruby/ruby/blob/trunk/gc.c#L182 static inline size_t size_mul_add_or_raise(size_t x, size_t y, size_t z, VALUE exc) { - struct ruby3_size_mul_overflow_tag t = size_mul_add_overflow(x, y, z); + struct rbimpl_size_mul_overflow_tag t = size_mul_add_overflow(x, y, z); if (LIKELY(!t.left)) { return t.right; } @@ -209,7 +209,7 @@ rb_size_mul_add_or_raise(size_t x, size_t y, size_t z, VALUE exc) https://github.com/ruby/ruby/blob/trunk/gc.c#L209 static inline size_t size_mul_add_mul_or_raise(size_t x, size_t y, size_t z, size_t w, VALUE exc) { - struct ruby3_size_mul_overflow_tag t = size_mul_add_mul_overflow(x, y, z, w); + struct rbimpl_size_mul_overflow_tag t = size_mul_add_mul_overflow(x, y, z, w); if (LIKELY(!t.left)) { return t.right; } diff --git a/include/ruby/assert.h b/include/ruby/assert.h index 3c578c4..69e160c 100644 --- a/include/ruby/assert.h +++ b/include/ruby/assert.h @@ -8,7 +8,7 @@ https://github.com/ruby/ruby/blob/trunk/include/ruby/assert.h#L8 * Permission is hereby granted, to either redistribute and/or * modify this file, provided that the conditions mentioned in the * file COPYING are met. Consult the file for details. - * @warning Symbols prefixed with either `RBIMPL` or `ruby3` are + * @warning Symbols prefixed with either `RBIMPL` or `rbimpl` are * implementation details. Don't take them as canon. They could * rapidly appear then vanish. The name (path) of this header file * is also an implementation detail. Do not expect it to persist diff --git a/include/ruby/backward/2/assume.h b/include/ruby/backward/2/assume.h index d6fbcd7..e512ff2 100644 --- a/include/ruby/backward/2/assume.h +++ b/include/ruby/backward/2/assume.h @@ -7,7 +7,7 @@ https://github.com/ruby/ruby/blob/trunk/include/ruby/backward/2/assume.h#L7 * Permission is hereby granted, to either redistribute and/or * modify this file, provided that the conditions mentioned in the * file COPYING are met. Consult the file for details. - * @warning Symbols prefixed with either `RBIMPL` or `ruby3` are + * @warning Symbols prefixed with either `RBIMPL` or `rbimpl` are * implementation details. Don't take them as canon. They could * rapidly appear then vanish. The name (path) of this header file * is also an implementation detail. Do not expect it to persist diff --git a/include/ruby/backward/2/attributes.h b/include/ruby/backward/2/attributes.h index 4fd0b99..fb59d91 100644 --- a/include/ruby/backward/2/attributes.h +++ b/include/ruby/backward/2/attributes.h @@ -7,7 +7,7 @@ https://github.com/ruby/ruby/blob/trunk/include/ruby/backward/2/attributes.h#L7 * Permission is hereby granted, to either redistribute and/or * modify this file, provided that the conditions mentioned in the * file COPYING are met. Consult the file for details. - * @warning Symbols prefixed with either `RBIMPL` or `ruby3` are + * @warning Symbols prefixed with either `RBIMPL` or `rbimpl` are * implementation details. Don't take them as canon. They could * rapidly appear then vanish. The name (path) of this header file * is also an implementation detail. Do not expect it to persist diff --git a/include/ruby/backward/2/bool.h b/include/ruby/backward/2/bool.h index c488998..08c01fc 100644 --- a/include/ruby/backward/2/bool.h +++ b/include/ruby/backward/2/bool.h @@ -7,7 +7,7 @@ https://github.com/ruby/ruby/blob/trunk/include/ruby/backward/2/bool.h#L7 * Permission is hereby granted, to either redistribute and/or * modify this file, provided that the conditions mentioned in the * file COPYING are met. Consult the file for details. - * @warning Symbols prefixed with either `RBIMPL` or `ruby3` are + * @warning Symbols prefixed with either `RBIMPL` or `rbimpl` are * implementation details. Don't take them as canon. They could * rapidly appear then vanish. The name (path) of this header file * is also an implementation detail. Do not expect it to persist diff --git a/include/ruby/backward/2/extern.h b/include/ruby/backward/2/extern.h index 8b4987e..d7c3e36 100644 --- a/include/ruby/backward/2/extern.h +++ b/include/ruby/backward/2/extern.h @@ -7,7 +7,7 @@ https://github.com/ruby/ruby/blob/trunk/include/ruby/backward/2/extern.h#L7 * Permission is hereby granted, to either redistribute and/or * modify this file, provided that the conditions mentioned in the * file COPYING are met. Consult the file for details. - * @warning Symbols prefixed with either `RBIMPL` or `ruby3` are + * @warning Symbols prefixed with either `RBIMPL` or `rbimpl` are * implementation details. Don't take them as canon. They could * rapidly appear then vanish. The name (path) of this header file * is also an implementation detail. Do not expect it to persist diff --git a/include/ruby/backward/2/gcc_version_since.h b/include/ruby/backward/2/gcc_version_since.h index a0111bc..bc376be 100644 --- a/include/ruby/backward/2/gcc_version_since.h +++ b/include/ruby/backward/2/gcc_version_since.h @@ -7,7 +7,7 @@ https://github.com/ruby/ruby/blob/trunk/include/ruby/backward/2/gcc_version_since.h#L7 * Permission is hereby granted, to either redistribute and/or * modify this file, provided that the conditions mentioned in the * file COPYING are met. Consult the file for details. - * @warning Symbols prefixed with either `RBIMPL` or `ruby3` are + * @warning Symbols prefixed with either `RBIMPL` or `rbimpl` are * implementation details. Don't take them as canon. They could * rapidly appear then vanish. The name (path) of this header file * is also an implementation detail. Do not expect it to persist diff --git a/include/ruby/backward/2/inttypes.h b/include/ruby/backward/2/inttypes.h index 91cf9ac..732c8a1 100644 --- a/include/ruby/backward/2/inttypes.h +++ b/include/ruby/backward/2/inttypes.h @@ -7,7 +7,7 @@ https://github.com/ruby/ruby/blob/trunk/include/ruby/backward/2/inttypes.h#L7 * Permission is hereby granted, to either redistribute and/or * modify this file, provided that the conditions mentioned in the * file COPYING are met. Consult the file for details. - * @warning Symbols prefixed with either `RBIMPL` or `ruby3` are + * @warning Symbols prefixed with either `RBIMPL` or `rbimpl` are * implementation details. Don't take them as can (... truncated) -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/