[前][次][番号順一覧][スレッド一覧]

ruby-changes:1891

From: ko1@a...
Date: 7 Sep 2007 15:41:26 +0900
Subject: [ruby-changes:1891] shyouhei - Ruby:r13381 (ruby_1_8_6): * sample/test.rb, test/ruby/test_system.rb(valid_syntax?): keep

shyouhei	2007-09-07 15:41:17 +0900 (Fri, 07 Sep 2007)

  New Revision: 13381

  Modified files:
    branches/ruby_1_8_6/ChangeLog
    branches/ruby_1_8_6/sample/test.rb
    branches/ruby_1_8_6/test/ruby/test_system.rb
    branches/ruby_1_8_6/version.h

  Log:
    * sample/test.rb, test/ruby/test_system.rb(valid_syntax?): keep
      comment lines first.


  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_6/ChangeLog?r1=13381&r2=13380
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_6/version.h?r1=13381&r2=13380
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_6/sample/test.rb?r1=13381&r2=13380
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_6/test/ruby/test_system.rb?r1=13381&r2=13380

Index: ruby_1_8_6/ChangeLog
===================================================================
--- ruby_1_8_6/ChangeLog	(revision 13380)
+++ ruby_1_8_6/ChangeLog	(revision 13381)
@@ -1,3 +1,8 @@
+Fri Sep  7 15:40:47 2007  Nobuyoshi Nakada  <nobu@r...>
+
+	* sample/test.rb, test/ruby/test_system.rb(valid_syntax?): keep
+	  comment lines first.
+
 Wed Aug 22 12:40:15 2007  Nobuyoshi Nakada  <nobu@r...>
 
 	* hash.c (rb_hash_delete_key): delete the entry without calling block.
Index: ruby_1_8_6/version.h
===================================================================
--- ruby_1_8_6/version.h	(revision 13380)
+++ ruby_1_8_6/version.h	(revision 13381)
@@ -2,7 +2,7 @@
 #define RUBY_RELEASE_DATE "2007-09-07"
 #define RUBY_VERSION_CODE 186
 #define RUBY_RELEASE_CODE 20070907
-#define RUBY_PATCHLEVEL 90
+#define RUBY_PATCHLEVEL 91
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8
Index: ruby_1_8_6/sample/test.rb
===================================================================
--- ruby_1_8_6/sample/test.rb	(revision 13380)
+++ ruby_1_8_6/sample/test.rb	(revision 13381)
@@ -1697,7 +1697,10 @@
 end
 
 def valid_syntax?(code, fname)
-  eval("BEGIN {return true}\n#{code}", nil, fname, 0)
+  code = code.sub(/\A(?:\s*\#.*$)*(\n)?/n) {
+    "#$&#{"\n" if $1 && !$2}BEGIN{return true}\n"
+  }
+  eval(code, nil, fname, 0)
 rescue Exception
   puts $!.message
   false
Index: ruby_1_8_6/test/ruby/test_system.rb
===================================================================
--- ruby_1_8_6/test/ruby/test_system.rb	(revision 13380)
+++ ruby_1_8_6/test/ruby/test_system.rb	(revision 13381)
@@ -4,7 +4,10 @@
 
 class TestSystem < Test::Unit::TestCase
   def valid_syntax?(code, fname)
-    eval("BEGIN {return true}\n#{code}", nil, fname, 0)
+    code = code.sub(/\A(?:\s*\#.*$)*(\n)?/n) {
+      "#$&#{"\n" if $1 && !$2}BEGIN{return true}\n"
+    }
+    eval(code, nil, fname, 0)
   end
 
   def test_system

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

[前][次][番号順一覧][スレッド一覧]