Permalink
Browse files

Renamed vm/object.hpp to vm/object_utils.hpp. File/#include shuffling.

  • Loading branch information...
1 parent 9eeed20 commit 3a0e9a4687e6fdbd050a22c9aa676ff65c3db252 @rue rue committed Oct 18, 2008
Showing with 180 additions and 115 deletions.
  1. +2 −0 vm/builtin/access_variable.cpp
  2. +2 −0 vm/builtin/array.cpp
  3. +6 −7 vm/builtin/bignum.cpp
  4. +5 −2 vm/builtin/block_environment.cpp
  5. +1 −0 vm/builtin/channel.cpp
  6. +1 −0 vm/builtin/class.cpp
  7. +1 −0 vm/builtin/compactlookuptable.cpp
  8. +1 −0 vm/builtin/compiledmethod.cpp
  9. +5 −1 vm/builtin/contexts.cpp
  10. +3 −1 vm/builtin/exception.cpp
  11. +1 −1 vm/builtin/executable.cpp
  12. +1 −0 vm/builtin/fixnum.cpp
  13. +1 −1 vm/builtin/float.cpp
  14. +1 −1 vm/builtin/integer.cpp
  15. +1 −0 vm/builtin/integer.hpp
  16. +1 −0 vm/builtin/io.cpp
  17. +1 −1 vm/builtin/list.cpp
  18. +1 −0 vm/builtin/lookuptable.cpp
  19. +3 −3 vm/builtin/memorypointer.cpp
  20. +1 −1 vm/builtin/methodvisibility.cpp
  21. +1 −0 vm/builtin/module.cpp
  22. +2 −2 vm/builtin/nativefunction.cpp
  23. +3 −1 vm/builtin/nativemethodcontext.hpp
  24. +2 −8 vm/builtin/object.cpp
  25. +0 −1 vm/builtin/object.hpp
  26. +1 −0 vm/builtin/regexp.cpp
  27. +1 −0 vm/builtin/string.cpp
  28. +1 −0 vm/builtin/symbol.cpp
  29. +22 −1 vm/builtin/system.cpp
  30. +1 −0 vm/builtin/taskprobe.cpp
  31. +1 −0 vm/builtin/time.cpp
  32. +1 −0 vm/builtin/tuple.cpp
  33. +2 −0 vm/compiled_file.cpp
  34. +1 −1 vm/drivers/cli.cpp
  35. +4 −1 vm/environment.cpp
  36. +0 −13 vm/event.cpp
  37. +1 −3 vm/ffi.cpp
  38. +1 −5 vm/ffi.hpp
  39. +3 −10 vm/gc.hpp
  40. +2 −0 vm/gc_baker.cpp
  41. +3 −0 vm/gc_marksweep.cpp
  42. +3 −1 vm/gc_marksweep.hpp
  43. +25 −0 vm/gc_object_mark.hpp
  44. +1 −3 vm/gc_root.hpp
  45. +1 −1 vm/global_cache.hpp
  46. +5 −2 vm/llvm.cpp
  47. +5 −2 vm/marshal.cpp
  48. +5 −0 vm/marshal.hpp
  49. +0 −2 vm/message.cpp
  50. +1 −1 vm/native_libraries.cpp
  51. +5 −5 vm/{object.hpp → object_utils.hpp}
  52. +3 −1 vm/objectmemory.hpp
  53. +5 −22 vm/prelude.hpp
  54. +2 −1 vm/profiler.cpp
  55. +1 −1 vm/subtend/ruby.cpp
  56. +1 −0 vm/test/test_access_variable.hpp
  57. +2 −1 vm/test/test_array.hpp
  58. +1 −0 vm/test/test_bignum.hpp
  59. +2 −0 vm/test/test_bytearray.hpp
  60. +1 −0 vm/test/test_channel.hpp
  61. +1 −0 vm/test/test_class.hpp
  62. +1 −0 vm/test/test_compiled_file.hpp
  63. +1 −0 vm/test/test_fixnum.hpp
  64. +1 −0 vm/test/test_float.hpp
  65. +2 −1 vm/test/test_list.hpp
  66. +1 −1 vm/test/test_memorypointer.hpp
  67. +2 −1 vm/test/test_objectmemory.hpp
  68. +3 −2 vm/type_info.hpp
  69. +0 −1 vm/virtual.cpp
  70. +3 −0 vm/vm.cpp
  71. +4 −1 vm/vmmethod.cpp
