Permalink
Browse files

More dependency fixes

  • Loading branch information...
Ryan Davis
Ryan Davis committed Aug 2, 2008
1 parent b3ef3ab commit a390c02eb5433ef3aaffa7bf62f5fe2f34effa58
View
@@ -7,6 +7,7 @@
#include "objectmemory.hpp"
#include "builtin/array.hpp"
#include "builtin/fixnum.hpp"
+#include "builtin/float.hpp"
#include "builtin/string.hpp"
#include <ctype.h>
View
@@ -6,6 +6,7 @@
namespace rubinius {
class Array;
class String;
+ class Float;
class Bignum : public Integer {
public:
View
@@ -1,6 +1,7 @@
#include "prelude.hpp"
#include "builtin/fixnum.hpp"
+#include "builtin/float.hpp"
#include "builtin/array.hpp"
#include "builtin/string.hpp"
View
@@ -2,8 +2,12 @@
#define RBX_BUILTIN_FIXNUM_HPP
#include "objects.hpp" // FIX: empty this file out... gah
+#include "builtin/bignum.hpp"
namespace rubinius {
+ class Float;
+ class Array;
+ class String;
class Fixnum : public Integer {
public:
@@ -177,8 +181,9 @@ namespace rubinius {
return obj->fixnum_p() || (obj->reference_p() && obj->obj_type == Bignum::type);
}
- /* For some reason, the as<> template doesn't pick up the specialized kind_of<>, until
- * we figure out why, just special as<> too. */
+ /* For some reason, the as<> template doesn't pick up the
+ * specialized kind_of<>, until we figure out why, just special as<>
+ * too. */
template <>
static INTEGER as<Integer>(OBJECT obj) {
if(kind_of<Integer>(obj)) return (Integer*)obj;
View
@@ -1,11 +1,11 @@
-#include "prelude.hpp"
-#include "object.hpp"
-#include "objects.hpp"
-#include "vm.hpp"
-#include "objectmemory.hpp"
+#include "builtin/float.hpp"
#include "builtin/array.hpp"
#include "builtin/fixnum.hpp"
+#include "objectmemory.hpp"
+#include "prelude.hpp"
+#include "vm.hpp"
+
namespace rubinius {
Float* Float::create(STATE, double val) {
Float* flt = (Float*)state->new_struct(G(floatpoint), sizeof(Float));
View
@@ -9,8 +9,10 @@
#include <math.h>
#include <float.h>
-namespace rubinius {
+#include "builtin/object.hpp"
+#include "type_info.hpp"
+namespace rubinius {
class Array;
class Float : public Object {
View
@@ -16,6 +16,7 @@
#include "builtin/array.hpp"
#include "builtin/class.hpp"
#include "builtin/fixnum.hpp"
+#include "builtin/float.hpp"
#include "builtin/memorypointer.hpp"
#include "builtin/nativefunction.hpp"
#include "builtin/string.hpp"
View
@@ -132,7 +132,10 @@ def generate_tests(fd)
fd.puts <<-CODE
#include "builtin/iseq.hpp"
+#include "builtin/fixnum.hpp"
+#include "builtin/float.hpp"
#include "builtin/list.hpp"
+#include "builtin/task.hpp"
#include "builtin/block_environment.hpp"
#include "builtin/contexts.hpp"
#include "builtin/exception.hpp"
View
@@ -1,5 +1,18 @@
#include "builtin/object.hpp"
+#include "builtin/array.hpp"
+#include "builtin/block_environment.hpp"
+#include "builtin/class.hpp"
+#include "builtin/compiledmethod.hpp"
+#include "builtin/contexts.hpp"
+#include "builtin/exception.hpp"
+#include "builtin/fixnum.hpp"
+#include "builtin/sendsite.hpp"
+#include "builtin/string.hpp"
+#include "builtin/symbol.hpp"
+#include "builtin/task.hpp"
+#include "builtin/tuple.hpp"
+
#include "jit_state.h"
#include "objectmemory.hpp"
View
@@ -5,6 +5,7 @@
#include "builtin/array.hpp"
#include "builtin/compiledmethod.hpp"
#include "builtin/fixnum.hpp"
+#include "builtin/float.hpp"
#include "builtin/iseq.hpp"
#include "builtin/string.hpp"
#include "builtin/symbol.hpp"
View
@@ -4,14 +4,15 @@
#include <iostream>
#include <sstream>
-#include "prelude.hpp"
-#include "object.hpp"
-#include "objects.hpp"
-
namespace rubinius {
class SendSite;
class InstructionSequence;
class CompiledMethod;
+ class String;
+ class Array;
+ class Bignum;
+ class Float;
+ class Tuple;
class Marshaller {
public:
View
@@ -11,6 +11,7 @@
#include "builtin/dir.hpp"
#include "builtin/executable.hpp"
#include "builtin/fixnum.hpp"
+#include "builtin/float.hpp"
#include "builtin/hash.hpp"
#include "builtin/io.hpp"
#include "builtin/iseq.hpp"
View
@@ -33,9 +33,6 @@ namespace rubinius {
};
}
-#include "builtin/float.hpp" // TODO: remove me too!
-#include "builtin/bignum.hpp" // TODO: remove me too!
-
namespace rubinius {
class NormalObject : public Object {
public:
View
@@ -1,4 +1,5 @@
-#include "objects.hpp"
+#include "builtin/bignum.hpp"
+#include "builtin/float.hpp"
#include "vm.hpp"
#include "objectmemory.hpp"
View
@@ -2,6 +2,7 @@
#include "type_info.hpp"
#include "builtin/list.hpp"
#include "builtin/string.hpp"
+#include "builtin/float.hpp"
#include "objectmemory.hpp"
#include "builtin/fixnum.hpp"

0 comments on commit a390c02

Please sign in to comment.