nobu	2008-10-23 01:24:58 +0900 (Thu, 23 Oct 2008)

  New Revision: 19891

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

  Log:
    * lib/mkmf.rb (create_tmpsrc): get rid of side effects.

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

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 19890)
+++ ChangeLog	(revision 19891)
@@ -1,3 +1,7 @@
+Thu Oct 23 01:24:49 2008  Nobuyoshi Nakada  <nobu@r...>
+
+	* lib/mkmf.rb (create_tmpsrc): get rid of side effects.
+
 Thu Oct 23 00:10:01 2008  Koichi Sasada  <ko1@a...>
 
 	* cont.c: separate data structure between rb_fiber_t and
Index: lib/mkmf.rb
===================================================================
--- lib/mkmf.rb	(revision 19890)
+++ lib/mkmf.rb	(revision 19891)
@@ -323,9 +323,11 @@
 end
 
 def create_tmpsrc(src)
+  src = "#{COMMON_HEADERS}\n#{src}"
   src = yield(src) if block_given?
-  src[0, 0] = COMMON_HEADERS + "\n"
-  src = src.gsub(/[ \t]+$/, '').gsub(/\A\n+|^\n+$/, '').sub(/[^\n]\z/, "\\&\n")
+  src.gsub!(/[ \t]+$/, '')
+  src.gsub!(/\A\n+|^\n+$/, '')
+  src.sub!(/[^\n]\z/, "\\&\n")
   count = 0
   begin
     open(CONFTEST_C, "wb") do |cfile|
Index: ruby_1_8/ChangeLog
===================================================================
--- ruby_1_8/ChangeLog	(revision 19890)
+++ ruby_1_8/ChangeLog	(revision 19891)
@@ -1,3 +1,7 @@
+Thu Oct 23 01:24:49 2008  Nobuyoshi Nakada  <nobu@r...>
+
+	* lib/mkmf.rb (create_tmpsrc): get rid of side effects.
+
 Wed Oct 22 00:33:15 2008  Masatoshi SEKI  <m_seki@m...>
 
 	* test/rinda/test_rinda.c (test_core_03_notify): Fixed test failures
Index: ruby_1_8/version.h
===================================================================
--- ruby_1_8/version.h	(revision 19890)
+++ ruby_1_8/version.h	(revision 19891)
@@ -1,7 +1,7 @@
 #define RUBY_VERSION "1.8.7"
-#define RUBY_RELEASE_DATE "2008-10-22"
+#define RUBY_RELEASE_DATE "2008-10-23"
 #define RUBY_VERSION_CODE 187
-#define RUBY_RELEASE_CODE 20081022
+#define RUBY_RELEASE_CODE 20081023
 #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 10
-#define RUBY_RELEASE_DAY 22
+#define RUBY_RELEASE_DAY 23
 
 #ifdef RUBY_EXTERN
 RUBY_EXTERN const char ruby_version[];
Index: ruby_1_8/lib/mkmf.rb
===================================================================
--- ruby_1_8/lib/mkmf.rb	(revision 19890)
+++ ruby_1_8/lib/mkmf.rb	(revision 19891)
@@ -294,9 +294,11 @@
 end
 
 def create_tmpsrc(src)
+  src = "#{COMMON_HEADERS}\n#{src}"
   src = yield(src) if block_given?
-  src[0, 0] = COMMON_HEADERS + "\n"
-  src = src.gsub(/[ \t]+$/, '').gsub(/\A\n+|^\n+$/, '').sub(/[^\n]\z/, "\\&\n")
+  src.gsub!(/[ \t]+$/, '')
+  src.gsub!(/\A\n+|^\n+$/, '')
+  src.sub!(/[^\n]\z/, "\\&\n")
   open(CONFTEST_C, "wb") do |cfile|
     cfile.print src
   end

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