update referenced filenames from namespace to box

Merged: https://github.com/ruby/ruby/pull/15075

box.c

@@ -2,6 +2,7 @@
 
 #include "eval_intern.h"
 #include "internal.h"
+#include "internal/box.h"
 #include "internal/class.h"
 #include "internal/eval.h"
 #include "internal/error.h"
@@ -9,7 +10,6 @@
 #include "internal/gc.h"
 #include "internal/hash.h"
 #include "internal/load.h"
-#include "internal/namespace.h"
 #include "internal/st.h"
 #include "internal/variable.h"
 #include "iseq.h"

class.c

@@ -21,10 +21,10 @@
 #include "debug_counter.h"
 #include "id_table.h"
 #include "internal.h"
+#include "internal/box.h"
 #include "internal/class.h"
 #include "internal/eval.h"
 #include "internal/hash.h"
-#include "internal/namespace.h"
 #include "internal/object.h"
 #include "internal/string.h"
 #include "internal/variable.h"

common.mk

@@ -119,6 +119,7 @@ COMMONOBJS    = \
 		array.$(OBJEXT) \
 		ast.$(OBJEXT) \
 		bignum.$(OBJEXT) \
+		box.$(OBJEXT) \
 		class.$(OBJEXT) \
 		compar.$(OBJEXT) \
 		compile.$(OBJEXT) \
@@ -146,7 +147,6 @@ COMMONOBJS    = \
 		marshal.$(OBJEXT) \
 		math.$(OBJEXT) \
 		memory_view.$(OBJEXT) \
-		namespace.$(OBJEXT) \
 		node.$(OBJEXT) \
 		node_dump.$(OBJEXT) \
 		numeric.$(OBJEXT) \

dln.c

@@ -25,8 +25,8 @@ static void dln_loaderror(const char *format, ...);
 #endif
 #include "dln.h"
 #include "internal.h"
+#include "internal/box.h"
 #include "internal/compilers.h"
-#include "internal/namespace.h"
 
 #ifdef HAVE_STDLIB_H
 # include <stdlib.h>

ext/coverage/depend

@@ -183,11 +183,11 @@ coverage.o: $(top_srcdir)/id_table.h
 coverage.o: $(top_srcdir)/internal.h
 coverage.o: $(top_srcdir)/internal/array.h
 coverage.o: $(top_srcdir)/internal/basic_operators.h
+coverage.o: $(top_srcdir)/internal/box.h
 coverage.o: $(top_srcdir)/internal/compilers.h
 coverage.o: $(top_srcdir)/internal/gc.h
 coverage.o: $(top_srcdir)/internal/hash.h
 coverage.o: $(top_srcdir)/internal/imemo.h
-coverage.o: $(top_srcdir)/internal/namespace.h
 coverage.o: $(top_srcdir)/internal/sanitizers.h
 coverage.o: $(top_srcdir)/internal/serial.h
 coverage.o: $(top_srcdir)/internal/set_table.h

ext/objspace/depend

@@ -182,10 +182,10 @@ object_tracing.o: $(top_srcdir)/id_table.h
 object_tracing.o: $(top_srcdir)/internal.h
 object_tracing.o: $(top_srcdir)/internal/array.h
 object_tracing.o: $(top_srcdir)/internal/basic_operators.h
+object_tracing.o: $(top_srcdir)/internal/box.h
 object_tracing.o: $(top_srcdir)/internal/compilers.h
 object_tracing.o: $(top_srcdir)/internal/gc.h
 object_tracing.o: $(top_srcdir)/internal/imemo.h
-object_tracing.o: $(top_srcdir)/internal/namespace.h
 object_tracing.o: $(top_srcdir)/internal/sanitizers.h
 object_tracing.o: $(top_srcdir)/internal/serial.h
 object_tracing.o: $(top_srcdir)/internal/set_table.h
@@ -391,12 +391,12 @@ objspace.o: $(top_srcdir)/id_table.h
 objspace.o: $(top_srcdir)/internal.h
 objspace.o: $(top_srcdir)/internal/array.h
 objspace.o: $(top_srcdir)/internal/basic_operators.h
