Renamed some vm files to be consistent.

rakelib/vm.rake

@@ -61,7 +61,7 @@ GENERATED = %W[ vm/gen/config_variables.h
 # CompactLookupTable inherits from Tuple, so the header
 # for compactlookuptable.hpp has to come after tuple.hpp
 field_extract_headers = %w[
-  vm/builtin/basicobject.hpp
+  vm/builtin/basic_object.hpp
   vm/builtin/object.hpp
   vm/builtin/integer.hpp
   vm/builtin/fixnum.hpp
@@ -72,37 +72,37 @@ field_extract_headers = %w[
   vm/builtin/alias.hpp
   vm/builtin/block_environment.hpp
   vm/builtin/block_as_method.hpp
-  vm/builtin/bytearray.hpp
+  vm/builtin/byte_array.hpp
   vm/builtin/io.hpp
   vm/builtin/channel.hpp
   vm/builtin/module.hpp
   vm/builtin/constant_table.hpp
   vm/builtin/class.hpp
-  vm/builtin/compiledcode.hpp
+  vm/builtin/compiled_code.hpp
   vm/builtin/data.hpp
   vm/builtin/dir.hpp
   vm/builtin/exception.hpp
   vm/builtin/float.hpp
   vm/builtin/immediates.hpp
   vm/builtin/iseq.hpp
   vm/builtin/list.hpp
-  vm/builtin/lookuptable.hpp
+  vm/builtin/lookup_table.hpp
   vm/builtin/ffi_pointer.hpp
-  vm/builtin/methodtable.hpp
-  vm/builtin/nativefunction.hpp
+  vm/builtin/method_table.hpp
+  vm/builtin/native_function.hpp
   vm/builtin/packed_object.hpp
   vm/builtin/randomizer.hpp
   vm/builtin/regexp.hpp
-  vm/builtin/constantscope.hpp
+  vm/builtin/constant_scope.hpp
   vm/builtin/encoding.hpp
   vm/builtin/string.hpp
   vm/builtin/symbol.hpp
   vm/builtin/thread.hpp
   vm/builtin/tuple.hpp
-  vm/builtin/compactlookuptable.hpp
+  vm/builtin/compact_lookup_table.hpp
   vm/builtin/time.hpp
   vm/builtin/stat.hpp
-  vm/builtin/nativemethod.hpp
+  vm/builtin/native_method.hpp
   vm/builtin/system.hpp
   vm/builtin/autoload.hpp
   vm/builtin/proc.hpp

vm/agent.cpp

@@ -28,7 +28,7 @@
 #include "agent_components.hpp"
 #include "environment.hpp"
 
-#include "builtin/nativemethod.hpp"
+#include "builtin/native_method.hpp"
 #include "builtin/io.hpp"
 #include "builtin/thread.hpp"
 

vm/agent_components.cpp

@@ -5,7 +5,7 @@
 #include "util/bert.hpp"
 #include "agent_components.hpp"
 
-#include "objectmemory.hpp"
+#include "object_memory.hpp"
 
 #include "builtin/thread.hpp"
 #include "builtin/string.hpp"

vm/builtin/access_variable.cpp

@@ -6,7 +6,7 @@
 #include "builtin/packed_object.hpp"
 #include "builtin/symbol.hpp"
 #include "object_utils.hpp"
-#include "objectmemory.hpp"
+#include "object_memory.hpp"
 #include "ontology.hpp"
 
 namespace rubinius {

vm/builtin/bignum.cpp

@@ -7,7 +7,7 @@
 #include "builtin/fixnum.hpp"
 #include "builtin/float.hpp"
 #include "builtin/string.hpp"
-#include "builtin/bytearray.hpp"
+#include "builtin/byte_array.hpp"
 #include "configuration.hpp"
 #include "missing/math.h"
 #include "object_utils.hpp"

vm/builtin/block_environment.cpp

@@ -1,12 +1,12 @@
 #include "arguments.hpp"
 #include "builtin/block_environment.hpp"
 #include "builtin/class.hpp"
-#include "builtin/compiledcode.hpp"
-#include "builtin/constantscope.hpp"
+#include "builtin/compiled_code.hpp"
+#include "builtin/constant_scope.hpp"
 #include "builtin/exception.hpp"
 #include "builtin/fixnum.hpp"
 #include "builtin/location.hpp"
-#include "builtin/nativemethod.hpp"
+#include "builtin/native_method.hpp"
 #include "builtin/object.hpp"
 #include "builtin/symbol.hpp"
 #include "builtin/system.hpp"

vm/builtin/bytearray.cpp → vm/builtin/byte_array.cpp

@@ -1,11 +1,11 @@
-#include "builtin/bytearray.hpp"
+#include "builtin/byte_array.hpp"
 #include "builtin/class.hpp"
 #include "builtin/exception.hpp"
 #include "builtin/fixnum.hpp"
 #include "builtin/string.hpp"
 #include "builtin/tuple.hpp"
 #include "object_utils.hpp"
-#include "objectmemory.hpp"
+#include "object_memory.hpp"
 #include "ontology.hpp"
 
 namespace rubinius {

vm/builtin/character.cpp

@@ -2,7 +2,7 @@
 #include "regenc.h"
 #include "transcoder.h"
 
-#include "builtin/bytearray.hpp"
+#include "builtin/byte_array.hpp"
 #include "builtin/character.hpp"
 #include "builtin/class.hpp"
 #include "builtin/encoding.hpp"

vm/builtin/class.cpp

@@ -2,14 +2,14 @@
 #include "builtin/class.hpp"
 #include "builtin/exception.hpp"
 #include "builtin/fixnum.hpp"
-#include "builtin/lookuptable.hpp"
-#include "builtin/methodtable.hpp"
+#include "builtin/lookup_table.hpp"
+#include "builtin/method_table.hpp"
 #include "builtin/module.hpp"
 #include "builtin/packed_object.hpp"
 #include "builtin/symbol.hpp"
 #include "configuration.hpp"
 #include "object_utils.hpp"
-#include "objectmemory.hpp"
+#include "object_memory.hpp"
 #include "on_stack.hpp"
 
 namespace rubinius {

vm/builtin/compactlookuptable.cpp → vm/builtin/compact_lookup_table.cpp

@@ -1,7 +1,7 @@
 #include "builtin/array.hpp"
 #include "builtin/class.hpp"
-#include "builtin/compactlookuptable.hpp"
-#include "builtin/lookuptable.hpp"
+#include "builtin/compact_lookup_table.hpp"
+#include "builtin/lookup_table.hpp"
 #include "builtin/symbol.hpp"
 #include "object_utils.hpp"
 #include "ontology.hpp"

vm/builtin/compiledcode.cpp → vm/builtin/compiled_code.cpp

@@ -1,12 +1,12 @@
 #include "arguments.hpp"
 #include "builtin/call_site.hpp"
 #include "builtin/class.hpp"
-#include "builtin/compiledcode.hpp"
-#include "builtin/constantscope.hpp"
+#include "builtin/compiled_code.hpp"
+#include "builtin/constant_scope.hpp"
 #include "builtin/exception.hpp"
 #include "builtin/fixnum.hpp"
 #include "builtin/iseq.hpp"
-#include "builtin/lookuptable.hpp"
+#include "builtin/lookup_table.hpp"
 #include "builtin/symbol.hpp"
 #include "builtin/tuple.hpp"
 #include "bytecode_verification.hpp"

vm/builtin/constant_cache.cpp

@@ -1,6 +1,6 @@
 #include "builtin/constant_cache.hpp"
 #include "builtin/class.hpp"
-#include "builtin/constantscope.hpp"
+#include "builtin/constant_scope.hpp"
 #include "object_utils.hpp"
 #include "ontology.hpp"
 

vm/builtin/constantscope.cpp → vm/builtin/constant_scope.cpp

@@ -1,5 +1,5 @@
 #include "builtin/class.hpp"
-#include "builtin/constantscope.hpp"
+#include "builtin/constant_scope.hpp"
 #include "builtin/system.hpp"
 #include "call_frame.hpp"
 #include "ontology.hpp"

vm/builtin/data.cpp

@@ -1,7 +1,7 @@
 #include "builtin/data.hpp"
 #include "builtin/class.hpp"
 #include "capi/capi.hpp"
-#include "objectmemory.hpp"
+#include "object_memory.hpp"
 #include "object_utils.hpp"
 #include "ontology.hpp"
 #include "on_stack.hpp"

vm/builtin/dir.cpp

@@ -5,7 +5,7 @@
 #include "builtin/fixnum.hpp"
 #include "builtin/string.hpp"
 #include "object_utils.hpp"
-#include "objectmemory.hpp"
+#include "object_memory.hpp"
 #include "ontology.hpp"
 
 namespace rubinius {

vm/builtin/encoding.cpp

@@ -3,20 +3,20 @@
 #include "regenc.h"
 
 #include "builtin/array.hpp"
-#include "builtin/bytearray.hpp"
+#include "builtin/byte_array.hpp"
 #include "builtin/class.hpp"
 #include "builtin/encoding.hpp"
 #include "builtin/exception.hpp"
 #include "builtin/integer.hpp"
 #include "builtin/io.hpp"
-#include "builtin/lookuptable.hpp"
+#include "builtin/lookup_table.hpp"
 #include "builtin/regexp.hpp"
 #include "builtin/string.hpp"
 #include "builtin/symbol.hpp"
 #include "builtin/tuple.hpp"
 #include "configuration.hpp"
 #include "object_utils.hpp"
-#include "objectmemory.hpp"
+#include "object_memory.hpp"
 #include "on_stack.hpp"
 #include "ontology.hpp"
 #include "util/utf8.h"

vm/builtin/exception.cpp

@@ -2,7 +2,7 @@
 #include "builtin/encoding.hpp"
 #include "builtin/exception.hpp"
 #include "builtin/location.hpp"
-#include "builtin/lookuptable.hpp"
+#include "builtin/lookup_table.hpp"
 #include "builtin/fixnum.hpp"
 #include "builtin/symbol.hpp"
 #include "builtin/string.hpp"

vm/builtin/executable.cpp

@@ -4,7 +4,7 @@
 #include "builtin/symbol.hpp"
 #include "call_frame.hpp"
 #include "dispatch.hpp"
-#include "objectmemory.hpp"
+#include "object_memory.hpp"
 #include "object_utils.hpp"
 #include "ontology.hpp"
 

vm/builtin/ffi_pointer.cpp

@@ -4,12 +4,12 @@
 #include "builtin/fixnum.hpp"
 #include "builtin/float.hpp"
 #include "builtin/ffi_pointer.hpp"
-#include "builtin/nativefunction.hpp"
+#include "builtin/native_function.hpp"
 #include "builtin/string.hpp"
 #include "builtin/symbol.hpp"
 #include "ffi_util.hpp"
 #include "object_utils.hpp"
-#include "objectmemory.hpp"
+#include "object_memory.hpp"
 #include "ontology.hpp"
 #include "windows_compat.h"
 

vm/builtin/fiber.cpp

@@ -3,11 +3,11 @@
 #include "builtin/class.hpp"
 #include "builtin/exception.hpp"
 #include "builtin/fiber.hpp"
-#include "builtin/lookuptable.hpp"
+#include "builtin/lookup_table.hpp"
 #include "builtin/object.hpp"
 #include "call_frame.hpp"
 #include "gc/gc.hpp"
-#include "objectmemory.hpp"
+#include "object_memory.hpp"
 #include "ontology.hpp"
 
 namespace rubinius {

vm/builtin/find_object.cpp

@@ -12,7 +12,7 @@
 #include "builtin/system.hpp"
 #include "gc/gc.hpp"
 #include "gc/walker.hpp"
-#include "objectmemory.hpp"
+#include "object_memory.hpp"
 #include "object_utils.hpp"
 #include "on_stack.hpp"
 

vm/builtin/heap_dump.cpp

@@ -3,7 +3,7 @@
 // all that be in it's own file.
 
 #include "builtin/array.hpp"
-#include "builtin/bytearray.hpp"
+#include "builtin/byte_array.hpp"
 #include "builtin/class.hpp"
 #include "builtin/object.hpp"
 #include "builtin/string.hpp"
@@ -13,7 +13,7 @@
 #include "builtin/variable_scope.hpp"
 #include "gc/gc.hpp"
 #include "gc/walker.hpp"
-#include "objectmemory.hpp"
+#include "object_memory.hpp"
 #include "object_utils.hpp"
 
 #include <fcntl.h>

vm/builtin/io.cpp

@@ -1,6 +1,6 @@
 #include "builtin/atomic.hpp"
 #include "builtin/array.hpp"
-#include "builtin/bytearray.hpp"
+#include "builtin/byte_array.hpp"
 #include "builtin/channel.hpp"
 #include "builtin/class.hpp"
 #include "builtin/exception.hpp"
@@ -10,7 +10,7 @@
 #include "builtin/thread.hpp"
 #include "capi/handle.hpp"
 #include "configuration.hpp"
-#include "objectmemory.hpp"
+#include "object_memory.hpp"
 #include "object_utils.hpp"
 #include "on_stack.hpp"
 #include "ontology.hpp"

vm/builtin/location.cpp

@@ -1,8 +1,8 @@
 #include "builtin/array.hpp"
 #include "builtin/class.hpp"
-#include "builtin/compiledcode.hpp"
+#include "builtin/compiled_code.hpp"
 #include "builtin/location.hpp"
-#include "builtin/nativemethod.hpp"
+#include "builtin/native_method.hpp"
 #include "builtin/string.hpp"
 #include "builtin/symbol.hpp"
 #include "builtin/variable_scope.hpp"

vm/builtin/lookuptable.cpp → vm/builtin/lookup_table.cpp

@@ -1,7 +1,7 @@
 #include "builtin/array.hpp"
 #include "builtin/class.hpp"
 #include "builtin/fixnum.hpp"
-#include "builtin/lookuptable.hpp"
+#include "builtin/lookup_table.hpp"
 #include "builtin/string.hpp"
 #include "builtin/symbol.hpp"
 #include "builtin/tuple.hpp"

vm/builtin/methodtable.cpp → vm/builtin/method_table.cpp

@@ -2,11 +2,11 @@
 #include "builtin/class.hpp"
 #include "builtin/executable.hpp"
 #include "builtin/fixnum.hpp"
-#include "builtin/methodtable.hpp"
+#include "builtin/method_table.hpp"
 #include "builtin/symbol.hpp"
 #include "builtin/tuple.hpp"
 #include "object_utils.hpp"
-#include "objectmemory.hpp"
+#include "object_memory.hpp"
 
 #define METHODTABLE_MAX_DENSITY 0.75
 #define METHODTABLE_MIN_DENSITY 0.3

vm/builtin/module.cpp

@@ -1,12 +1,12 @@
 #include "builtin/array.hpp"
 #include "builtin/autoload.hpp"
 #include "builtin/class.hpp"
-#include "builtin/compactlookuptable.hpp"
+#include "builtin/compact_lookup_table.hpp"
 #include "builtin/constant_table.hpp"
 #include "builtin/executable.hpp"
-#include "builtin/lookuptable.hpp"
+#include "builtin/lookup_table.hpp"
 #include "builtin/module.hpp"
-#include "builtin/methodtable.hpp"
+#include "builtin/method_table.hpp"
 #include "builtin/string.hpp"
 #include "builtin/symbol.hpp"
 #include "builtin/system.hpp"
@@ -15,7 +15,7 @@
 #include "configuration.hpp"
 #include "global_cache.hpp"
 #include "object_utils.hpp"
-#include "objectmemory.hpp"
+#include "object_memory.hpp"
 #include "on_stack.hpp"
 
 #include <string>