Browse files

Remove message.hpp cruft

  • Loading branch information...
1 parent 974a0c7 commit 9159d36bc910ca87a3ff3a7fe88d9c7988d02a2b Evan Phoenix committed Apr 1, 2009
View
3 vm/builtin/access_variable.cpp
@@ -8,7 +8,8 @@
#include "builtin/exception.hpp"
#include "objectmemory.hpp"
-#include "message.hpp"
+#include "dispatch.hpp"
+#include "arguments.hpp"
namespace rubinius {
View
1 vm/builtin/autoload.cpp
@@ -1,6 +1,5 @@
#include "prelude.hpp"
#include "call_frame.hpp"
-#include "message.hpp"
#include "builtin/class.hpp"
#include "builtin/autoload.hpp"
View
5 vm/builtin/block_environment.cpp
@@ -10,8 +10,9 @@
#include "vm/object_utils.hpp"
#include "profiler.hpp"
-#include "message.hpp"
-
+#include "arguments.hpp"
+#include "dispatch.hpp"
+#include "call_frame.hpp"
#include "builtin/class.hpp"
#include "builtin/compiledmethod.hpp"
#include "builtin/fixnum.hpp"
View
5 vm/builtin/channel.cpp
@@ -13,9 +13,10 @@
#include "builtin/float.hpp"
#include "builtin/io.hpp"
-#include "message.hpp"
+#include "arguments.hpp"
+#include "dispatch.hpp"
#include "event.hpp"
-
+#include "call_frame.hpp"
#include "thread.hpp"
#include "native_thread.hpp"
View
6 vm/builtin/compiledmethod.cpp
@@ -15,8 +15,10 @@
#include "primitives.hpp"
#include "llvm.hpp"
#include "objectmemory.hpp"
-#include "message.hpp"
-#include "vm/object_utils.hpp"
+#include "arguments.hpp"
+#include "dispatch.hpp"
+#include "call_frame.hpp"
+#include "object_utils.hpp"
namespace rubinius {
View
4 vm/builtin/executable.cpp
@@ -5,7 +5,9 @@
#include "builtin/executable.hpp"
#include "builtin/symbol.hpp"
-#include "message.hpp"
+#include "arguments.hpp"
+#include "dispatch.hpp"
+#include "call_frame.hpp"
#include "objectmemory.hpp"
namespace rubinius {
View
3 vm/builtin/memorypointer.cpp
@@ -21,7 +21,8 @@
#include "builtin/symbol.hpp"
#include "ffi_util.hpp"
-#include "message.hpp"
+#include "arguments.hpp"
+#include "dispatch.hpp"
namespace rubinius {
View
3 vm/builtin/nativefunction.cpp
@@ -22,7 +22,8 @@
#include "builtin/symbol.hpp"
#include "ffi_util.hpp"
-#include "message.hpp"
+#include "arguments.hpp"
+#include "dispatch.hpp"
#include "vm/builtin/nativefunction.hpp"
View
4 vm/builtin/nativemethod.cpp
@@ -4,9 +4,11 @@
#include "exception.hpp"
#include "exception_point.hpp"
-#include "message.hpp"
+#include "arguments.hpp"
+#include "dispatch.hpp"
#include "native_libraries.hpp"
#include "primitives.hpp"
+#include "call_frame.hpp"
#include "builtin/array.hpp"
#include "builtin/exception.hpp"
View
3 vm/builtin/object.cpp
@@ -16,7 +16,8 @@
#include "builtin/selector.hpp"
#include "builtin/float.hpp"
#include "objectmemory.hpp"
-#include "message.hpp"
+#include "arguments.hpp"
+#include "dispatch.hpp"
#include "lookup_data.hpp"
#include "vm/object_utils.hpp"
View
4 vm/builtin/proc.cpp
@@ -8,7 +8,9 @@
#include "builtin/system.hpp"
#include "vmmethod.hpp"
-#include "message.hpp"
+#include "arguments.hpp"
+#include "dispatch.hpp"
+#include "call_frame.hpp"
namespace rubinius {
View
5 vm/builtin/sendsite.cpp
@@ -6,7 +6,10 @@
#include "builtin/module.hpp"
#include "builtin/executable.hpp"
-#include "message.hpp"
+#include "arguments.hpp"
+#include "dispatch.hpp"
+#include "call_frame.hpp"
+
#include "global_cache.hpp"
#include "objectmemory.hpp"
View
3 vm/builtin/taskprobe.cpp
@@ -10,7 +10,8 @@
#include "objectmemory.hpp"
#include "vm.hpp"
#include "jit_state.h"
-#include "message.hpp"
+#include "arguments.hpp"
+#include "dispatch.hpp"
#include <iostream>
#include <iomanip>
View
4 vm/builtin/thread.cpp
@@ -8,7 +8,9 @@
#include "builtin/channel.hpp"
#include "objectmemory.hpp"
-#include "message.hpp"
+#include "arguments.hpp"
+#include "dispatch.hpp"
+#include "call_frame.hpp"
#include "vm/object_utils.hpp"
#include "vm.hpp"
View
3 vm/capi/array.cpp
@@ -2,7 +2,8 @@
#include "builtin/fixnum.hpp"
#include "builtin/object.hpp"
-#include "message.hpp"
+#include "arguments.hpp"
+#include "dispatch.hpp"
#include "capi/capi.hpp"
#include "capi/ruby.h"
View
3 vm/capi/capi.cpp
@@ -10,8 +10,9 @@
#include "exception_point.hpp"
#include "global_cache.hpp"
-#include "message.hpp"
+#include "arguments.hpp"
+#include "dispatch.hpp"
#include "capi/capi.hpp"
#include "capi/ruby.h"
View
3 vm/compiled_file.cpp
@@ -8,7 +8,8 @@
#include "compiled_file.hpp"
#include "marshal.hpp"
-#include "message.hpp"
+#include "arguments.hpp"
+#include "call_frame.hpp"
#include "objectmemory.hpp"
#include "object_utils.hpp"
#include "builtin/sendsite.hpp"
View
2 vm/ffi.cpp
@@ -20,7 +20,7 @@
#include "builtin/symbol.hpp"
#include "ffi_util.hpp"
-#include "message.hpp"
+#include "arguments.hpp"
namespace rubinius {
View
3 vm/helpers.cpp
@@ -18,7 +18,8 @@
#include "vm.hpp"
#include "object_utils.hpp"
-#include "message.hpp"
+#include "arguments.hpp"
+#include "call_frame.hpp"
#include "lookup_data.hpp"
namespace rubinius {
View
3 vm/llvm/instructions.cpp
@@ -24,7 +24,8 @@
#include "call_frame.hpp"
#include "objectmemory.hpp"
-#include "message.hpp"
+#include "arguments.hpp"
+#include "dispatch.hpp"
#include "instructions.hpp"
#include "profiler.hpp"
View
143 vm/message.hpp
@@ -1,143 +0,0 @@
-#ifndef RBX_MESSAGE_HPP
-#define RBX_MESSAGE_HPP
-
-#include "prelude.hpp"
-#include "builtin/array.hpp"
-#include "call_frame.hpp"
-#include "builtin/tuple.hpp"
-
-#include "arguments.hpp"
-#include "dispatch.hpp"
-
-namespace rubinius {
-
- class Array;
- class Executable;
- class Module;
- class SendSite;
- class Task;
- class TypeInfo;
-
- /**
- * Message represents a single unique method call.
- *
- * Every time that a method call occurs in a running program, a new
- * Message object is constructed. A Message represents that particular
- * unique call. In the send_* instruction, information added to the
- * Message includes the SendSite, the receiver, the arguments as well
- * as the Task. In the method lookup process, the located Executable
- * object and the Module in which it was found are added. Eventually,
- * a CallFrame object is constructed using the information in the
- * Message. See instance variable documentation for all of the info
- * gathered in a Message.
- *
- * @see SendSite
- * @see CallFrame
- */
- class Message : public Dispatch {
- Arguments args_;
-
- /** The caller's CallFrame, where to get arguments from*/
- CallFrame* caller_;
-
- /**< The Module in which is the first method table to look from.
- * Usually MetaClass or Class. If NULL, then when requested, calculated
- * from recv */
- Module* lookup_from_;
-
- public: /* Instance variables */
-
- SendSite* send_site; /**< SendSite in which this call originates. */
- bool priv; /**< Indicates that this call can access private methods. */
-
- /**
- * Indicates if we're calling a method setup as method_missing.
- * This means we need to unshift the name of the name the method
- * was called as. */
- bool method_missing;
-
- public:
- Message()
- : method_missing(false)
- {}
-
- /* Constructer used by all send_* instructions */
- Message(SendSite* ss, Symbol* name, Object* recv, CallFrame* call_frame,
- size_t arg_count, Object* block, bool priv, Module* lookup_from = 0);
-
- /* Constructor used by e.g. Helper::const_missing */
- Message(Symbol* name, Object* recv, size_t arg_count,
- Object* block, Module* lookup_from = 0);
-
- Message(STATE);
- Message(Array* ary);
- Message(CallFrame* call_frame, size_t arg_count);
-
- public: /* Interface */
-
- Arguments& arguments() {
- return args_;
- }
-
- /**
- * The number of arguments available
- */
- size_t args() { return args_.total(); }
-
- /*
- * Retrieve the requested argument
- */
- Object* get_argument(size_t index) {
- return args_.get_argument(index);
- }
-
- /**
- * Explicitly set argument Array to the one given.
- */
- void set_arguments(STATE, Array* args);
-
- /*
- * Returns the object that is currently self
- */
- Object* current_self();
-
- /*
- * Sets the caller context
- */
- void set_caller(CallFrame* call_frame) {
- caller_ = call_frame;
- }
-
- CallFrame* caller() {
- return caller_;
- }
-
- /**
- * Send this message directly.
- *
- * This is separate from the SendSite performers, because
- * there is no send site to use.
- *
- * @todo See whether there is any point to having "virtual"
- * send sites (which also addresses this.) --rue
- *
- * @see SendSite
- */
- Object* send(STATE, CallFrame* call_frame);
-
- Module* lookup_from(STATE);
-
- void set_lookup_from(Module* mod) {
- lookup_from_ = mod;
- }
-
- /**
- * Reset the Message to it's pre-lookup state
- */
- void flush_lookup();
-
- };
-}
-
-#endif
-
View
3 vm/native_thread.cpp
@@ -1,7 +1,8 @@
#include "native_thread.hpp"
#include "call_frame.hpp"
-#include "message.hpp"
+#include "arguments.hpp"
+#include "exception.hpp"
#include "builtin/thread.hpp"
#include "builtin/string.hpp"
View
3 vm/primitives.cpp
@@ -3,7 +3,8 @@
#include "primitives.hpp"
#include "event.hpp"
#include "gen/includes.hpp"
-#include "message.hpp"
+#include "arguments.hpp"
+#include "call_frame.hpp"
#include "profiler.hpp"
#include <iostream>
View
3 vm/profiler.cpp
@@ -11,7 +11,8 @@
#include "builtin/string.hpp"
#include "builtin/symbol.hpp"
#include "detection.hpp"
-#include "message.hpp"
+#include "arguments.hpp"
+#include "dispatch.hpp"
#include "instruments/timing.hpp"
View
4 vm/test/test_access_variable.hpp
@@ -4,7 +4,9 @@
#include "builtin/symbol.hpp"
#include "builtin/class.hpp"
#include "builtin/string.hpp"
-#include "message.hpp"
+#include "call_frame.hpp"
+#include "arguments.hpp"
+#include "dispatch.hpp"
#include <cxxtest/TestSuite.h>
View
4 vm/vmmethod.cpp
@@ -1,4 +1,6 @@
-#include "message.hpp"
+#include "arguments.hpp"
+#include "dispatch.hpp"
+#include "call_frame.hpp"
#include "objectmemory.hpp"
#include "prelude.hpp"
#include "vmmethod.hpp"

0 comments on commit 9159d36

Please sign in to comment.