+objspace.o: $(top_srcdir)/internal/box.h
 objspace.o: $(top_srcdir)/internal/class.h
 objspace.o: $(top_srcdir)/internal/compilers.h
 objspace.o: $(top_srcdir)/internal/gc.h
 objspace.o: $(top_srcdir)/internal/hash.h
 objspace.o: $(top_srcdir)/internal/imemo.h
-objspace.o: $(top_srcdir)/internal/namespace.h
 objspace.o: $(top_srcdir)/internal/sanitizers.h
 objspace.o: $(top_srcdir)/internal/serial.h
 objspace.o: $(top_srcdir)/internal/set_table.h
@@ -605,13 +605,13 @@ objspace_dump.o: $(top_srcdir)/id_table.h
 objspace_dump.o: $(top_srcdir)/internal.h
 objspace_dump.o: $(top_srcdir)/internal/array.h
 objspace_dump.o: $(top_srcdir)/internal/basic_operators.h
+objspace_dump.o: $(top_srcdir)/internal/box.h
 objspace_dump.o: $(top_srcdir)/internal/class.h
 objspace_dump.o: $(top_srcdir)/internal/compilers.h
 objspace_dump.o: $(top_srcdir)/internal/gc.h
 objspace_dump.o: $(top_srcdir)/internal/hash.h
 objspace_dump.o: $(top_srcdir)/internal/imemo.h
 objspace_dump.o: $(top_srcdir)/internal/io.h
-objspace_dump.o: $(top_srcdir)/internal/namespace.h
 objspace_dump.o: $(top_srcdir)/internal/sanitizers.h
 objspace_dump.o: $(top_srcdir)/internal/serial.h
 objspace_dump.o: $(top_srcdir)/internal/set_table.h

ext/ripper/depend

@@ -584,6 +584,7 @@ ripper.o: $(top_srcdir)/internal/array.h
 ripper.o: $(top_srcdir)/internal/basic_operators.h
 ripper.o: $(top_srcdir)/internal/bignum.h
 ripper.o: $(top_srcdir)/internal/bits.h
+ripper.o: $(top_srcdir)/internal/box.h
 ripper.o: $(top_srcdir)/internal/compile.h
 ripper.o: $(top_srcdir)/internal/compilers.h
 ripper.o: $(top_srcdir)/internal/complex.h
@@ -594,7 +595,6 @@ ripper.o: $(top_srcdir)/internal/gc.h
 ripper.o: $(top_srcdir)/internal/hash.h
 ripper.o: $(top_srcdir)/internal/imemo.h
 ripper.o: $(top_srcdir)/internal/io.h
-ripper.o: $(top_srcdir)/internal/namespace.h
 ripper.o: $(top_srcdir)/internal/numeric.h
 ripper.o: $(top_srcdir)/internal/parse.h
 ripper.o: $(top_srcdir)/internal/rational.h

ext/socket/depend

@@ -197,12 +197,12 @@ ancdata.o: $(top_srcdir)/id_table.h
 ancdata.o: $(top_srcdir)/internal.h
 ancdata.o: $(top_srcdir)/internal/array.h
 ancdata.o: $(top_srcdir)/internal/basic_operators.h
+ancdata.o: $(top_srcdir)/internal/box.h
 ancdata.o: $(top_srcdir)/internal/compilers.h
 ancdata.o: $(top_srcdir)/internal/error.h
 ancdata.o: $(top_srcdir)/internal/gc.h
 ancdata.o: $(top_srcdir)/internal/imemo.h
 ancdata.o: $(top_srcdir)/internal/io.h
-ancdata.o: $(top_srcdir)/internal/namespace.h
 ancdata.o: $(top_srcdir)/internal/sanitizers.h
 ancdata.o: $(top_srcdir)/internal/serial.h
 ancdata.o: $(top_srcdir)/internal/set_table.h
