Merge pull request #3408 from rubinius/regex-new-2959

jemc · jemc · commit ffa628ee052a · 2015-05-24T11:03:02.000-07:00
Regex new 2959
diff --git a/kernel/common/regexp.rb b/kernel/common/regexp.rb
@@ -128,6 +128,8 @@ def initialize(pattern, opts=nil, lang=nil)
     if pattern.kind_of?(Regexp)
       opts = pattern.options
       pattern = pattern.source
+    elsif pattern.kind_of?(Fixnum) or pattern.kind_of?(Float)
+      raise TypeError, "can't convert Fixnum into String"
     elsif opts.kind_of?(Fixnum)
       opts = opts & (OPTION_MASK | KCODE_MASK) if opts > 0
     elsif opts
diff --git a/spec/ruby/core/regexp/new_spec.rb b/spec/ruby/core/regexp/new_spec.rb
@@ -16,3 +16,15 @@
   it_behaves_like :regexp_new_regexp_ascii, :new
   it_behaves_like :regexp_new_regexp_ascii_8bit, :new
 end
+
+describe "Regexp.new given a Fixnum" do
+  it "raises a TypeError" do
+    lambda { Regexp.new(1) }.should raise_error(TypeError)
+  end
+end
+
+describe "Regexp.new given a Float" do
+  it "raises a TypeError" do
+    lambda { Regexp.new(1.0) }.should raise_error(TypeError)
+  end
+end