@@ -1,4 +1,6 @@
+#include "vm/object_utils.hpp"
#include "prelude.hpp"
+
#include "builtin/access_variable.hpp"
#include "builtin/class.hpp"
#include "builtin/task.hpp"
View
@@ -1,4 +1,6 @@
#include "vm.hpp"
+#include "vm/object_utils.hpp"
+
#include "builtin/array.hpp"
#include "builtin/fixnum.hpp"
#include "builtin/tuple.hpp"
View
@@ -1,7 +1,11 @@
/* The implementation of Bignum, providing infinite size integers */
-#include "prelude.hpp"
-#include "object.hpp"
+#include <ctype.h>
+#include <math.h>
+#include <cmath>
+#include <iostream>
+
+#include "vm/object_utils.hpp"
#include "vm.hpp"
#include "objectmemory.hpp"
#include "builtin/array.hpp"
@@ -11,11 +15,6 @@
#include "builtin/float.hpp"
#include "builtin/string.hpp"
-#include <ctype.h>
-#include <math.h>
-#include <cmath>
-#include <iostream>
-
#define BASIC_CLASS(blah) G(blah)
#define NEW_STRUCT(obj, str, kls, kind) \
obj = (typeof(obj))Bignum::create(state); \
@@ -7,14 +7,17 @@
#include "block_environment.hpp"
#include "objectmemory.hpp"
+#include "vm/object_utils.hpp"
+
+#include "profiler.hpp"
+#include "message.hpp"
+
#include "builtin/class.hpp"
#include "builtin/compiledmethod.hpp"
#include "builtin/contexts.hpp"
#include "builtin/fixnum.hpp"
#include "builtin/task.hpp"
#include "builtin/tuple.hpp"
-#include "profiler.hpp"
-#include "message.hpp"
#include <iostream>
View
@@ -2,6 +2,7 @@
* mechanism. */
#include "vm.hpp"
+#include "vm/object_utils.hpp"
#include "objectmemory.hpp"
#include "builtin/channel.hpp"
View
@@ -1,4 +1,5 @@
#include "vm.hpp"
+#include "vm/object_utils.hpp"
#include "objectmemory.hpp"
#include "builtin/class.hpp"
@@ -1,4 +1,5 @@
#include "vm.hpp"
+#include "vm/object_utils.hpp"
#include "objectmemory.hpp"
#include "builtin/array.hpp"
@@ -14,6 +14,7 @@
#include "llvm.hpp"
#include "objectmemory.hpp"
#include "message.hpp"
+#include "vm/object_utils.hpp"
namespace rubinius {
View
@@ -1,11 +1,15 @@
-#include "objectmemory.hpp"
#include "builtin/block_environment.hpp"
#include "builtin/class.hpp"
#include "builtin/compiledmethod.hpp"
#include "builtin/fixnum.hpp"
#include "builtin/tuple.hpp"
#include "context_cache.hpp"
+#include "gc_object_mark.hpp"
+#include "objectmemory.hpp"
+
+#include "vm/object_utils.hpp"
+
#include "builtin/contexts.hpp"
#include "builtin/nativemethodcontext.hpp"
View
@@ -1,3 +1,5 @@
+#include <sstream>
+
#include "builtin/class.hpp"
#include "builtin/exception.hpp"
#include "builtin/lookuptable.hpp"
@@ -8,10 +10,10 @@
#include "builtin/string.hpp"
#include "vm.hpp"
+#include "vm/object_utils.hpp"
#include "exception.hpp"
#include "type_info.hpp"
-#include <sstream>
namespace rubinius {
void Exception::init(STATE) {
@@ -1,5 +1,5 @@
-#include "prelude.hpp"
#include "vm.hpp"
+#include "vm/object_utils.hpp"
#include "builtin/class.hpp"
#include "builtin/executable.hpp"
View
@@ -7,6 +7,7 @@
#include "builtin/string.hpp"
#include "primitives.hpp"
+#include "vm/object_utils.hpp"
#include <iostream>
View
@@ -5,8 +5,8 @@
#include "builtin/string.hpp"
#include "objectmemory.hpp"
-#include "prelude.hpp"
#include "vm.hpp"
+#include "vm/object_utils.hpp"
#include "primitives.hpp"
#include <cmath>
View
@@ -1,4 +1,4 @@
-#include "vm/object.hpp"
+#include "vm/object_utils.hpp"
#include "builtin/integer.hpp"
#include "builtin/fixnum.hpp"
View
@@ -1,5 +1,6 @@
#ifndef RBX_BUILTIN_INTEGER_HPP
#define RBX_BUILTIN_INTEGER_HPP
+
#include "builtin/object.hpp"
#include "type_info.hpp"
View
@@ -10,6 +10,7 @@
#include "vm.hpp"
#include "objectmemory.hpp"
+#include "vm/object_utils.hpp"
#include <fcntl.h>
#include <iostream>
View
@@ -39,7 +39,7 @@ namespace rubinius {
}
/* Append +obj+ to the current List. */
- void List::append(STATE, OBJECT obj) {
+ void List::append(STATE, Object* obj) {
ListNode* node = (ListNode*)state->new_object(G(list_node));
node->object(state, obj);
ListNode* cur_last = last_;
@@ -1,4 +1,5 @@
#include "vm.hpp"
+#include "vm/object_utils.hpp"
#include "objectmemory.hpp"
#include "builtin/lookuptable.hpp"
@@ -6,9 +6,9 @@
#include <sys/stat.h>
#include <dlfcn.h>
-#include "prelude.hpp"
-#include "object.hpp"
#include "vm.hpp"
+#include "oop.hpp"
+#include "vm/object_utils.hpp"
#include "objectmemory.hpp"
#include "builtin/array.hpp"
@@ -20,7 +20,7 @@
#include "builtin/string.hpp"
#include "builtin/symbol.hpp"
-#include "ffi.hpp"
+#include "ffi_util.hpp"
#include "message.hpp"
#include "strlcpy.hpp"
@@ -1,5 +1,5 @@
#include "vm/vm.hpp"
-#include "vm/object.hpp"
+#include "vm/object_utils.hpp"
#include "builtin/methodvisibility.hpp"
#include "builtin/symbol.hpp"
View
@@ -1,4 +1,5 @@
#include "vm.hpp"
+#include "vm/object_utils.hpp"
#include "objectmemory.hpp"
#include "builtin/class.hpp"
@@ -8,7 +8,7 @@
#include <dlfcn.h>
#include "prelude.hpp"
-#include "object.hpp"
+#include "object_utils.hpp"
#include "vm.hpp"
#include "objectmemory.hpp"
@@ -23,7 +23,7 @@
#include "builtin/task.hpp"
#include "builtin/contexts.hpp"
-#include "ffi.hpp"
+#include "ffi_util.hpp"
#include "message.hpp"
#include "strlcpy.hpp"
@@ -7,8 +7,10 @@
/* Project */
#include "quantum_stack_leap.hpp"
-
#include "type_info.hpp"
+
+#include "vm/object_utils.hpp"
+
#include "builtin/contexts.hpp"
#include "builtin/symbol.hpp"
#include "builtin/task.hpp"
View
@@ -10,19 +10,13 @@
#include "builtin/array.hpp"
#include "builtin/selector.hpp"
#include "builtin/task.hpp"
-#include "builtin/taskprobe.hpp"
#include "builtin/float.hpp"
#include "objectmemory.hpp"
-#include "global_cache.hpp"
-#include "config.hpp"
-#include "compiled_file.hpp"
#include "message.hpp"
+#include "vm/object_utils.hpp"
+
#include <iostream>
-#include <fstream>
-#include <cstdarg>
-#include <cstring>
-#include <sstream>
namespace rubinius {
View
@@ -5,7 +5,6 @@
#include "vm.hpp"
#include "vm/oop.hpp"
-#include "vm/prelude.hpp"
#include "vm/type_info.hpp"
#include "executor.hpp"
View
@@ -9,6 +9,7 @@
#include "builtin/tuple.hpp"
#include "vm.hpp"
+#include "vm/object_utils.hpp"
#include "objectmemory.hpp"
#define OPTION_IGNORECASE ONIG_OPTION_IGNORECASE
View
@@ -8,6 +8,7 @@
#include "builtin/integer.hpp"
#include "vm.hpp"
+#include "vm/object_utils.hpp"
#include "primitives.hpp"
#include "objectmemory.hpp"
View
@@ -6,6 +6,7 @@
#include "builtin/tuple.hpp"
#include "vm.hpp"
+#include "vm/object_utils.hpp"
#include "objectmemory.hpp"
#include <iostream>
View
@@ -1,15 +1,36 @@
#include <vector>
#include <cerrno>
+#include <iostream>
+#include <fstream>
+#include <cstdarg>
+#include <cstring>
+#include <sstream>
+
#include <unistd.h>
-#include "vm/object.hpp"
+#include "vm/object_utils.hpp"
#include "vm/vm.hpp"
+#include "compiled_file.hpp"
+#include "objectmemory.hpp"
+#include "global_cache.hpp"
+#include "config.hpp"
+
#include "builtin/array.hpp"
#include "builtin/exception.hpp"
#include "builtin/fixnum.hpp"
#include "builtin/string.hpp"
+#include "builtin/bignum.hpp"
+#include "builtin/class.hpp"
+#include "builtin/compactlookuptable.hpp"
+#include "builtin/lookuptable.hpp"
+#include "builtin/symbol.hpp"
+#include "builtin/tuple.hpp"
+#include "builtin/selector.hpp"
+#include "builtin/task.hpp"
+#include "builtin/taskprobe.hpp"
+#include "builtin/float.hpp"
#include "builtin/system.hpp"
View
@@ -8,6 +8,7 @@
#include "builtin/task.hpp"
#include "builtin/taskprobe.hpp"
+#include "vm/object_utils.hpp"
#include "objectmemory.hpp"
#include "vm.hpp"
#include "jit_state.h"
View
@@ -1,4 +1,5 @@
#include "vm.hpp"
+#include "vm/object_utils.hpp"
#include "objectmemory.hpp"
#include "primitives.hpp"
View
@@ -1,5 +1,6 @@
#include "builtin/tuple.hpp"
#include "vm.hpp"
+#include "vm/object_utils.hpp"
#include "objectmemory.hpp"
#include "builtin/fixnum.hpp"
#include "builtin/compactlookuptable.hpp"
View
@@ -9,6 +9,8 @@
#include "compiled_file.hpp"
#include "marshal.hpp"
#include "objectmemory.hpp"
+#include "object_utils.hpp"
+
#include "builtin/task.hpp"
#include "builtin/staticscope.hpp"
#include "builtin/compiledmethod.hpp"
View
@@ -4,9 +4,9 @@
#include <sys/stat.h>
#include "vm/environment.hpp"
-#include "vm/object.hpp"
#include "vm/oop.hpp"
#include "vm/type_info.hpp"
+#include "vm/exception.hpp"
#include "builtin/task.hpp"
View
@@ -4,13 +4,16 @@
#include "environment.hpp"
#include "config.hpp" // HACK rename to config_parser.hpp
#include "compiled_file.hpp"
+
+#include "vm/exception.hpp"
+
#include "builtin/array.hpp"
#include "builtin/class.hpp"
+#include "builtin/exception.hpp"
#include "builtin/string.hpp"
#include "builtin/symbol.hpp"
#include "builtin/module.hpp"
#include "builtin/task.hpp"
-#include "builtin/exception.hpp"
#include "builtin/taskprobe.hpp"
#include <iostream>
Oops, something went wrong.

0 comments on commit 3a0e9a4

Please sign in to comment.