@@ -7,12 +7,6 @@ class Class raise RuntimeError, "primitive 'class_allocate' failed on #{self.inspect}" end - # HACK remove me when super() works in allocate - def __allocate__ - Ruby.primitive :class_allocate - raise RuntimeError, "primitive 'class_allocate' failed on #{self.inspect}" - end - def new(*args) obj = allocate() kernel/bootstrap/class.rb @@ -109,7 +109,7 @@ class Hash # @bins is the vector of storage for the bucket chains. #++ def self.allocate - h = __allocate__ # super() + h = super() # We don't need the nanny checking our symbols h.send :set_instance_variable, :@records, MIN_SIZE kernel/bootstrap/hash.rb @@ -14,8 +14,7 @@ class String attr_accessor :encoding def self.allocate - # HACK use super() - str = String.__allocate__ + str = super() str.data = ByteArray.new(1) str.num_bytes = 0 str.characters = 0 @@ -24,8 +23,7 @@ class String end def self.from_bytearray(ba, count) - # HACK use allocate when super() works - str = String.__allocate__ + str = super() str.data = ba str.num_bytes = count return str kernel/common/string.rb f21c747df4102a19b3b3eefe70441b542d18f75e Brian Ford bford@engineyard.com http://github.com/evanphx/rubinius/commit/9a1fca2b6b7f08a6fef72dd7c663a6518c83a25e 9a1fca2b6b7f08a6fef72dd7c663a6518c83a25e 2008-09-05T15:03:33-07:00 2008-09-05T15:03:33-07:00 Removed __allocate__ hacks used to get around super(). 452cae6001000f984eb4a68d4b9a49183f5f3488 Brian Ford bford@engineyard.com