@@ -412,12 +412,12 @@ basicsocket.o: $(top_srcdir)/id_table.h
 basicsocket.o: $(top_srcdir)/internal.h
 basicsocket.o: $(top_srcdir)/internal/array.h
 basicsocket.o: $(top_srcdir)/internal/basic_operators.h
+basicsocket.o: $(top_srcdir)/internal/box.h
 basicsocket.o: $(top_srcdir)/internal/compilers.h
 basicsocket.o: $(top_srcdir)/internal/error.h
 basicsocket.o: $(top_srcdir)/internal/gc.h
 basicsocket.o: $(top_srcdir)/internal/imemo.h
 basicsocket.o: $(top_srcdir)/internal/io.h
-basicsocket.o: $(top_srcdir)/internal/namespace.h
 basicsocket.o: $(top_srcdir)/internal/sanitizers.h
 basicsocket.o: $(top_srcdir)/internal/serial.h
 basicsocket.o: $(top_srcdir)/internal/set_table.h
@@ -627,12 +627,12 @@ constants.o: $(top_srcdir)/id_table.h
 constants.o: $(top_srcdir)/internal.h
 constants.o: $(top_srcdir)/internal/array.h
 constants.o: $(top_srcdir)/internal/basic_operators.h
+constants.o: $(top_srcdir)/internal/box.h
 constants.o: $(top_srcdir)/internal/compilers.h
 constants.o: $(top_srcdir)/internal/error.h
 constants.o: $(top_srcdir)/internal/gc.h
 constants.o: $(top_srcdir)/internal/imemo.h
 constants.o: $(top_srcdir)/internal/io.h
-constants.o: $(top_srcdir)/internal/namespace.h
 constants.o: $(top_srcdir)/internal/sanitizers.h
 constants.o: $(top_srcdir)/internal/serial.h
 constants.o: $(top_srcdir)/internal/set_table.h
@@ -843,12 +843,12 @@ ifaddr.o: $(top_srcdir)/id_table.h
 ifaddr.o: $(top_srcdir)/internal.h
 ifaddr.o: $(top_srcdir)/internal/array.h
 ifaddr.o: $(top_srcdir)/internal/basic_operators.h
+ifaddr.o: $(top_srcdir)/internal/box.h
 ifaddr.o: $(top_srcdir)/internal/compilers.h
 ifaddr.o: $(top_srcdir)/internal/error.h
 ifaddr.o: $(top_srcdir)/internal/gc.h
 ifaddr.o: $(top_srcdir)/internal/imemo.h
 ifaddr.o: $(top_srcdir)/internal/io.h
-ifaddr.o: $(top_srcdir)/internal/namespace.h
 ifaddr.o: $(top_srcdir)/internal/sanitizers.h
 ifaddr.o: $(top_srcdir)/internal/serial.h
 ifaddr.o: $(top_srcdir)/internal/set_table.h
@@ -1058,12 +1058,12 @@ init.o: $(top_srcdir)/id_table.h
 init.o: $(top_srcdir)/internal.h
 init.o: $(top_srcdir)/internal/array.h
 init.o: $(top_srcdir)/internal/basic_operators.h
+init.o: $(top_srcdir)/internal/box.h
 init.o: $(top_srcdir)/internal/compilers.h
 init.o: $(top_srcdir)/internal/error.h
 init.o: $(top_srcdir)/internal/gc.h
 init.o: $(top_srcdir)/internal/imemo.h
 init.o: $(top_srcdir)/internal/io.h
-init.o: $(top_srcdir)/internal/namespace.h
 init.o: $(top_srcdir)/internal/sanitizers.h
 init.o: $(top_srcdir)/internal/serial.h
 init.o: $(top_srcdir)/internal/set_table.h
@@ -1273,12 +1273,12 @@ ipsocket.o: $(top_srcdir)/id_table.h
 ipsocket.o: $(top_srcdir)/internal.h
 ipsocket.o: $(top_srcdir)/internal/array.h
 ipsocket.o: $(top_srcdir)/internal/basic_operators.h
