From da9a9c68fd91ad541c1fa211f66a3fb511ecdc03 Mon Sep 17 00:00:00 2001 From: shyouhei Date: Fri, 7 Sep 2007 05:00:26 +0000 Subject: * sample/test.rb, test/ruby/test_system.rb(valid_syntax?): keep comment lines first. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_5@13357 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- sample/test.rb | 5 ++++- test/ruby/test_system.rb | 5 ++++- version.h | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/sample/test.rb b/sample/test.rb index e7f2d251b7..741e96ee9d 100644 --- a/sample/test.rb +++ b/sample/test.rb @@ -1697,7 +1697,10 @@ else 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 diff --git a/test/ruby/test_system.rb b/test/ruby/test_system.rb index f3a71598f7..3513577ec5 100644 --- a/test/ruby/test_system.rb +++ b/test/ruby/test_system.rb @@ -4,7 +4,10 @@ require 'envutil' 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 diff --git a/version.h b/version.h index 7d16d40ff1..264ad000eb 100644 --- a/version.h +++ b/version.h @@ -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 -- cgit v1.2.3