Fix Symbol#match

PullRequest: truffleruby/916

Author: chrisseaton

CHANGELOG.md

@@ -9,6 +9,7 @@ Bug fixes:
 * Fixed `Addrinfo.new(String)` to reliably find the address family (#1702).
 * Fixed argument checks in `BasicSocket#setsockopt` (#1460).
 * Fixed `ObjectSpace.trace_object_allocations` (#1456).
+* Fixed the `Symbol#match` returning `MatchData` (#1706).
 
 Compatibility:
 

spec/tags/core/symbol/match_tags.txt

@@ -92,15 +92,28 @@ def match(pattern)
     when Regexp
       match_data = pattern.search_region(str, 0, str.bytesize, true)
       Truffle::RegexpOperations.set_last_match(match_data, Truffle.invoke_primitive(:caller_binding))
-      return match_data.byte_begin(0) if match_data
+      match_data
     when String
       raise TypeError, 'type mismatch: String given'
     else
       pattern =~ str
     end
   end
 
-  alias_method :=~, :match
+  def =~(pattern)
+    str = to_s
+
+    case pattern
+    when Regexp
+      match_data = pattern.search_region(str, 0, str.bytesize, true)
+      Truffle::RegexpOperations.set_last_match(match_data, Truffle.invoke_primitive(:caller_binding))
+      match_data.byte_begin(0) if match_data
+    when String
+      raise TypeError, 'type mismatch: String given'
+    else
+      pattern =~ str
+    end
+  end
 
   def match?(pattern, pos=0)
     pattern = Truffle::Type.coerce_to_regexp(pattern) unless pattern.kind_of? Regexp