+ipsocket.o: $(top_srcdir)/internal/box.h
 ipsocket.o: $(top_srcdir)/internal/compilers.h
 ipsocket.o: $(top_srcdir)/internal/error.h
 ipsocket.o: $(top_srcdir)/internal/gc.h
 ipsocket.o: $(top_srcdir)/internal/imemo.h
 ipsocket.o: $(top_srcdir)/internal/io.h
-ipsocket.o: $(top_srcdir)/internal/namespace.h
 ipsocket.o: $(top_srcdir)/internal/sanitizers.h
 ipsocket.o: $(top_srcdir)/internal/serial.h
 ipsocket.o: $(top_srcdir)/internal/set_table.h
@@ -1488,12 +1488,12 @@ option.o: $(top_srcdir)/id_table.h
 option.o: $(top_srcdir)/internal.h
 option.o: $(top_srcdir)/internal/array.h
 option.o: $(top_srcdir)/internal/basic_operators.h
+option.o: $(top_srcdir)/internal/box.h
 option.o: $(top_srcdir)/internal/compilers.h
 option.o: $(top_srcdir)/internal/error.h
 option.o: $(top_srcdir)/internal/gc.h
 option.o: $(top_srcdir)/internal/imemo.h
 option.o: $(top_srcdir)/internal/io.h
-option.o: $(top_srcdir)/internal/namespace.h
 option.o: $(top_srcdir)/internal/sanitizers.h
 option.o: $(top_srcdir)/internal/serial.h
 option.o: $(top_srcdir)/internal/set_table.h
@@ -1703,12 +1703,12 @@ raddrinfo.o: $(top_srcdir)/id_table.h
 raddrinfo.o: $(top_srcdir)/internal.h
 raddrinfo.o: $(top_srcdir)/internal/array.h
 raddrinfo.o: $(top_srcdir)/internal/basic_operators.h
+raddrinfo.o: $(top_srcdir)/internal/box.h
 raddrinfo.o: $(top_srcdir)/internal/compilers.h
 raddrinfo.o: $(top_srcdir)/internal/error.h
 raddrinfo.o: $(top_srcdir)/internal/gc.h
 raddrinfo.o: $(top_srcdir)/internal/imemo.h
 raddrinfo.o: $(top_srcdir)/internal/io.h
-raddrinfo.o: $(top_srcdir)/internal/namespace.h
 raddrinfo.o: $(top_srcdir)/internal/sanitizers.h
 raddrinfo.o: $(top_srcdir)/internal/serial.h
 raddrinfo.o: $(top_srcdir)/internal/set_table.h
@@ -1918,12 +1918,12 @@ socket.o: $(top_srcdir)/id_table.h
 socket.o: $(top_srcdir)/internal.h
 socket.o: $(top_srcdir)/internal/array.h
 socket.o: $(top_srcdir)/internal/basic_operators.h
+socket.o: $(top_srcdir)/internal/box.h
 socket.o: $(top_srcdir)/internal/compilers.h
 socket.o: $(top_srcdir)/internal/error.h
 socket.o: $(top_srcdir)/internal/gc.h
 socket.o: $(top_srcdir)/internal/imemo.h
 socket.o: $(top_srcdir)/internal/io.h
-socket.o: $(top_srcdir)/internal/namespace.h
 socket.o: $(top_srcdir)/internal/sanitizers.h
 socket.o: $(top_srcdir)/internal/serial.h
 socket.o: $(top_srcdir)/internal/set_table.h
@@ -2133,12 +2133,12 @@ sockssocket.o: $(top_srcdir)/id_table.h
 sockssocket.o: $(top_srcdir)/internal.h
 sockssocket.o: $(top_srcdir)/internal/array.h
 sockssocket.o: $(top_srcdir)/internal/basic_operators.h
+sockssocket.o: $(top_srcdir)/internal/box.h
 sockssocket.o: $(top_srcdir)/internal/compilers.h
 sockssocket.o: $(top_srcdir)/internal/error.h
 sockssocket.o: $(top_srcdir)/internal/gc.h
 sockssocket.o: $(top_srcdir)/internal/imemo.h
 sockssocket.o: $(top_srcdir)/internal/io.h
