diff options
author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2006-06-17 14:50:04 +0000 |
---|---|---|
committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2006-06-17 14:50:04 +0000 |
commit | 7b484902220ded077a37a3a2e4587df2fe27f5e0 (patch) | |
tree | a6fe22dc74558d7a677ca7773b249a2531e3e960 /file.c | |
parent | 7d274ff6fbb97c3ac8ee0ce6903f0e77b05e0b07 (diff) |
* eval.c (Init_eval): add aliases invoke_method and
invoke_functional_method corresponding send and funcall
respectively. [ruby-talk:197512]
* parse.y (parser_yylex): returns the most typical keyword token
on EXPR_FNAME. [ruby-core:7995]
* ext/socket/socket.c: protoize.
* parse.y (then): remove ':' from 'then' and 'do' rules.
* hash.c (env_aset): raise TypeError on nil with more descriptive
message. [ruby-core:07990]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@10304 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'file.c')
-rw-r--r-- | file.c | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -2877,7 +2877,8 @@ rb_file_join(VALUE ary, VALUE sep) len += 10; } } - if (!NIL_P(sep) && TYPE(sep) == T_STRING) { + if (!NIL_P(sep)) { + StringValue(sep); len += RSTRING(sep)->len * RARRAY(ary)->len - 1; } result = rb_str_buf_new(len); |