ruby-changes:1866
From: ko1@a...
Date: 7 Sep 2007 14:00:33 +0900
Subject: [ruby-changes:1866] shyouhei - Ruby:r13357 (ruby_1_8_5): * sample/test.rb, test/ruby/test_system.rb(valid_syntax?): keep
shyouhei 2007-09-07 14:00:26 +0900 (Fri, 07 Sep 2007) New Revision: 13357 Modified files: branches/ruby_1_8_5/sample/test.rb branches/ruby_1_8_5/test/ruby/test_system.rb branches/ruby_1_8_5/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_5/sample/test.rb?r1=13357&r2=13356 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_5/version.h?r1=13357&r2=13356 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_5/test/ruby/test_system.rb?r1=13357&r2=13356 Index: ruby_1_8_5/version.h =================================================================== --- ruby_1_8_5/version.h (revision 13356) +++ ruby_1_8_5/version.h (revision 13357) @@ -2,7 +2,7 @@ #define RUBY_RELEASE_DATE "2007-09-07" #define RUBY_VERSION_CODE 185 #define RUBY_RELEASE_CODE 20070907 -#define RUBY_PATCHLEVEL 98 +#define RUBY_PATCHLEVEL 99 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 8 Index: ruby_1_8_5/sample/test.rb =================================================================== --- ruby_1_8_5/sample/test.rb (revision 13356) +++ ruby_1_8_5/sample/test.rb (revision 13357) @@ -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_5/test/ruby/test_system.rb =================================================================== --- ruby_1_8_5/test/ruby/test_system.rb (revision 13356) +++ ruby_1_8_5/test/ruby/test_system.rb (revision 13357) @@ -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