-sockssocket.o: $(top_srcdir)/internal/namespace.h
 sockssocket.o: $(top_srcdir)/internal/sanitizers.h
 sockssocket.o: $(top_srcdir)/internal/serial.h
 sockssocket.o: $(top_srcdir)/internal/set_table.h
@@ -2348,12 +2348,12 @@ tcpserver.o: $(top_srcdir)/id_table.h
 tcpserver.o: $(top_srcdir)/internal.h
 tcpserver.o: $(top_srcdir)/internal/array.h
 tcpserver.o: $(top_srcdir)/internal/basic_operators.h
+tcpserver.o: $(top_srcdir)/internal/box.h
 tcpserver.o: $(top_srcdir)/internal/compilers.h
 tcpserver.o: $(top_srcdir)/internal/error.h
 tcpserver.o: $(top_srcdir)/internal/gc.h
 tcpserver.o: $(top_srcdir)/internal/imemo.h
 tcpserver.o: $(top_srcdir)/internal/io.h
-tcpserver.o: $(top_srcdir)/internal/namespace.h
 tcpserver.o: $(top_srcdir)/internal/sanitizers.h
 tcpserver.o: $(top_srcdir)/internal/serial.h
 tcpserver.o: $(top_srcdir)/internal/set_table.h
@@ -2563,12 +2563,12 @@ tcpsocket.o: $(top_srcdir)/id_table.h
 tcpsocket.o: $(top_srcdir)/internal.h
 tcpsocket.o: $(top_srcdir)/internal/array.h
 tcpsocket.o: $(top_srcdir)/internal/basic_operators.h
+tcpsocket.o: $(top_srcdir)/internal/box.h
 tcpsocket.o: $(top_srcdir)/internal/compilers.h
 tcpsocket.o: $(top_srcdir)/internal/error.h
 tcpsocket.o: $(top_srcdir)/internal/gc.h
 tcpsocket.o: $(top_srcdir)/internal/imemo.h
 tcpsocket.o: $(top_srcdir)/internal/io.h
-tcpsocket.o: $(top_srcdir)/internal/namespace.h
 tcpsocket.o: $(top_srcdir)/internal/sanitizers.h
 tcpsocket.o: $(top_srcdir)/internal/serial.h
 tcpsocket.o: $(top_srcdir)/internal/set_table.h
@@ -2778,12 +2778,12 @@ udpsocket.o: $(top_srcdir)/id_table.h
 udpsocket.o: $(top_srcdir)/internal.h
 udpsocket.o: $(top_srcdir)/internal/array.h
 udpsocket.o: $(top_srcdir)/internal/basic_operators.h
+udpsocket.o: $(top_srcdir)/internal/box.h
 udpsocket.o: $(top_srcdir)/internal/compilers.h
 udpsocket.o: $(top_srcdir)/internal/error.h
 udpsocket.o: $(top_srcdir)/internal/gc.h
 udpsocket.o: $(top_srcdir)/internal/imemo.h
 udpsocket.o: $(top_srcdir)/internal/io.h
-udpsocket.o: $(top_srcdir)/internal/namespace.h
 udpsocket.o: $(top_srcdir)/internal/sanitizers.h
 udpsocket.o: $(top_srcdir)/internal/serial.h
 udpsocket.o: $(top_srcdir)/internal/set_table.h
@@ -2993,12 +2993,12 @@ unixserver.o: $(top_srcdir)/id_table.h
 unixserver.o: $(top_srcdir)/internal.h
 unixserver.o: $(top_srcdir)/internal/array.h
 unixserver.o: $(top_srcdir)/internal/basic_operators.h
+unixserver.o: $(top_srcdir)/internal/box.h
 unixserver.o: $(top_srcdir)/internal/compilers.h
 unixserver.o: $(top_srcdir)/internal/error.h
 unixserver.o: $(top_srcdir)/internal/gc.h
 unixserver.o: $(top_srcdir)/internal/imemo.h
 unixserver.o: $(top_srcdir)/internal/io.h
