diff options
author | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-07-15 02:50:57 +0000 |
---|---|---|
committer | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-07-15 02:50:57 +0000 |
commit | e3ba58bb2c6918fd810ecb2839b020ae7131fa39 (patch) | |
tree | 67b67285d4630f55cb6b2a8be141233113f8c73c | |
parent | 262c620e90c6f88430c10ef92ee07958085633d3 (diff) |
merge revision(s) 23306:
* file.c (rb_file_join): recursive array has no meaning as path
name. [ruby-core:23329]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@24114 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | file.c | 4 | ||||
-rw-r--r-- | version.h | 8 |
3 files changed, 11 insertions, 6 deletions
@@ -1,3 +1,8 @@ +Wed Jul 15 11:40:34 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * file.c (rb_file_join): recursive array has no meaning as path + name. [ruby-core:23329] + Tue Jul 14 19:57:28 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> * eval.c (get_ts): use readtime clock. [ruby-dev:38354] @@ -3124,8 +3124,8 @@ rb_file_join(ary, sep) case T_STRING: break; case T_ARRAY: - if (rb_inspecting_p(tmp)) { - tmp = rb_str_new2("[...]"); + if (tmp == ary || rb_inspecting_p(tmp)) { + rb_raise(rb_eArgError, "recursive array"); } else { VALUE args[2]; @@ -1,15 +1,15 @@ #define RUBY_VERSION "1.8.7" -#define RUBY_RELEASE_DATE "2009-07-14" +#define RUBY_RELEASE_DATE "2009-07-15" #define RUBY_VERSION_CODE 187 -#define RUBY_RELEASE_CODE 20090714 -#define RUBY_PATCHLEVEL 183 +#define RUBY_RELEASE_CODE 20090715 +#define RUBY_PATCHLEVEL 184 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 8 #define RUBY_VERSION_TEENY 7 #define RUBY_RELEASE_YEAR 2009 #define RUBY_RELEASE_MONTH 7 -#define RUBY_RELEASE_DAY 14 +#define RUBY_RELEASE_DAY 15 #ifdef RUBY_EXTERN RUBY_EXTERN const char ruby_version[]; |