mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
70bbad3cfd
rb_exec_recursive() in eval.c. * eval.c (rb_exec_recursive): new function. * array.c (rb_ary_join): use rb_exec_recursive(). * array.c (rb_ary_inspect, rb_ary_hash): ditto. * file.c (rb_file_join): ditto. * hash.c (rb_hash_inspect, rb_hash_to_s, rb_hash_hash): ditto. * io.c (rb_io_puts): ditto. * object.c (rb_obj_inspect): ditto * struct.c (rb_struct_inspect): ditto. * lib/set.rb (SortedSet::setup): a hack to shut up warning. [ruby-talk:132866] * lib/time.rb (Time::strptime): add new function. inspired by [ruby-talk:132815]. * lib/parsedate.rb (ParseDate::strptime): ditto. * regparse.c: move st_*_strend() functions from st.c. fixed some potential memory leaks. * exception error messages updated. [ruby-core:04497] * ext/socket/socket.c (Init_socket): add bunch of Socket constants. Patch from Sam Roberts <sroberts@uniserve.com>. [ruby-core:04409] * array.c (rb_ary_s_create): no need for negative argc check. [ruby-core:04463] * array.c (rb_ary_unshift_m): ditto. * lib/xmlrpc/parser.rb (XMLRPC::FaultException): make it subclass of StandardError class, not Exception class. [ruby-core:04429] * parse.y (fcall_gen): lvar(arg) will be evaluated as lvar.call(arg) when lvar is a defined local variable. [new] * object.c (rb_class_initialize): call inherited method before calling initializing block. * eval.c (rb_thread_start_1): initialize newly pushed frame. * lib/open3.rb (Open3::popen3): $? should not be EXIT_FAILURE. fixed: [ruby-core:04444] * eval.c (is_defined): NODE_IASGN is an assignment. * ext/readline/readline.c (Readline.readline): use rl_outstream and rl_instream. [ruby-dev:25699] * ext/etc/etc.c (Init_etc): sGroup needs HAVE_ST_GR_PASSWD check [ruby-dev:25675] * misc/ruby-mode.el: [ruby-core:04415] * lib/rdoc/generators/html_generator.rb: [ruby-core:04412] * lib/rdoc/generators/ri_generator.rb: ditto. * struct.c (make_struct): fixed: [ruby-core:04402] * ext/curses/curses.c (window_color_set): [ruby-core:04393] * ext/socket/socket.c (Init_socket): SO_REUSEPORT added. [ruby-talk:130092] * object.c: [ruby-doc:818] * parse.y (open_args): fix too verbose warnings for the space before argument parentheses. [ruby-dev:25492] * parse.y (parser_yylex): ditto. * parse.y (parser_yylex): the first expression in the parentheses should not be a command. [ruby-dev:25492] * lib/irb/context.rb (IRB::Context::initialize): [ruby-core:04330] * object.c (Init_Object): remove Object#type. [ruby-core:04335] * st.c (st_foreach): report success/failure by return value. [ruby-Bugs-1396] * parse.y: forgot to initialize parser struct. [ruby-dev:25492] * parse.y (parser_yylex): no tLABEL on EXPR_BEG. [ruby-talk:127711] * document updates - [ruby-core:04296], [ruby-core:04301], [ruby-core:04302], [ruby-core:04307] * dir.c (rb_push_glob): should work for NUL delimited patterns. * dir.c (rb_glob2): should aware of offset in the pattern. * string.c (rb_str_new4): should propagate taintedness. * env.h: rename member names in struct FRAME; last_func -> callee, orig_func -> this_func, last_class -> this_class. * struct.c (rb_struct_set): use original method name, not callee name, to retrieve member slot. [ruby-core:04268] * time.c (time_strftime): protect from format modification from GC finalizers. * object.c (Init_Object): remove rb_obj_id_obsolete() * eval.c (rb_mod_define_method): incomplete subclass check. [ruby-dev:25464] * gc.c (rb_data_object_alloc): klass may be NULL. [ruby-list:40498] * bignum.c (rb_big_rand): should return positive random number. [ruby-dev:25401] * bignum.c (rb_big_rand): do not use rb_big_modulo to generate random bignums. [ruby-dev:25396] * variable.c (rb_autoload): [ruby-dev:25373] * eval.c (svalue_to_avalue): [ruby-dev:25366] * string.c (rb_str_justify): [ruby-dev:25367] * io.c (rb_f_select): [ruby-dev:25312] * ext/socket/socket.c (sock_s_getservbyport): [ruby-talk:124072] * struct.c (make_struct): [ruby-dev:25249] * dir.c (dir_open_dir): new function. [ruby-dev:25242] * io.c (rb_f_open): add type check for return value from to_open. * lib/pstore.rb (PStore#transaction): Use the empty content when a file is not found. [ruby-dev:24561] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@8068 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
458 lines
9.4 KiB
Ruby
458 lines
9.4 KiB
Ruby
require 'test/unit'
|
|
|
|
class Array
|
|
def iter_test1
|
|
collect{|e| [e, yield(e)]}.sort{|a,b|a[1]<=>b[1]}
|
|
end
|
|
def iter_test2
|
|
a = collect{|e| [e, yield(e)]}
|
|
a.sort{|a,b|a[1]<=>b[1]}
|
|
end
|
|
end
|
|
|
|
class TestIterator < Test::Unit::TestCase
|
|
def ttt
|
|
assert(iterator?)
|
|
end
|
|
|
|
def test_iterator
|
|
assert(!iterator?)
|
|
|
|
ttt{}
|
|
|
|
# yield at top level !! here's not toplevel
|
|
assert(!defined?(yield))
|
|
end
|
|
|
|
def test_array
|
|
$x = [1, 2, 3, 4]
|
|
$y = []
|
|
|
|
# iterator over array
|
|
for i in $x
|
|
$y.push i
|
|
end
|
|
assert_equal($x, $y)
|
|
end
|
|
|
|
def tt
|
|
1.upto(10) {|i|
|
|
yield i
|
|
}
|
|
end
|
|
|
|
def tt2(dummy)
|
|
yield 1
|
|
end
|
|
|
|
def tt3(&block)
|
|
tt2(raise(ArgumentError,""),&block)
|
|
end
|
|
|
|
def test_nested_iterator
|
|
i = 0
|
|
tt{|i| break if i == 5}
|
|
assert_equal(5, i)
|
|
|
|
assert_raises(ArgumentError) do
|
|
tt3{}
|
|
end
|
|
end
|
|
|
|
def tt4 &block
|
|
tt2(raise(ArgumentError,""),&block)
|
|
end
|
|
|
|
def test_block_argument_without_paren
|
|
assert_raises(ArgumentError) do
|
|
tt4{}
|
|
end
|
|
end
|
|
|
|
# iterator break/redo/next/retry
|
|
def test_break
|
|
done = true
|
|
loop{
|
|
break
|
|
done = false # should not reach here
|
|
}
|
|
assert(done)
|
|
|
|
done = false
|
|
$bad = false
|
|
loop {
|
|
break if done
|
|
done = true
|
|
next
|
|
$bad = true # should not reach here
|
|
}
|
|
assert(!$bad)
|
|
|
|
done = false
|
|
$bad = false
|
|
loop {
|
|
break if done
|
|
done = true
|
|
redo
|
|
$bad = true # should not reach here
|
|
}
|
|
assert(!$bad)
|
|
|
|
$x = []
|
|
for i in 1 .. 7
|
|
$x.push i
|
|
end
|
|
assert_equal(7, $x.size)
|
|
assert_equal([1, 2, 3, 4, 5, 6, 7], $x)
|
|
|
|
$done = false
|
|
$x = []
|
|
for i in 1 .. 7 # see how retry works in iterator loop
|
|
if i == 4 and not $done
|
|
$done = true
|
|
retry
|
|
end
|
|
$x.push(i)
|
|
end
|
|
assert_equal(10, $x.size)
|
|
assert_equal([1, 2, 3, 1, 2, 3, 4, 5, 6, 7], $x)
|
|
end
|
|
|
|
def test_append_method_to_built_in_class
|
|
$x = [[1,2],[3,4],[5,6]]
|
|
assert_equal($x.iter_test1{|x|x}, $x.iter_test2{|x|x})
|
|
end
|
|
|
|
class IterTest
|
|
def initialize(e); @body = e; end
|
|
|
|
def each0(&block); @body.each(&block); end
|
|
def each1(&block); @body.each {|*x| block.call(*x) } end
|
|
def each2(&block); @body.each {|*x| block.call(x) } end
|
|
def each3(&block); @body.each {|x| block.call(*x) } end
|
|
def each4(&block); @body.each {|x| block.call(x) } end
|
|
def each5; @body.each {|*x| yield(*x) } end
|
|
def each6; @body.each {|*x| yield(x) } end
|
|
def each7; @body.each {|x| yield(*x) } end
|
|
def each8; @body.each {|x| yield(x) } end
|
|
|
|
def f(a)
|
|
a
|
|
end
|
|
end
|
|
|
|
def test_itertest
|
|
assert_equal([1], IterTest.new(nil).method(:f).to_proc.call([1]))
|
|
m = /\w+/.match("abc")
|
|
assert_equal([m], IterTest.new(nil).method(:f).to_proc.call([m]))
|
|
|
|
IterTest.new([0]).each0 {|x| assert_equal(0, x)}
|
|
IterTest.new([1]).each1 {|x| assert_equal(1, x)}
|
|
IterTest.new([2]).each2 {|x| assert_equal([2], x)}
|
|
IterTest.new([3]).each3 {|x| assert_equal(3, x)}
|
|
IterTest.new([4]).each4 {|x| assert_equal(4, x)}
|
|
IterTest.new([5]).each5 {|x| assert_equal(5, x)}
|
|
IterTest.new([6]).each6 {|x| assert_equal([6], x)}
|
|
IterTest.new([7]).each7 {|x| assert_equal(7, x)}
|
|
IterTest.new([8]).each8 {|x| assert_equal(8, x)}
|
|
|
|
IterTest.new([[0]]).each0 {|x| assert_equal([0], x)}
|
|
IterTest.new([[1]]).each1 {|x| assert_equal([1], x)}
|
|
IterTest.new([[2]]).each2 {|x| assert_equal([[2]], x)}
|
|
IterTest.new([[3]]).each3 {|x| assert_equal(3, x)}
|
|
IterTest.new([[4]]).each4 {|x| assert_equal([4], x)}
|
|
IterTest.new([[5]]).each5 {|x| assert_equal([5], x)}
|
|
IterTest.new([[6]]).each6 {|x| assert_equal([[6]], x)}
|
|
IterTest.new([[7]]).each7 {|x| assert_equal(7, x)}
|
|
IterTest.new([[8]]).each8 {|x| assert_equal([8], x)}
|
|
|
|
IterTest.new([[0,0]]).each0 {|x| assert_equal([0,0], x)}
|
|
IterTest.new([[8,8]]).each8 {|x| assert_equal([8,8], x)}
|
|
end
|
|
|
|
def m(var)
|
|
var
|
|
end
|
|
|
|
def m1
|
|
m(block_given?)
|
|
end
|
|
|
|
def m2
|
|
m(block_given?,&proc{})
|
|
end
|
|
|
|
def test_block_given
|
|
assert(m1{p 'test'})
|
|
assert(m2{p 'test'})
|
|
assert(!m1())
|
|
assert(!m2())
|
|
end
|
|
|
|
class C
|
|
include Enumerable
|
|
def initialize
|
|
@a = [1,2,3]
|
|
end
|
|
def each(&block)
|
|
@a.each(&block)
|
|
end
|
|
end
|
|
|
|
def test_collect
|
|
assert_equal([1,2,3], C.new.collect{|n| n})
|
|
end
|
|
|
|
def test_proc
|
|
assert_instance_of(Proc, lambda{})
|
|
assert_instance_of(Proc, Proc.new{})
|
|
lambda{|a|assert_equal(a, 1)}.call(1)
|
|
end
|
|
|
|
def test_block
|
|
assert_instance_of(NilClass, get_block)
|
|
assert_instance_of(Proc, get_block{})
|
|
end
|
|
|
|
def test_argument
|
|
assert_nothing_raised {lambda{||}.call}
|
|
assert_raises(ArgumentError) {lambda{||}.call(1)}
|
|
assert_nothing_raised {lambda{|a,|}.call(1)}
|
|
assert_raises(ArgumentError) {lambda{|a,|}.call()}
|
|
assert_raises(ArgumentError) {lambda{|a,|}.call(1,2)}
|
|
end
|
|
|
|
def get_block(&block)
|
|
block
|
|
end
|
|
|
|
def test_get_block
|
|
assert_instance_of(Proc, get_block{})
|
|
assert_nothing_raised {get_block{||}.call()}
|
|
assert_nothing_raised {get_block{||}.call(1)}
|
|
assert_nothing_raised {get_block{|a,|}.call(1)}
|
|
assert_nothing_raised {get_block{|a,|}.call()}
|
|
assert_nothing_raised {get_block{|a,|}.call(1,2)}
|
|
|
|
assert_nothing_raised {get_block(&lambda{||}).call()}
|
|
assert_raises(ArgumentError) {get_block(&lambda{||}).call(1)}
|
|
assert_nothing_raised {get_block(&lambda{|a,|}).call(1)}
|
|
assert_raises(ArgumentError) {get_block(&lambda{|a,|}).call(1,2)}
|
|
|
|
block = get_block{11}
|
|
assert_instance_of(Proc, block)
|
|
assert_instance_of(Proc, block.to_proc)
|
|
assert_equal(block.clone.call, 11)
|
|
assert_instance_of(Proc, get_block(&block))
|
|
|
|
lmd = lambda{44}
|
|
assert_instance_of(Proc, lmd)
|
|
assert_instance_of(Proc, lmd.to_proc)
|
|
assert_equal(lmd.clone.call, 44)
|
|
assert_instance_of(Proc, get_block(&lmd))
|
|
|
|
assert_equal(1, Proc.new{|a,| a}.call(1,2,3))
|
|
assert_nothing_raised {Proc.new{|a,|}.call(1,2)}
|
|
end
|
|
|
|
def return1_test
|
|
Proc.new {
|
|
return 55
|
|
}.call + 5
|
|
end
|
|
|
|
def test_return1
|
|
assert_equal(55, return1_test())
|
|
end
|
|
|
|
def return2_test
|
|
lambda {
|
|
return 55
|
|
}.call + 5
|
|
end
|
|
|
|
def test_return2
|
|
assert_equal(60, return2_test())
|
|
end
|
|
|
|
def proc_call(&b)
|
|
b.call
|
|
end
|
|
def proc_yield()
|
|
yield
|
|
end
|
|
def proc_return1
|
|
proc_call{return 42}+1
|
|
end
|
|
|
|
def test_proc_return1
|
|
assert_equal(42, proc_return1())
|
|
end
|
|
|
|
def proc_return2
|
|
proc_yield{return 42}+1
|
|
end
|
|
|
|
def test_proc_return2
|
|
assert_equal(42, proc_return2())
|
|
end
|
|
|
|
def test_ljump
|
|
assert_raises(LocalJumpError) {get_block{break}.call}
|
|
|
|
# cannot use assert_nothing_raised due to passing block.
|
|
begin
|
|
val = lambda{break 11}.call
|
|
rescue LocalJumpError
|
|
assert(false, "LocalJumpError occurred from break in lambda")
|
|
else
|
|
assert(11, val)
|
|
end
|
|
|
|
block = get_block{11}
|
|
lmd = lambda{44}
|
|
assert_equal(0, block.arity)
|
|
assert_equal(0, lmd.arity)
|
|
assert_equal(0, lambda{||}.arity)
|
|
assert_equal(1, lambda{|a|}.arity)
|
|
assert_equal(1, lambda{|a,|}.arity)
|
|
assert_equal(2, lambda{|a,b|}.arity)
|
|
end
|
|
|
|
def marity_test(m)
|
|
mobj = method(m)
|
|
assert_equal(mobj.arity, mobj.to_proc.arity)
|
|
end
|
|
|
|
def test_marity
|
|
marity_test(:assert)
|
|
marity_test(:marity_test)
|
|
marity_test(:p)
|
|
|
|
lambda(&method(:assert)).call(true)
|
|
lambda(&get_block{|a,n| assert(a,n)}).call(true, "marity")
|
|
end
|
|
|
|
def foo
|
|
yield([:key, :value])
|
|
end
|
|
def bar(&blk)
|
|
blk.call([:key, :value])
|
|
end
|
|
|
|
def test_yield_vs_call
|
|
foo{|k,v| assert_equal([:key, :value], [k,v])}
|
|
bar{|k,v| assert_equal([:key, :value], [k,v])}
|
|
end
|
|
|
|
class H
|
|
def each
|
|
yield [:key, :value]
|
|
end
|
|
end
|
|
|
|
def test_assoc_yield
|
|
[{:key=>:value}, H.new].each {|h|
|
|
h.each{|a| assert_equal([:key, :value], a)}
|
|
h.each{|*a| assert_equal([[:key, :value]], a)}
|
|
h.each{|k,v| assert_equal([:key, :value], [k,v])}
|
|
}
|
|
end
|
|
|
|
class ITER_TEST1
|
|
def a
|
|
block_given?
|
|
end
|
|
end
|
|
|
|
class ITER_TEST2 < ITER_TEST1
|
|
include Test::Unit::Assertions
|
|
def a
|
|
assert(super)
|
|
super
|
|
end
|
|
end
|
|
|
|
def test_iter_test2
|
|
assert(ITER_TEST2.new.a {})
|
|
end
|
|
|
|
class ITER_TEST3
|
|
def foo x
|
|
return yield if block_given?
|
|
x
|
|
end
|
|
end
|
|
|
|
class ITER_TEST4 < ITER_TEST3
|
|
include Test::Unit::Assertions
|
|
def foo x
|
|
assert_equal(super, yield)
|
|
assert_equal(x, super(x, &nil))
|
|
end
|
|
end
|
|
|
|
def test_iter4
|
|
ITER_TEST4.new.foo(44){55}
|
|
end
|
|
|
|
def test_break__nested_loop1
|
|
_test_break__nested_loop1 do
|
|
break
|
|
end
|
|
end
|
|
|
|
def _test_break__nested_loop1
|
|
while true
|
|
yield
|
|
end
|
|
assert(false, "must not reach here")
|
|
end
|
|
|
|
def test_break__nested_loop2
|
|
_test_break__nested_loop2 do
|
|
break
|
|
end
|
|
end
|
|
|
|
def _test_break__nested_loop2
|
|
until false
|
|
yield
|
|
end
|
|
assert(false, "must not reach here")
|
|
end
|
|
|
|
def test_break__nested_loop3
|
|
_test_break__nested_loop3 do
|
|
break
|
|
end
|
|
end
|
|
|
|
def _test_break__nested_loop3
|
|
loop do
|
|
yield
|
|
end
|
|
assert(false, "must not reach here")
|
|
end
|
|
|
|
def test_break_from_enum
|
|
result = ["a"].inject("ng") {|x,y| break "ok"}
|
|
assert_equal("ok", result)
|
|
end
|
|
|
|
def _test_return_trace_func(x)
|
|
set_trace_func(proc {})
|
|
[].fetch(2) {return x}
|
|
ensure
|
|
set_trace_func(nil)
|
|
end
|
|
|
|
def test_return_trace_func
|
|
ok = "returned gracefully"
|
|
result = "skipped"
|
|
result = _test_return_trace_func(ok)
|
|
ensure
|
|
assert_equal(ok, result)
|
|
return
|
|
end
|
|
end
|