diff options
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | Makefile.in | 2 | ||||
| -rw-r--r-- | bcc32/Makefile.sub | 2 | ||||
| -rw-r--r-- | string.c | 27 | ||||
| -rw-r--r-- | win32/Makefile.sub | 3 | ||||
| -rw-r--r-- | wince/Makefile.sub | 3 |
6 files changed, 16 insertions, 31 deletions
@@ -1,3 +1,13 @@ +Tue Feb 10 14:33:08 2004 NAKAMURA Usaku <usa@ruby-lang.org> + + * 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. + Mon Feb 9 17:46:07 2004 Nobuyoshi Nakada <nobu@ruby-lang.org> * Makefile.in, bcc32/Makefile.sub, win32/Makefile.sub, configure.in, diff --git a/Makefile.in b/Makefile.in index 93fcdbd4db..26796342c5 100644 --- a/Makefile.in +++ b/Makefile.in @@ -399,7 +399,7 @@ signal.@OBJEXT@: signal.c ruby.h config.h defines.h intern.h missing.h \ sprintf.@OBJEXT@: sprintf.c ruby.h config.h defines.h intern.h missing.h st.@OBJEXT@: st.c config.h st.h string.@OBJEXT@: string.c ruby.h config.h defines.h intern.h missing.h \ - re.h regex.h version.h + re.h regex.h struct.@OBJEXT@: struct.c ruby.h config.h defines.h intern.h missing.h time.@OBJEXT@: time.c ruby.h config.h defines.h intern.h missing.h util.@OBJEXT@: util.c ruby.h config.h defines.h intern.h missing.h util.h diff --git a/bcc32/Makefile.sub b/bcc32/Makefile.sub index 7c748ce478..17d6bc5401 100644 --- a/bcc32/Makefile.sub +++ b/bcc32/Makefile.sub @@ -630,7 +630,7 @@ ruby.obj: ruby.c ruby.h config.h defines.h intern.h missing.h dln.h node.h util. signal.obj: signal.c ruby.h config.h defines.h intern.h missing.h rubysig.h win32.h sprintf.obj: sprintf.c ruby.h config.h defines.h intern.h missing.h win32.h st.obj: st.c config.h st.h -string.obj: string.c ruby.h config.h defines.h intern.h missing.h re.h regex.h version.h win32.h +string.obj: string.c ruby.h config.h defines.h intern.h missing.h re.h regex.h win32.h struct.obj: struct.c ruby.h config.h defines.h intern.h missing.h win32.h time.obj: time.c ruby.h config.h defines.h intern.h missing.h win32.h util.obj: util.c ruby.h config.h defines.h intern.h missing.h util.h win32.h @@ -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 <code>$_</code><code>=~ <i>str</i></code>. - */ - -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); diff --git a/win32/Makefile.sub b/win32/Makefile.sub index 253f5f5823..8cd23e90af 100644 --- a/win32/Makefile.sub +++ b/win32/Makefile.sub @@ -709,8 +709,7 @@ sprintf.obj: {$(srcdir)}sprintf.c {$(srcdir)}ruby.h config.h \ st.obj: {$(srcdir)}st.c config.h {$(srcdir)}st.h string.obj: {$(srcdir)}string.c {$(srcdir)}ruby.h config.h \ {$(srcdir)}defines.h {$(srcdir)}intern.h {$(srcdir)}missing.h \ - {$(srcdir)}re.h {$(srcdir)}regex.h {$(srcdir)}version.h \ - {$(srcdir)}/win32/win32.h + {$(srcdir)}re.h {$(srcdir)}regex.h {$(srcdir)}/win32/win32.h struct.obj: {$(srcdir)}struct.c {$(srcdir)}ruby.h config.h \ {$(srcdir)}defines.h {$(srcdir)}intern.h {$(srcdir)}missing.h \ {$(srcdir)}/win32/win32.h diff --git a/wince/Makefile.sub b/wince/Makefile.sub index 2b0e53209e..1b14afc8a0 100644 --- a/wince/Makefile.sub +++ b/wince/Makefile.sub @@ -703,8 +703,7 @@ sprintf.obj: {$(srcdir)}sprintf.c {$(srcdir)}ruby.h config.h \ st.obj: {$(srcdir)}st.c config.h {$(srcdir)}st.h string.obj: {$(srcdir)}string.c {$(srcdir)}ruby.h config.h \ {$(srcdir)}defines.h {$(srcdir)}intern.h {$(srcdir)}missing.h \ - {$(srcdir)}re.h {$(srcdir)}regex.h {$(srcdir)}version.h \ - {$(srcdir)}/win32/win32.h + {$(srcdir)}re.h {$(srcdir)}regex.h {$(srcdir)}/win32/win32.h struct.obj: {$(srcdir)}struct.c {$(srcdir)}ruby.h config.h \ {$(srcdir)}defines.h {$(srcdir)}intern.h {$(srcdir)}missing.h \ {$(srcdir)}/win32/win32.h |