1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00

merge revision(s) 20231:

* shell/command-processor.rb: undefined method `top_level_test' in


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@22281 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
shyouhei 2009-02-13 10:05:02 +00:00
parent 2fed0e8e6f
commit 0aac18678d
3 changed files with 15 additions and 5 deletions

View file

@ -1,3 +1,8 @@
Fri Feb 13 19:04:54 2009 Keiju Ishitsuka <keiju@ruby-lang.org>
* shell/command-processor.rb: undefined method `top_level_test' in
Shell#test. [ruby-list:45634]
Tue Feb 10 20:00:52 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
* eval.c (load_lock): makes circular require deadlock.

View file

@ -155,6 +155,7 @@ class Shell
# sh[:exists?, "foo"]
# sh["exists?", "foo"]
#
alias top_level_test test
def test(command, file1, file2=nil)
file1 = expand_path(file1)
file2 = expand_path(file2) if file2
@ -162,7 +163,11 @@ class Shell
case command
when Integer
top_level_test(command, file1, file2)
if file2
top_level_test(command, file1, file2)
else
top_level_test(command, file1)
end
when String
if command.size == 1
if file2

View file

@ -1,15 +1,15 @@
#define RUBY_VERSION "1.8.7"
#define RUBY_RELEASE_DATE "2009-02-11"
#define RUBY_RELEASE_DATE "2009-02-13"
#define RUBY_VERSION_CODE 187
#define RUBY_RELEASE_CODE 20090211
#define RUBY_PATCHLEVEL 114
#define RUBY_RELEASE_CODE 20090213
#define RUBY_PATCHLEVEL 115
#define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 8
#define RUBY_VERSION_TEENY 7
#define RUBY_RELEASE_YEAR 2009
#define RUBY_RELEASE_MONTH 2
#define RUBY_RELEASE_DAY 11
#define RUBY_RELEASE_DAY 13
#ifdef RUBY_EXTERN
RUBY_EXTERN const char ruby_version[];