nobu	2008-12-09 03:21:47 +0900 (Tue, 09 Dec 2008)

  New Revision: 20587

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=20587

  Log:
    * mkconfig.rb: fix for continued lines.  based on a patch from
      Marcus Rueckert <darix AT opensu.se> at [ruby-core:20420].

  Modified files:
    branches/ruby_1_8/ChangeLog
    branches/ruby_1_8/mkconfig.rb
    branches/ruby_1_8/version.h
    trunk/ChangeLog
    trunk/mkconfig.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 20586)
+++ ChangeLog	(revision 20587)
@@ -1,3 +1,8 @@
+Tue Dec  9 03:21:37 2008  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].
+
 Tue Dec  9 00:54:01 2008  Nobuyoshi Nakada  <nobu@r...>
 
 	* tool/make-snapshot (package): enc.mk in snapshot is dummy and should
Index: mkconfig.rb
===================================================================
--- mkconfig.rb	(revision 20586)
+++ mkconfig.rb	(revision 20587)
@@ -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"
Index: ruby_1_8/ChangeLog
===================================================================
--- ruby_1_8/ChangeLog	(revision 20586)
+++ ruby_1_8/ChangeLog	(revision 20587)
@@ -1,3 +1,8 @@
+Tue Dec  9 03:21:37 2008  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 Dec  8 23:34:18 2008  Yuki Sonoda (Yugui)  <yugui@y...>
 
 	* pack.c (pack_pack): fixed odd act of 'm*', 'M*', and 'P*'.
Index: ruby_1_8/mkconfig.rb
===================================================================
--- ruby_1_8/mkconfig.rb	(revision 20586)
+++ ruby_1_8/mkconfig.rb	(revision 20587)
@@ -55,14 +55,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"
Index: ruby_1_8/version.h
===================================================================
--- ruby_1_8/version.h	(revision 20586)
+++ ruby_1_8/version.h	(revision 20587)
@@ -1,7 +1,7 @@
 #define RUBY_VERSION "1.8.7"
-#define RUBY_RELEASE_DATE "2008-12-08"
+#define RUBY_RELEASE_DATE "2008-12-09"
 #define RUBY_VERSION_CODE 187
-#define RUBY_RELEASE_CODE 20081208
+#define RUBY_RELEASE_CODE 20081209
 #define RUBY_PATCHLEVEL 5000
 
 #define RUBY_VERSION_MAJOR 1
@@ -9,7 +9,7 @@
 #define RUBY_VERSION_TEENY 7
 #define RUBY_RELEASE_YEAR 2008
 #define RUBY_RELEASE_MONTH 12
-#define RUBY_RELEASE_DAY 8
+#define RUBY_RELEASE_DAY 9
 
 #ifdef RUBY_EXTERN
 RUBY_EXTERN const char ruby_version[];

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/