Permalink
Browse files

One more cycle broken

  • Loading branch information...
1 parent 8e92bdf commit 43c1c3c8de3a04d0c6c42073a634fdcb955c2144 Ryan Davis committed Jul 31, 2008
Showing with 39 additions and 7 deletions.
  1. +15 −0 vm/builtin/fixnum.cpp
  2. +7 −5 vm/builtin/fixnum.hpp
  3. +6 −0 vm/builtin/string.hpp
  4. +1 −0 vm/environment.cpp
  5. +2 −2 vm/environment.hpp
  6. +2 −0 vm/message.hpp
  7. +6 −0 vm/probes.hpp
View
@@ -0,0 +1,15 @@
+
+// #include "prelude.hpp"
+// #include "builtin/fixnum.hpp"
+
+// namespace rubinius {
+
+// class Fixnum : public Integer {
+
+// String* to_s(STATE) {
+// std::stringstream sout;
+// sout << n2i();
+// return String::create(state, sout.str().c_str());
+// }
+// }
+// }
View
@@ -1,6 +1,8 @@
#ifndef RBX_BUILTIN_FIXNUM_HPP
#define RBX_BUILTIN_FIXNUM_HPP
+#include "builtin/string.hpp"
+
namespace rubinius {
class Fixnum : public Integer {
@@ -366,11 +368,11 @@ namespace rubinius {
}
// Ruby.primitive :fixnum_to_s
- String* to_s(STATE) {
- std::stringstream sout;
- sout << n2i();
- return String::create(state, sout.str().c_str());
- }
+ String* to_s(STATE); // {
+// std::stringstream sout;
+// sout << n2i();
+// return String::create(state, sout.str().c_str());
+// }
};
typedef Fixnum* FIXNUM;
View
@@ -1,7 +1,13 @@
#ifndef RBX_STRING_HPP
#define RBX_STRING_HPP
+#include "builtin/object.hpp"
+#include "type_info.hpp"
+#include "objects.hpp" // FIX: nuke objects.hpp... it is a mess
+
namespace rubinius {
+ class ByteArray;
+
class String : public Object {
public:
const static size_t fields = 7;
View
@@ -4,6 +4,7 @@
#include "environment.hpp"
#include "compiled_file.hpp"
#include "probes.hpp"
+#include "builtin/string.hpp"
#include <iostream>
#include <fstream>
View
@@ -1,11 +1,11 @@
#ifndef RBX_ENVIRONMENT_HPP
#define RBX_ENVIRONMENT_HPP
-#include "builtin.hpp"
-
#include <string>
#include <stdexcept>
+#include "vm.hpp"
+
namespace rubinius {
class Environment {
View
@@ -2,6 +2,8 @@
#define RBX_MESSAGE_HPP
namespace rubinius {
+ class Array;
+ class Executable;
class SendSite;
class Task;
View
@@ -1,7 +1,13 @@
#ifndef RBX_PROBES_HPP
#define RBX_PROBES_HPP
+#include "message.hpp"
+
namespace rubinius {
+ class Task;
+ class Module;
+ class CompiledMethod;
+
class TaskProbe {
public:
void start_method(Task* task, Message& msg);

0 comments on commit 43c1c3c

Please sign in to comment.