jruby · Jan 30, 2015 · Jan 30, 2015
diff --git a/core/src/main/ruby/jruby/truffle/core.rb b/core/src/main/ruby/jruby/truffle/core.rb
@@ -33,6 +33,7 @@
 # Load common (ordered according to Rubinius' load_order.txt)
 require_relative 'core/rubinius/kernel/common/enumerator'
 require_relative 'core/rubinius/kernel/common/enumerable'
+require_relative 'core/rubinius/kernel/common/exception'
 require_relative 'core/rubinius/kernel/common/undefined'
 require_relative 'core/rubinius/kernel/common/type'
 require_relative 'core/rubinius/kernel/common/array'

diff --git a/core/src/main/ruby/jruby/truffle/core/rubinius/api/shims/rubinius.rb b/core/src/main/ruby/jruby/truffle/core/rubinius/api/shims/rubinius.rb
@@ -12,10 +12,14 @@ def self.mathn_loaded?
     false
   end
 
-  module Fiber
+  class Fiber < ::Fiber
 
     ENABLED = true
 
+    def initialize(size, &block)
+      super &block
+    end
+
   end
 
 end

diff --git a/core/src/main/ruby/jruby/truffle/core/rubinius/kernel/common/array.rb b/core/src/main/ruby/jruby/truffle/core/rubinius/kernel/common/array.rb
@@ -24,6 +24,8 @@
 # OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# Only part of Rubinius' array.rb
+
 class Array
 
   def values_at(*args)

diff --git a/core/src/main/ruby/jruby/truffle/core/rubinius/kernel/common/exception.rb b/core/src/main/ruby/jruby/truffle/core/rubinius/kernel/common/exception.rb
@@ -0,0 +1,35 @@
+ # Copyright (c) 2007-2014, Evan Phoenix and contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+# * Redistributions of source code must retain the above copyright notice, this
+#   list of conditions and the following disclaimer.
+# * Redistributions in binary form must reproduce the above copyright notice
+#   this list of conditions and the following disclaimer in the documentation
+#   and/or other materials provided with the distribution.
+# * Neither the name of Rubinius nor the names of its contributors
+#   may be used to endorse or promote products derived from this software
+#   without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+# Only part of Rubinius' exception.rb
+
+class StopIteration < IndexError
+end
+
+class StopIteration
+  attr_accessor :result
+  private :result=
+end
diff --git a/truffle/src/main/java/org/jruby/truffle/runtime/core/CoreLibrary.java b/truffle/src/main/java/org/jruby/truffle/runtime/core/CoreLibrary.java
@@ -234,6 +234,7 @@ public void initialize() {
         enumerableModule = new RubyModule(context, objectClass, "Enumerable");
         falseClass = new RubyClass(context, objectClass, objectClass, "FalseClass");
         fiberClass = new RubyClass(context, objectClass, objectClass, "Fiber");
+        fiberClass.setAllocator(new RubyFiber.FiberAllocator());
         fileClass = new RubyClass(context, objectClass, ioClass, "File");
         fixnumClass = new RubyClass(context, objectClass, integerClass, "Fixnum");
         floatClass = new RubyClass(context, objectClass, numericClass, "Float");