archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-15 16:44:01 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Merge from ruby_1_8.

Browse source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@16171 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
knu 2008-04-23 05:18:50 +00:00
parent 8609df7b9a
commit 23de09d6bb
3 changed files with 19 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

11
ChangeLog
View file

@ -1,3 +1,14 @@
Wed Apr 23 14:00:05 2008 Akinori MUSHA <knu@iDaemons.org>
* lib/mkmf.rb (create_makefile): Add a missing dependency on the
target directory for each .rb file. This will hopefully fix
parallel make (-jN). Tested on FreeBSD.
Wed Apr 23 11:49:54 2008 Akinori MUSHA <knu@iDaemons.org>
* lib/set.rb (Set#each, SortedSet#each, TC_Set#test_each): Return
an enumerator if no block is given.
Wed Apr 23 00:42:49 2008 Tanaka Akira <akr@fsij.org> Wed Apr 23 00:42:49 2008 Tanaka Akira <akr@fsij.org>
* eval.c (error_print): show full stack grace except SystemStackError. * eval.c (error_print): show full stack grace except SystemStackError.

2
lib/mkmf.rb
View file

@ -1519,7 +1519,7 @@ static: $(STATIC_LIB)#{$extout ? " install-rb" : ""}
files.each do |f| files.each do |f|
dest = "#{dir}/#{File.basename(f)}" dest = "#{dir}/#{File.basename(f)}"
mfile.print("install-rb#{sfx}: #{dest}\n") mfile.print("install-rb#{sfx}: #{dest}\n")
mfile.print("#{dest}: #{f}\n\t$(#{$extout ? 'COPY' : 'INSTALL_DATA'}) ") mfile.print("#{dest}: #{f} #{dir}\n\t$(#{$extout ? 'COPY' : 'INSTALL_DATA'}) ")
sep = config_string('BUILD_FILE_SEPARATOR') sep = config_string('BUILD_FILE_SEPARATOR')
if sep if sep
f = f.gsub("/", sep) f = f.gsub("/", sep)

12
lib/set.rb
View file

@ -2,7 +2,7 @@
#-- #--
# set.rb - defines the Set class # set.rb - defines the Set class
#++ #++
# Copyright (c) 2002 Akinori MUSHA <knu@iDaemons.org> # Copyright (c) 2002-2008 Akinori MUSHA <knu@iDaemons.org>
# #
# Documentation by Akinori MUSHA and Gavin Sinclair. # Documentation by Akinori MUSHA and Gavin Sinclair.
# #
@ -188,8 +188,10 @@ class Set
end end
# Calls the given block once for each element in the set, passing # Calls the given block once for each element in the set, passing
# the element as parameter. # the element as parameter. Returns an enumerator if no block is
# given.
def each def each
block_given? or return enum_for(__method__)
@hash.each_key { |o| yield(o) } @hash.each_key { |o| yield(o) }
self self
end end
@ -501,6 +503,7 @@ class SortedSet < Set
end end
def each def each
block_given? or return enum_for(__method__)
to_a.each { |o| yield(o) } to_a.each { |o| yield(o) }
end end
@ -918,9 +921,8 @@ class TC_Set < Test::Unit::TestCase
ary = [1,3,5,7,10,20] ary = [1,3,5,7,10,20]
set = Set.new(ary) set = Set.new(ary)
assert_raises(LocalJumpError) { e = set.each
set.each assert_instance_of(Enumerable::Enumerator, e)
}
assert_nothing_raised { assert_nothing_raised {
set.each { |o| set.each { |o|