-unixserver.o: $(top_srcdir)/internal/namespace.h
 unixserver.o: $(top_srcdir)/internal/sanitizers.h
 unixserver.o: $(top_srcdir)/internal/serial.h
 unixserver.o: $(top_srcdir)/internal/set_table.h
@@ -3208,12 +3208,12 @@ unixsocket.o: $(top_srcdir)/id_table.h
 unixsocket.o: $(top_srcdir)/internal.h
 unixsocket.o: $(top_srcdir)/internal/array.h
 unixsocket.o: $(top_srcdir)/internal/basic_operators.h
+unixsocket.o: $(top_srcdir)/internal/box.h
 unixsocket.o: $(top_srcdir)/internal/compilers.h
 unixsocket.o: $(top_srcdir)/internal/error.h
 unixsocket.o: $(top_srcdir)/internal/gc.h
 unixsocket.o: $(top_srcdir)/internal/imemo.h
 unixsocket.o: $(top_srcdir)/internal/io.h
-unixsocket.o: $(top_srcdir)/internal/namespace.h
 unixsocket.o: $(top_srcdir)/internal/sanitizers.h
 unixsocket.o: $(top_srcdir)/internal/serial.h
 unixsocket.o: $(top_srcdir)/internal/set_table.h

internal/class.h

@@ -10,7 +10,7 @@
  */
 #include "id.h"
 #include "id_table.h"           /* for struct rb_id_table */
-#include "internal/namespace.h" /* for rb_current_namespace */
+#include "internal/box.h"       /* for rb_current_namespace */
 #include "internal/serial.h"    /* for rb_serial_t */
 #include "internal/static_assert.h"
 #include "internal/variable.h"  /* for rb_class_ivar_set */

load.c

@@ -5,13 +5,13 @@
 #include "dln.h"
 #include "eval_intern.h"
 #include "internal.h"
+#include "internal/box.h"
 #include "internal/dir.h"
 #include "internal/error.h"
 #include "internal/eval.h"
 #include "internal/file.h"
 #include "internal/hash.h"
 #include "internal/load.h"
-#include "internal/namespace.h"
 #include "internal/ruby_parser.h"
 #include "internal/thread.h"
 #include "internal/variable.h"

variable.c

@@ -20,12 +20,12 @@
 #include "id.h"
 #include "id_table.h"
 #include "internal.h"
+#include "internal/box.h"
 #include "internal/class.h"
 #include "internal/compilers.h"
 #include "internal/error.h"
 #include "internal/eval.h"
 #include "internal/hash.h"
-#include "internal/namespace.h"
 #include "internal/object.h"
 #include "internal/gc.h"
 #include "internal/re.h"

vm.c

@@ -12,6 +12,7 @@
 
 #include "eval_intern.h"
 #include "internal.h"
+#include "internal/box.h"
 #include "internal/class.h"
 #include "internal/compile.h"
 #include "internal/cont.h"
@@ -21,7 +22,6 @@
 #include "internal/gc.h"
 #include "internal/inits.h"
 #include "internal/missing.h"
-#include "internal/namespace.h"
 #include "internal/object.h"
 #include "internal/proc.h"
 #include "internal/re.h"
@@ -98,7 +98,7 @@ rb_vm_search_cf_from_ep(const rb_execution_context_t *ec, const rb_control_frame
 }
 
 #if VM_CHECK_MODE > 0
-// ruby_namespace_crashed defined in internal/namespace.h
+// ruby_namespace_crashed defined in internal/box.h
 #define VM_NAMESPACE_CRASHED() {ruby_namespace_crashed = true;}
 #define VM_NAMESPACE_ASSERT(expr, msg) \
     if (!(expr)) { ruby_namespace_crashed = true; rb_bug(msg); }

vm_core.h

@@ -118,7 +118,7 @@ extern int ruby_assert_critical_section_entered;
 #include "internal.h"
 #include "internal/array.h"
 #include "internal/basic_operators.h"
-#include "internal/namespace.h"
+#include "internal/box.h"
 #include "internal/sanitizers.h"
 #include "internal/serial.h"
 #include "internal/set_table.h"