From 2e752da616efd57083dbac93b4b6b2347e42a65c Mon Sep 17 00:00:00 2001 From: nobu Date: Sat, 18 Aug 2007 03:24:32 +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@13085 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ sample/test.rb | 5 ++++- test/ruby/test_system.rb | 5 ++++- version.h | 6 +++--- 4 files changed, 16 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 95d3eee7e0..5e1e360a6c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Sat Aug 18 12:24:30 2007 Nobuyoshi Nakada + + * sample/test.rb, test/ruby/test_system.rb(valid_syntax?): keep + comment lines first. + Thu Aug 16 20:40:50 2007 Yukihiro Matsumoto * bignum.c (bigtrunc): RBIGNUM(x)->len may be zero. out of bound 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 e2883548da..3ee647ee79 100644 --- a/version.h +++ b/version.h @@ -1,7 +1,7 @@ #define RUBY_VERSION "1.8.6" -#define RUBY_RELEASE_DATE "2007-08-16" +#define RUBY_RELEASE_DATE "2007-08-18" #define RUBY_VERSION_CODE 186 -#define RUBY_RELEASE_CODE 20070816 +#define RUBY_RELEASE_CODE 20070818 #define RUBY_PATCHLEVEL 5000 #define RUBY_VERSION_MAJOR 1 @@ -9,7 +9,7 @@ #define RUBY_VERSION_TEENY 6 #define RUBY_RELEASE_YEAR 2007 #define RUBY_RELEASE_MONTH 8 -#define RUBY_RELEASE_DAY 16 +#define RUBY_RELEASE_DAY 18 #ifdef RUBY_EXTERN RUBY_EXTERN const char ruby_version[]; -- cgit v1.2.3