diff options
author | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-06-15 11:54:50 +0000 |
---|---|---|
committer | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-06-15 11:54:50 +0000 |
commit | c1863afe30037bf7b876e01a9e12c06ad51fb11a (patch) | |
tree | 60782776125d3a29b3500583a522a3fe2798fff9 | |
parent | ba02b2d689893b4ed12b1f01bf68a46f851f2bf9 (diff) |
merge revision(s) 15832:
* parse.y (yycompile): Always prepare a new array for each file's
SCRIPT_LINES__ storage, instead of appending source lines every
time a file is re-loaded; submitted by Rocky Bernstein in
#18517.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_6@17218 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 7 | ||||
-rw-r--r-- | parse.y | 7 | ||||
-rw-r--r-- | version.h | 2 |
3 files changed, 10 insertions, 6 deletions
@@ -1,3 +1,10 @@ +Sun Jun 15 20:54:07 2008 Akinori MUSHA <knu@iDaemons.org> + + * parse.y (yycompile): Always prepare a new array for each file's + SCRIPT_LINES__ storage, instead of appending source lines every + time a file is re-loaded; submitted by Rocky Bernstein in + #18517. + Sun Jun 15 20:30:01 2008 Nobuyoshi Nakada <nobu@ruby-lang.org> * lib/resolv.rb (Resolv::Hosts): should not use win32/resolv on cygwin. @@ -2602,11 +2602,8 @@ yycompile(f, line) hash = rb_const_get(rb_cObject, rb_intern("SCRIPT_LINES__")); if (TYPE(hash) == T_HASH) { fname = rb_str_new2(f); - ruby_debug_lines = rb_hash_aref(hash, fname); - if (NIL_P(ruby_debug_lines)) { - ruby_debug_lines = rb_ary_new(); - rb_hash_aset(hash, fname, ruby_debug_lines); - } + ruby_debug_lines = rb_ary_new(); + rb_hash_aset(hash, fname, ruby_debug_lines); } if (line > 1) { VALUE str = rb_str_new(0,0); @@ -2,7 +2,7 @@ #define RUBY_RELEASE_DATE "2008-06-15" #define RUBY_VERSION_CODE 186 #define RUBY_RELEASE_CODE 20080615 -#define RUBY_PATCHLEVEL 188 +#define RUBY_PATCHLEVEL 189 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 8 |