summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2003-06-14 13:41:29 +0000
committermatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2003-06-14 13:41:29 +0000
commit44db106b74009d21dffeb7e9a6f5ac75a93e4686 (patch)
treebb58d862762ff3ad7a6423431301bb6b4ccf19fe
parenta5684ed234d6e5d24da356d5f35e2ceb910f260f (diff)
downloadruby-44db106b74009d21dffeb7e9a6f5ac75a93e4686.tar.gz
ruby-44db106b74009d21dffeb7e9a6f5ac75a93e4686.tar.xz
ruby-44db106b74009d21dffeb7e9a6f5ac75a93e4686.zip
* eval.c (method_arity): should handle NODE_BMETHOD and
NODE_DMETHOD. [ruby-core:01138] git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@3941 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog19
-rw-r--r--eval.c3
2 files changed, 15 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index 852244c71..06019849f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat Jun 14 17:59:59 2003 Guy Decoux <ts@moulon.inra.fr>
+
+ * eval.c (method_arity): should handle NODE_BMETHOD and
+ NODE_DMETHOD. [ruby-core:01138]
+
Fri Jun 13 09:24:39 2003 Shugo Maeda <shugo@ruby-lang.org>
* lib/net/ftp.rb (storebinary): seek correctly. Thanks, William Webber.
@@ -6,18 +11,18 @@ Fri Jun 13 09:24:39 2003 Shugo Maeda <shugo@ruby-lang.org>
Tue Jun 10 14:26:30 2003 why the lucky stiff <ruby-cvs@whytheluckystiff.net>
- * ext/syck/token.c: preserve newlines prepended to a block.
+ * ext/syck/token.c: preserve newlines prepended to a block.
- * ext/syck/implicit.c (syck_match_implicit): added !merge and !default.
+ * ext/syck/implicit.c (syck_match_implicit): added !merge and !default.
- * lib/yaml/constants.rb: remove '\z' escape.
+ * lib/yaml/constants.rb: remove '\z' escape.
- * lib/yaml/emitter.rb: ensure reset of @seq_map shortcut flag.
+ * lib/yaml/emitter.rb: ensure reset of @seq_map shortcut flag.
- * lib/yaml/encoding.rb: remove Unicode translation methods.
+ * lib/yaml/encoding.rb: remove Unicode translation methods.
- * lib/yaml/rubytypes.rb: improved round-tripping of Strings.
- [ruby-core:1134]
+ * lib/yaml/rubytypes.rb: improved round-tripping of Strings.
+ [ruby-core:1134]
Tue Jun 10 01:07:54 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
diff --git a/eval.c b/eval.c
index 101a27149..04697f48a 100644
--- a/eval.c
+++ b/eval.c
@@ -7444,6 +7444,9 @@ method_arity(method)
return INT2FIX(1);
case NODE_IVAR:
return INT2FIX(0);
+ case NODE_BMETHOD:
+ case NODE_DMETHOD:
+ return block_arity(method);
default:
body = body->nd_next; /* skip NODE_SCOPE */
if (nd_type(body) == NODE_BLOCK)