ruby-changes:21954
From: shyouhei <ko1@a...>
Date: Sat, 10 Dec 2011 21:18:40 +0900 (JST)
Subject: [ruby-changes:21954] shyouhei:r34002 (ruby_1_8_7): merge revision(s) 20587:
shyouhei 2011-12-10 21:17:30 +0900 (Sat, 10 Dec 2011) New Revision: 34002 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=34002 Log: merge revision(s) 20587: * mkconfig.rb: fix for continued lines. based on a patch from Marcus Rueckert <darix AT opensu.se> at [ruby-core:20420]. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@20587 b2dd03c8-39d4-4d8f-98ff-823fe69b080e Signed-off-by: URABE, Shyouhei <shyouhei@r...> Modified files: branches/ruby_1_8_7/ChangeLog branches/ruby_1_8_7/mkconfig.rb Index: ruby_1_8_7/ChangeLog =================================================================== --- ruby_1_8_7/ChangeLog (revision 34001) +++ ruby_1_8_7/ChangeLog (revision 34002) @@ -1,3 +1,8 @@ +Mon Oct 17 04:20:22 2011 Nobuyoshi Nakada <nobu@r...> + + * mkconfig.rb: fix for continued lines. based on a patch from + Marcus Rueckert <darix AT opensu.se> at [ruby-core:20420]. + Mon Oct 17 04:19:39 2011 Yukihiro Matsumoto <matz@r...> * numeric.c (flo_cmp): Infinity is greater than any bignum Index: ruby_1_8_7/mkconfig.rb =================================================================== --- ruby_1_8_7/mkconfig.rb (revision 34001) +++ ruby_1_8_7/mkconfig.rb (revision 34002) @@ -56,14 +56,13 @@ continued_name = name next end - when /^"(.+)"\s*(\\)?$/ + when /^"(.*)"\s*(\\)?$/ if continued_line continued_line << $1 - unless $2 - val = continued_line.join("") - name = continued_name - continued_line = nil - end + next if $2 + val = continued_line.join("") + name = continued_name + continued_line = nil end when /^(?:ac_given_)?INSTALL=(.*)/ v_fast << " CONFIG[\"INSTALL\"] = " + $1 + "\n" -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/