summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-01-07 10:12:45 +0000
committermatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-01-07 10:12:45 +0000
commit80c9ac5500ae26a03661eb1dc67127a2784f9715 (patch)
treefd135ffadabe125de1f54070aaa76dbc5948071d
parent3e3dc0512975ab6a6c2d32e8c6e7400a19ee1405 (diff)
downloadruby-80c9ac5500ae26a03661eb1dc67127a2784f9715.tar.gz
ruby-80c9ac5500ae26a03661eb1dc67127a2784f9715.tar.xz
ruby-80c9ac5500ae26a03661eb1dc67127a2784f9715.zip
* string.c (Init_String): sym_match arity spec was wrong. a patch
from Hiroyuki Iwatsuki <don at na.rim.or.jp> in [ruby-dev:32957]. git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@14934 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--bootstraptest/test_knownbug.rb2
-rw-r--r--string.c2
3 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 996358931..11e1acfc1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Jan 7 19:11:30 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * string.c (Init_String): sym_match arity spec was wrong. a patch
+ from Hiroyuki Iwatsuki <don at na.rim.or.jp> in [ruby-dev:32957].
+
Mon Jan 7 18:10:33 2008 Tanaka Akira <akr@fsij.org>
* string.c (str_gsub): move rb_enc_get(str) to out of loop.
diff --git a/bootstraptest/test_knownbug.rb b/bootstraptest/test_knownbug.rb
index 9f770a786..56ca4d40e 100644
--- a/bootstraptest/test_knownbug.rb
+++ b/bootstraptest/test_knownbug.rb
@@ -83,7 +83,7 @@ assert_equal 'ok', %q{
end
end
- M::A.eval_str(<<END)
+ M::A.eval_str(<<-END)
workflow_rule do |r|
r.at 1
end
diff --git a/string.c b/string.c
index d7a22ec1f..4a11648a0 100644
--- a/string.c
+++ b/string.c
@@ -5975,7 +5975,7 @@ Init_String(void)
rb_define_method(rb_cSymbol, "length", sym_length, 0);
rb_define_method(rb_cSymbol, "size", sym_length, 0);
rb_define_method(rb_cSymbol, "empty?", sym_empty, 0);
- rb_define_method(rb_cSymbol, "match", sym_match, -1);
+ rb_define_method(rb_cSymbol, "match", sym_match, 1);
rb_define_method(rb_cSymbol, "upcase", sym_upcase, 0);
rb_define_method(rb_cSymbol, "downcase", sym_downcase, 0);