1 files changed, 24 insertions, 2 deletions
diff --git a/mrblib/range.rb b/mrblib/range.rb
index 9f94f35d1..36886d50c 100644
--- a/mrblib/range.rb
+++ b/mrblib/range.rb
@@ -12,8 +12,25 @@ class Range
   def each(&block)
     return to_enum :each unless block
 
-    val = self.first
-    last = self.last
+    val = self.begin
+    last = self.end
+
+    if val.kind_of?(Fixnum) && last.nil?
+      i = val
+      while true
+        block.call(i)
+        i += 1
+      end
+      return self
+    end
+
+    if val.kind_of?(String) && last.nil?
+      if val.respond_to? :__upto_endless
+        return val.__upto_endless(&block)
+      else
+        str_each = true
+      end
+    end
 
     if val.kind_of?(Integer) && last.kind_of?(Integer) # fixnums are special
       lim = last
@@ -56,6 +73,11 @@ class Range
     h += 1 if self.exclude_end?
     h
   end
+
+  def to_a
+    raise RangeError, "cannot convert endless range to an array" if self.last.nil?
+    super
+  end
 end
 
 ##