ruby-changes:5711
From: shyouhei <ko1@a...>
Date: Sun, 15 Jun 2008 20:55:06 +0900 (JST)
Subject: [ruby-changes:5711] Ruby:r17218 (ruby_1_8_6): merge revision(s) 15832:
shyouhei 2008-06-15 20:54:50 +0900 (Sun, 15 Jun 2008) New Revision: 17218 Modified files: branches/ruby_1_8_6/ChangeLog branches/ruby_1_8_6/parse.y branches/ruby_1_8_6/version.h Log: 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. http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_6/ChangeLog?r1=17218&r2=17217&diff_format=u http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_6/version.h?r1=17218&r2=17217&diff_format=u http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_6/parse.y?r1=17218&r2=17217&diff_format=u Index: ruby_1_8_6/parse.y =================================================================== --- ruby_1_8_6/parse.y (revision 17217) +++ ruby_1_8_6/parse.y (revision 17218) @@ -2602,11 +2602,8 @@ 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); Index: ruby_1_8_6/ChangeLog =================================================================== --- ruby_1_8_6/ChangeLog (revision 17217) +++ ruby_1_8_6/ChangeLog (revision 17218) @@ -1,3 +1,10 @@ +Sun Jun 15 20:54:07 2008 Akinori MUSHA <knu@i...> + + * 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@r...> * lib/resolv.rb (Resolv::Hosts): should not use win32/resolv on cygwin. Index: ruby_1_8_6/version.h =================================================================== --- ruby_1_8_6/version.h (revision 17217) +++ ruby_1_8_6/version.h (revision 17218) @@ -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 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/