From d255aa7b69401b81b0963f3c2c84d1be0003b62c Mon Sep 17 00:00:00 2001 From: usa Date: Tue, 10 Feb 2004 05:36:34 +0000 Subject: * string.c (rb_str_match): raise TypeError when both arguments are strings. [ruby-dev:22851] * string.c (rb_str_match2): removed. * Makefile.in, bcc32/Makefile.sub, win32/Makefile.sub, wince/Makefile.sub (string.c): now not depend on version.h. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@5662 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- string.c | 27 ++------------------------- 1 file changed, 2 insertions(+), 25 deletions(-) (limited to 'string.c') diff --git a/string.c b/string.c index ba67c5f364..1807b8134a 100644 --- a/string.c +++ b/string.c @@ -14,7 +14,6 @@ #include "ruby.h" #include "re.h" -#include "version.h" #define BEG(no) regs->beg[no] #define END(no) regs->end[no] @@ -1249,11 +1248,8 @@ rb_str_match(x, y) switch (TYPE(y)) { case T_STRING: -#if RUBY_VERSION_CODE < 182 - rb_warn("string =~ string will be obsolete; use explicit regexp"); -#endif - y = rb_reg_regcomp(y); - /* fall through */ + rb_raise(rb_eTypeError, "type mismatch: String given"); + case T_REGEXP: return rb_reg_match(y, x); @@ -1263,24 +1259,6 @@ rb_str_match(x, y) } -/* - * call-seq: - * ~str => fixnum or nil - * - * Equivalent to $_=~ str. - */ - -static VALUE -rb_str_match2(str) - VALUE str; -{ - StringValue(str); -#if RUBY_VERSION_CODE < 182 - rb_warn("~string will be obsolete; use explicit regexp"); -#endif - return rb_reg_match2(rb_reg_regcomp(rb_reg_quote(str))); -} - static VALUE get_pat _((VALUE, int)); @@ -4596,7 +4574,6 @@ Init_String() rb_define_method(rb_cString, "size", rb_str_length, 0); rb_define_method(rb_cString, "empty?", rb_str_empty, 0); rb_define_method(rb_cString, "=~", rb_str_match, 1); - rb_define_method(rb_cString, "~", rb_str_match2, 0); rb_define_method(rb_cString, "match", rb_str_match_m, 1); rb_define_method(rb_cString, "succ", rb_str_succ, 0); rb_define_method(rb_cString, "succ!", rb_str_succ_bang, 0); -- cgit v1.2.3