* 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

1 files changed, 2 insertions, 1 deletions

diff --git a/file.c b/file.c
index a7b4fe010e..5d51005260 100644
--- a/file.c
+++ b/file.c
@@ -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);