2003-09-04 12:18:59 -04:00
|
|
|
require 'test/unit'
|
|
|
|
|
|
|
|
class Array
|
|
|
|
def iter_test1
|
|
|
|
collect{|e| [e, yield(e)]}.sort{|a,b|a[1]<=>b[1]}
|
|
|
|
end
|
|
|
|
def iter_test2
|
2010-01-25 18:12:50 -05:00
|
|
|
ary = collect{|e| [e, yield(e)]}
|
|
|
|
ary.sort{|a,b|a[1]<=>b[1]}
|
2003-09-04 12:18:59 -04:00
|
|
|
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
|
2003-09-04 14:00:09 -04:00
|
|
|
assert_equal($x, $y)
|
2003-09-04 12:18:59 -04:00
|
|
|
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
|
2010-01-25 18:12:50 -05:00
|
|
|
tt{|j| break if j == 5}
|
2006-10-03 11:59:45 -04:00
|
|
|
assert_equal(0, i)
|
2003-09-04 12:18:59 -04:00
|
|
|
|
2008-09-24 13:44:39 -04:00
|
|
|
assert_raise(ArgumentError) do
|
2003-09-04 12:18:59 -04:00
|
|
|
tt3{}
|
|
|
|
end
|
2003-10-06 02:18:45 -04:00
|
|
|
end
|
|
|
|
|
|
|
|
def tt4 &block
|
|
|
|
tt2(raise(ArgumentError,""),&block)
|
|
|
|
end
|
|
|
|
|
|
|
|
def test_block_argument_without_paren
|
2008-09-24 13:44:39 -04:00
|
|
|
assert_raise(ArgumentError) do
|
2003-10-06 02:18:45 -04:00
|
|
|
tt4{}
|
|
|
|
end
|
2003-09-04 12:18:59 -04:00
|
|
|
end
|
|
|
|
|
2007-12-19 03:46:49 -05:00
|
|
|
# iterator break/redo/next
|
2003-09-04 12:18:59 -04:00
|
|
|
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
|
2003-09-04 14:00:09 -04:00
|
|
|
assert_equal(7, $x.size)
|
|
|
|
assert_equal([1, 2, 3, 4, 5, 6, 7], $x)
|
2003-09-04 12:18:59 -04:00
|
|
|
end
|
|
|
|
|
|
|
|
def test_append_method_to_built_in_class
|
|
|
|
$x = [[1,2],[3,4],[5,6]]
|
2003-09-04 14:00:09 -04:00
|
|
|
assert_equal($x.iter_test1{|x|x}, $x.iter_test2{|x|x})
|
2003-09-04 12:18:59 -04:00
|
|
|
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
|
2003-09-04 14:00:09 -04:00
|
|
|
assert_equal([1], IterTest.new(nil).method(:f).to_proc.call([1]))
|
2003-09-04 12:18:59 -04:00
|
|
|
m = /\w+/.match("abc")
|
2003-09-04 14:00:09 -04:00
|
|
|
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([4]).each4 {|x| assert_equal(4, x)}
|
2007-07-06 02:55:19 -04:00
|
|
|
IterTest.new([5]).each5 {|x| assert_equal(5, x)}
|
2006-07-10 04:37:37 -04:00
|
|
|
IterTest.new([6]).each6 {|x| assert_equal([6], x)}
|
2003-09-04 14:00:09 -04:00
|
|
|
IterTest.new([8]).each8 {|x| assert_equal(8, x)}
|
|
|
|
|
2006-07-10 04:37:37 -04:00
|
|
|
IterTest.new([[0]]).each0 {|x| assert_equal([0], x)}
|
2007-07-06 02:55:19 -04:00
|
|
|
IterTest.new([[1]]).each1 {|x| assert_equal([1], x)}
|
|
|
|
IterTest.new([[2]]).each2 {|x| assert_equal([[2]], x)}
|
2003-09-04 14:00:09 -04:00
|
|
|
IterTest.new([[3]]).each3 {|x| assert_equal(3, x)}
|
2006-07-10 04:37:37 -04:00
|
|
|
IterTest.new([[4]]).each4 {|x| assert_equal([4], x)}
|
|
|
|
IterTest.new([[5]]).each5 {|x| assert_equal([5], x)}
|
2007-07-06 02:55:19 -04:00
|
|
|
IterTest.new([[6]]).each6 {|x| assert_equal([[6]], x)}
|
|
|
|
IterTest.new([[7]]).each7 {|x| assert_equal(7, x)}
|
2006-07-10 04:37:37 -04:00
|
|
|
IterTest.new([[8]]).each8 {|x| assert_equal([8], x)}
|
2003-09-04 14:00:09 -04:00
|
|
|
|
2007-07-06 02:55:19 -04:00
|
|
|
IterTest.new([[0,0]]).each0 {|*x| assert_equal([[0,0]], x)}
|
|
|
|
IterTest.new([[8,8]]).each8 {|*x| assert_equal([[8,8]], x)}
|
2003-09-04 12:18:59 -04:00
|
|
|
end
|
|
|
|
|
|
|
|
def m(var)
|
2003-09-04 14:00:09 -04:00
|
|
|
var
|
2003-09-04 12:18:59 -04:00
|
|
|
end
|
|
|
|
|
|
|
|
def m1
|
|
|
|
m(block_given?)
|
|
|
|
end
|
|
|
|
|
|
|
|
def m2
|
|
|
|
m(block_given?,&proc{})
|
|
|
|
end
|
|
|
|
|
2003-09-08 21:39:58 -04:00
|
|
|
def test_block_given
|
2003-09-04 14:00:09 -04:00
|
|
|
assert(m1{p 'test'})
|
|
|
|
assert(m2{p 'test'})
|
2003-09-05 11:15:43 -04:00
|
|
|
assert(!m1())
|
|
|
|
assert(!m2())
|
2003-09-04 12:18:59 -04:00
|
|
|
end
|
|
|
|
|
2005-08-10 18:57:38 -04:00
|
|
|
def m3(var, &block)
|
|
|
|
m(yield(var), &block)
|
|
|
|
end
|
|
|
|
|
2005-08-17 08:35:56 -04:00
|
|
|
def m4(&block)
|
|
|
|
m(m1(), &block)
|
|
|
|
end
|
|
|
|
|
2005-08-10 18:57:38 -04:00
|
|
|
def test_block_passing
|
2005-08-17 08:35:56 -04:00
|
|
|
assert(!m4())
|
|
|
|
assert(!m4 {})
|
2005-08-10 18:57:38 -04:00
|
|
|
assert_equal(100, m3(10) {|x|x*x})
|
|
|
|
end
|
|
|
|
|
2003-09-04 12:18:59 -04:00
|
|
|
class C
|
|
|
|
include Enumerable
|
|
|
|
def initialize
|
|
|
|
@a = [1,2,3]
|
|
|
|
end
|
|
|
|
def each(&block)
|
|
|
|
@a.each(&block)
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
def test_collect
|
2003-09-04 14:00:09 -04:00
|
|
|
assert_equal([1,2,3], C.new.collect{|n| n})
|
2003-09-04 12:18:59 -04:00
|
|
|
end
|
|
|
|
|
|
|
|
def test_proc
|
2003-09-04 14:00:09 -04:00
|
|
|
assert_instance_of(Proc, lambda{})
|
|
|
|
assert_instance_of(Proc, Proc.new{})
|
2003-09-05 07:34:55 -04:00
|
|
|
lambda{|a|assert_equal(a, 1)}.call(1)
|
2003-09-04 12:18:59 -04:00
|
|
|
end
|
|
|
|
|
|
|
|
def test_block
|
2003-09-04 14:00:09 -04:00
|
|
|
assert_instance_of(NilClass, get_block)
|
|
|
|
assert_instance_of(Proc, get_block{})
|
2003-09-04 12:18:59 -04:00
|
|
|
end
|
|
|
|
|
|
|
|
def test_argument
|
2003-09-04 14:00:09 -04:00
|
|
|
assert_nothing_raised {lambda{||}.call}
|
2008-09-24 13:44:39 -04:00
|
|
|
assert_raise(ArgumentError) {lambda{||}.call(1)}
|
2003-09-04 14:00:09 -04:00
|
|
|
assert_nothing_raised {lambda{|a,|}.call(1)}
|
2008-09-24 13:44:39 -04:00
|
|
|
assert_raise(ArgumentError) {lambda{|a,|}.call()}
|
|
|
|
assert_raise(ArgumentError) {lambda{|a,|}.call(1,2)}
|
2003-09-04 12:18:59 -04:00
|
|
|
end
|
|
|
|
|
|
|
|
def get_block(&block)
|
|
|
|
block
|
|
|
|
end
|
|
|
|
|
|
|
|
def test_get_block
|
2003-09-04 14:00:09 -04:00
|
|
|
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()}
|
2008-09-24 13:44:39 -04:00
|
|
|
assert_raise(ArgumentError) {get_block(&lambda{||}).call(1)}
|
2003-09-04 14:00:09 -04:00
|
|
|
assert_nothing_raised {get_block(&lambda{|a,|}).call(1)}
|
2008-09-24 13:44:39 -04:00
|
|
|
assert_raise(ArgumentError) {get_block(&lambda{|a,|}).call(1,2)}
|
2003-09-04 12:18:59 -04:00
|
|
|
|
|
|
|
block = get_block{11}
|
2003-09-04 14:00:09 -04:00
|
|
|
assert_instance_of(Proc, block)
|
|
|
|
assert_instance_of(Proc, block.to_proc)
|
2003-09-05 07:28:27 -04:00
|
|
|
assert_equal(block.clone.call, 11)
|
2003-09-04 14:00:09 -04:00
|
|
|
assert_instance_of(Proc, get_block(&block))
|
2003-09-04 12:18:59 -04:00
|
|
|
|
* array.c: replace rb_protect_inspect() and rb_inspecting_p() by
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
2005-03-04 01:47:45 -05:00
|
|
|
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))
|
2003-09-04 12:18:59 -04:00
|
|
|
|
2003-09-04 14:00:09 -04:00
|
|
|
assert_equal(1, Proc.new{|a,| a}.call(1,2,3))
|
|
|
|
assert_nothing_raised {Proc.new{|a,|}.call(1,2)}
|
2003-09-04 12:18:59 -04:00
|
|
|
end
|
|
|
|
|
2003-09-06 13:27:58 -04:00
|
|
|
def return1_test
|
2003-09-04 12:18:59 -04:00
|
|
|
Proc.new {
|
|
|
|
return 55
|
|
|
|
}.call + 5
|
|
|
|
end
|
|
|
|
|
|
|
|
def test_return1
|
2003-09-04 14:00:09 -04:00
|
|
|
assert_equal(55, return1_test())
|
2003-09-04 12:18:59 -04:00
|
|
|
end
|
|
|
|
|
2003-09-06 13:27:58 -04:00
|
|
|
def return2_test
|
2003-09-04 12:18:59 -04:00
|
|
|
lambda {
|
|
|
|
return 55
|
|
|
|
}.call + 5
|
|
|
|
end
|
|
|
|
|
|
|
|
def test_return2
|
2003-09-04 14:00:09 -04:00
|
|
|
assert_equal(60, return2_test())
|
2003-09-04 12:18:59 -04:00
|
|
|
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
|
2003-09-04 14:00:09 -04:00
|
|
|
assert_equal(42, proc_return1())
|
2003-09-04 12:18:59 -04:00
|
|
|
end
|
|
|
|
|
|
|
|
def proc_return2
|
|
|
|
proc_yield{return 42}+1
|
|
|
|
end
|
|
|
|
|
|
|
|
def test_proc_return2
|
2003-09-04 14:00:09 -04:00
|
|
|
assert_equal(42, proc_return2())
|
2003-09-04 12:18:59 -04:00
|
|
|
end
|
|
|
|
|
|
|
|
def test_ljump
|
2008-09-24 13:44:39 -04:00
|
|
|
assert_raise(LocalJumpError) {get_block{break}.call}
|
2003-09-04 12:18:59 -04:00
|
|
|
|
2004-03-01 21:28:44 -05:00
|
|
|
# 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}
|
* array.c: replace rb_protect_inspect() and rb_inspecting_p() by
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
2005-03-04 01:47:45 -05:00
|
|
|
lmd = lambda{44}
|
2004-03-18 05:09:43 -05:00
|
|
|
assert_equal(0, block.arity)
|
* array.c: replace rb_protect_inspect() and rb_inspecting_p() by
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
2005-03-04 01:47:45 -05:00
|
|
|
assert_equal(0, lmd.arity)
|
2003-09-04 14:00:09 -04:00
|
|
|
assert_equal(0, lambda{||}.arity)
|
|
|
|
assert_equal(1, lambda{|a|}.arity)
|
|
|
|
assert_equal(1, lambda{|a,|}.arity)
|
|
|
|
assert_equal(2, lambda{|a,b|}.arity)
|
2003-09-04 12:18:59 -04:00
|
|
|
end
|
|
|
|
|
|
|
|
def marity_test(m)
|
* array.c: replace rb_protect_inspect() and rb_inspecting_p() by
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
2005-03-04 01:47:45 -05:00
|
|
|
mobj = method(m)
|
|
|
|
assert_equal(mobj.arity, mobj.to_proc.arity)
|
2003-09-04 12:18:59 -04:00
|
|
|
end
|
|
|
|
|
|
|
|
def test_marity
|
|
|
|
marity_test(:assert)
|
|
|
|
marity_test(:marity_test)
|
|
|
|
marity_test(:p)
|
|
|
|
|
|
|
|
lambda(&method(:assert)).call(true)
|
2003-09-08 21:39:58 -04:00
|
|
|
lambda(&get_block{|a,n| assert(a,n)}).call(true, "marity")
|
2003-09-04 12:18:59 -04:00
|
|
|
end
|
|
|
|
|
2003-10-29 12:47:24 -05:00
|
|
|
def foo
|
* sprintf.c (rb_str_format): allow %c to print one character
string (e.g. ?x).
* lib/tempfile.rb (Tempfile::make_tmpname): put dot between
basename and pid. [ruby-talk:196272]
* parse.y (do_block): remove -> style block.
* parse.y (parser_yylex): remove tLAMBDA_ARG.
* eval.c (rb_call0): binding for the return event hook should have
consistent scope. [ruby-core:07928]
* eval.c (proc_invoke): return behavior should depend whether it
is surrounded by a lambda or a mere block.
* eval.c (formal_assign): handles post splat arguments.
* eval.c (rb_call0): ditto.
* st.c (strhash): use FNV-1a hash.
* parse.y (parser_yylex): removed experimental ';;' terminator.
* eval.c (rb_node_arity): should be aware of post splat arguments.
* eval.c (rb_proc_arity): ditto.
* parse.y (f_args): syntax rule enhanced to support arguments
after the splat.
* parse.y (block_param): ditto for block parameters.
* parse.y (f_post_arg): mandatory formal arguments after the splat
argument.
* parse.y (new_args_gen): generate nodes for mandatory formal
arguments after the splat argument.
* eval.c (rb_eval): dispatch mandatory formal arguments after the
splat argument.
* parse.y (args): allow more than one splat in the argument list.
* parse.y (method_call): allow aref [] to accept all kind of
method argument, including assocs, splat, and block argument.
* eval.c (SETUP_ARGS0): prepare block argument as well.
* lib/mathn.rb (Integer): remove Integer#gcd2. [ruby-core:07931]
* eval.c (error_line): print receivers true/false/nil specially.
* eval.c (rb_proc_yield): handles parameters in yield semantics.
* eval.c (nil_yield): gives LocalJumpError to denote no block
error.
* io.c (rb_io_getc): now takes one-character string.
* string.c (rb_str_hash): use FNV-1a hash from Fowler/Noll/Vo
hashing algorithm.
* string.c (rb_str_aref): str[0] now returns 1 character string,
instead of a fixnum. [Ruby2]
* parse.y (parser_yylex): ?c now returns 1 character string,
instead of a fixnum. [Ruby2]
* string.c (rb_str_aset): no longer support fixnum insertion.
* eval.c (umethod_bind): should not update original class.
[ruby-dev:28636]
* eval.c (ev_const_get): should support constant access from
within instance_eval(). [ruby-dev:28327]
* time.c (time_timeval): should round for usec floating
number. [ruby-core:07896]
* time.c (time_add): ditto.
* dir.c (sys_warning): should not call a vararg function
rb_sys_warning() indirectly. [ruby-core:07886]
* numeric.c (flo_divmod): the first element of Float#divmod should
be an integer. [ruby-dev:28589]
* test/ruby/test_float.rb: add tests for divmod, div, modulo and remainder.
* re.c (rb_reg_initialize): should not allow modifying literal
regexps. frozen check moved from rb_reg_initialize_m as well.
* re.c (rb_reg_initialize): should not modify untainted objects in
safe levels higher than 3.
* re.c (rb_memcmp): type change from char* to const void*.
* dir.c (dir_close): should not close untainted dir stream.
* dir.c (GetDIR): add tainted/frozen check for each dir operation.
* lib/rdoc/parsers/parse_rb.rb (RDoc::RubyParser::parse_symbol_arg):
typo fixed. a patch from Florian Gross <florg at florg.net>.
* eval.c (EXEC_EVENT_HOOK): trace_func may remove itself from
event_hooks. no guarantee for arbitrary hook deletion.
[ruby-dev:28632]
* util.c (ruby_strtod): differ addition to minimize error.
[ruby-dev:28619]
* util.c (ruby_strtod): should not raise ERANGE when the input
string does not have any digits. [ruby-dev:28629]
* eval.c (proc_invoke): should restore old ruby_frame->block.
thanks to ts <decoux at moulon.inra.fr>. [ruby-core:07833]
also fix [ruby-dev:28614] as well.
* signal.c (trap): sig should be less then NSIG. Coverity found
this bug. a patch from Kevin Tew <tewk at tewk.com>.
[ruby-core:07823]
* math.c (math_log2): add new method inspired by
[ruby-talk:191237].
* math.c (math_log): add optional base argument to Math::log().
[ruby-talk:191308]
* ext/syck/emitter.c (syck_scan_scalar): avoid accessing
uninitialized array element. a patch from Pat Eyler
<rubypate at gmail.com>. [ruby-core:07809]
* array.c (rb_ary_fill): initialize local variables first. a
patch from Pat Eyler <rubypate at gmail.com>. [ruby-core:07810]
* ext/syck/yaml2byte.c (syck_yaml2byte_handler): need to free
type_tag. a patch from Pat Eyler <rubypate at gmail.com>.
[ruby-core:07808]
* ext/socket/socket.c (make_hostent_internal): accept ai_family
check from Sam Roberts <sroberts at uniserve.com>.
[ruby-core:07691]
* util.c (ruby_strtod): should not cut off 18 digits for no
reason. [ruby-core:07796]
* array.c (rb_ary_fill): internalize local variable "beg" to
pacify Coverity. [ruby-core:07770]
* pack.c (pack_unpack): now supports CRLF newlines. a patch from
<tommy at tmtm.org>. [ruby-dev:28601]
* applied code clean-up patch from Stefan Huehner
<stefan at huehner.org>. [ruby-core:07764]
* lib/jcode.rb (String::tr_s): should have translated non
squeezing character sequence (i.e. a character) as well. thanks
to Hiroshi Ichikawa <gimite at gimite.ddo.jp> [ruby-list:42090]
* ext/socket/socket.c: document update patch from Sam Roberts
<sroberts at uniserve.com>. [ruby-core:07701]
* lib/mathn.rb (Integer): need not to remove gcd2. a patch from
NARUSE, Yui <naruse at airemix.com>. [ruby-dev:28570]
* parse.y (arg): too much NEW_LIST()
* eval.c (SETUP_ARGS0): remove unnecessary access to nd_alen.
* eval.c (rb_eval): use ARGSCAT for NODE_OP_ASGN1.
[ruby-dev:28585]
* parse.y (arg): use NODE_ARGSCAT for placeholder.
* lib/getoptlong.rb (GetoptLong::get): RDoc update patch from
mathew <meta at pobox.com>. [ruby-core:07738]
* variable.c (rb_const_set): raise error when no target klass is
supplied. [ruby-dev:28582]
* prec.c (prec_prec_f): documentation patch from
<gerardo.santana at gmail.com>. [ruby-core:07689]
* bignum.c (rb_big_pow): second operand may be too big even if
it's a Fixnum. [ruby-talk:187984]
* README.EXT: update symbol description. [ruby-talk:188104]
* COPYING: explicitly note GPLv2. [ruby-talk:187922]
* parse.y: remove some obsolete syntax rules (unparenthesized
method calls in argument list).
* eval.c (rb_call0): insecure calling should be checked for non
NODE_SCOPE method invocations too.
* eval.c (rb_alias): should preserve the current safe level as
well as method definition.
* process.c (rb_f_sleep): remove RDoc description about SIGALRM
which is not valid on the current implementation. [ruby-dev:28464]
Thu Mar 23 21:40:47 2006 K.Kosako <sndgk393 AT ybb.ne.jp>
* eval.c (method_missing): should support argument splat in
super. a bug in combination of super, splat and
method_missing. [ruby-talk:185438]
* configure.in: Solaris SunPro compiler -rapth patch from
<kuwa at labs.fujitsu.com>. [ruby-dev:28443]
* configure.in: remove enable_rpath=no for Solaris.
[ruby-dev:28440]
* ext/win32ole/win32ole.c (ole_val2olevariantdata): change behavior
of converting OLE Variant object with VT_ARRAY|VT_UI1 and Ruby
String object.
* ruby.1: a clarification patch from David Lutterkort
<dlutter at redhat.com>. [ruby-core:7508]
* lib/rdoc/ri/ri_paths.rb (RI::Paths): adding paths from rubygems
directories. a patch from Eric Hodel <drbrain at segment7.net>.
[ruby-core:07423]
* eval.c (rb_clear_cache_by_class): clearing wrong cache.
* ext/extmk.rb: use :remove_destination to install extension libraries
to avoid SEGV. [ruby-dev:28417]
* eval.c (rb_thread_fd_writable): should not re-schedule output
from KILLED thread (must be error printing).
* array.c (rb_ary_flatten_bang): allow specifying recursion
level. [ruby-talk:182170]
* array.c (rb_ary_flatten): ditto.
* gc.c (add_heap): a heap_slots may overflow. a patch from Stefan
Weil <weil at mail.berlios.de>.
* eval.c (rb_call): use separate cache for fcall/vcall
invocation.
* eval.c (rb_eval): NODE_FCALL, NODE_VCALL can call local
functions.
* eval.c (rb_mod_local): a new method to specify newly added
visibility "local".
* eval.c (search_method): search for local methods which are
visible only from the current class.
* class.c (rb_class_local_methods): a method to list local methods.
* object.c (Init_Object): add BasicObject class as a top level
BlankSlate class.
* ruby.h (SYM2ID): should not cast to signed long.
[ruby-core:07414]
* class.c (rb_include_module): allow module duplication.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@10235 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2006-06-09 17:20:17 -04:00
|
|
|
yield(:key, :value)
|
2003-10-29 12:47:24 -05:00
|
|
|
end
|
|
|
|
def bar(&blk)
|
* sprintf.c (rb_str_format): allow %c to print one character
string (e.g. ?x).
* lib/tempfile.rb (Tempfile::make_tmpname): put dot between
basename and pid. [ruby-talk:196272]
* parse.y (do_block): remove -> style block.
* parse.y (parser_yylex): remove tLAMBDA_ARG.
* eval.c (rb_call0): binding for the return event hook should have
consistent scope. [ruby-core:07928]
* eval.c (proc_invoke): return behavior should depend whether it
is surrounded by a lambda or a mere block.
* eval.c (formal_assign): handles post splat arguments.
* eval.c (rb_call0): ditto.
* st.c (strhash): use FNV-1a hash.
* parse.y (parser_yylex): removed experimental ';;' terminator.
* eval.c (rb_node_arity): should be aware of post splat arguments.
* eval.c (rb_proc_arity): ditto.
* parse.y (f_args): syntax rule enhanced to support arguments
after the splat.
* parse.y (block_param): ditto for block parameters.
* parse.y (f_post_arg): mandatory formal arguments after the splat
argument.
* parse.y (new_args_gen): generate nodes for mandatory formal
arguments after the splat argument.
* eval.c (rb_eval): dispatch mandatory formal arguments after the
splat argument.
* parse.y (args): allow more than one splat in the argument list.
* parse.y (method_call): allow aref [] to accept all kind of
method argument, including assocs, splat, and block argument.
* eval.c (SETUP_ARGS0): prepare block argument as well.
* lib/mathn.rb (Integer): remove Integer#gcd2. [ruby-core:07931]
* eval.c (error_line): print receivers true/false/nil specially.
* eval.c (rb_proc_yield): handles parameters in yield semantics.
* eval.c (nil_yield): gives LocalJumpError to denote no block
error.
* io.c (rb_io_getc): now takes one-character string.
* string.c (rb_str_hash): use FNV-1a hash from Fowler/Noll/Vo
hashing algorithm.
* string.c (rb_str_aref): str[0] now returns 1 character string,
instead of a fixnum. [Ruby2]
* parse.y (parser_yylex): ?c now returns 1 character string,
instead of a fixnum. [Ruby2]
* string.c (rb_str_aset): no longer support fixnum insertion.
* eval.c (umethod_bind): should not update original class.
[ruby-dev:28636]
* eval.c (ev_const_get): should support constant access from
within instance_eval(). [ruby-dev:28327]
* time.c (time_timeval): should round for usec floating
number. [ruby-core:07896]
* time.c (time_add): ditto.
* dir.c (sys_warning): should not call a vararg function
rb_sys_warning() indirectly. [ruby-core:07886]
* numeric.c (flo_divmod): the first element of Float#divmod should
be an integer. [ruby-dev:28589]
* test/ruby/test_float.rb: add tests for divmod, div, modulo and remainder.
* re.c (rb_reg_initialize): should not allow modifying literal
regexps. frozen check moved from rb_reg_initialize_m as well.
* re.c (rb_reg_initialize): should not modify untainted objects in
safe levels higher than 3.
* re.c (rb_memcmp): type change from char* to const void*.
* dir.c (dir_close): should not close untainted dir stream.
* dir.c (GetDIR): add tainted/frozen check for each dir operation.
* lib/rdoc/parsers/parse_rb.rb (RDoc::RubyParser::parse_symbol_arg):
typo fixed. a patch from Florian Gross <florg at florg.net>.
* eval.c (EXEC_EVENT_HOOK): trace_func may remove itself from
event_hooks. no guarantee for arbitrary hook deletion.
[ruby-dev:28632]
* util.c (ruby_strtod): differ addition to minimize error.
[ruby-dev:28619]
* util.c (ruby_strtod): should not raise ERANGE when the input
string does not have any digits. [ruby-dev:28629]
* eval.c (proc_invoke): should restore old ruby_frame->block.
thanks to ts <decoux at moulon.inra.fr>. [ruby-core:07833]
also fix [ruby-dev:28614] as well.
* signal.c (trap): sig should be less then NSIG. Coverity found
this bug. a patch from Kevin Tew <tewk at tewk.com>.
[ruby-core:07823]
* math.c (math_log2): add new method inspired by
[ruby-talk:191237].
* math.c (math_log): add optional base argument to Math::log().
[ruby-talk:191308]
* ext/syck/emitter.c (syck_scan_scalar): avoid accessing
uninitialized array element. a patch from Pat Eyler
<rubypate at gmail.com>. [ruby-core:07809]
* array.c (rb_ary_fill): initialize local variables first. a
patch from Pat Eyler <rubypate at gmail.com>. [ruby-core:07810]
* ext/syck/yaml2byte.c (syck_yaml2byte_handler): need to free
type_tag. a patch from Pat Eyler <rubypate at gmail.com>.
[ruby-core:07808]
* ext/socket/socket.c (make_hostent_internal): accept ai_family
check from Sam Roberts <sroberts at uniserve.com>.
[ruby-core:07691]
* util.c (ruby_strtod): should not cut off 18 digits for no
reason. [ruby-core:07796]
* array.c (rb_ary_fill): internalize local variable "beg" to
pacify Coverity. [ruby-core:07770]
* pack.c (pack_unpack): now supports CRLF newlines. a patch from
<tommy at tmtm.org>. [ruby-dev:28601]
* applied code clean-up patch from Stefan Huehner
<stefan at huehner.org>. [ruby-core:07764]
* lib/jcode.rb (String::tr_s): should have translated non
squeezing character sequence (i.e. a character) as well. thanks
to Hiroshi Ichikawa <gimite at gimite.ddo.jp> [ruby-list:42090]
* ext/socket/socket.c: document update patch from Sam Roberts
<sroberts at uniserve.com>. [ruby-core:07701]
* lib/mathn.rb (Integer): need not to remove gcd2. a patch from
NARUSE, Yui <naruse at airemix.com>. [ruby-dev:28570]
* parse.y (arg): too much NEW_LIST()
* eval.c (SETUP_ARGS0): remove unnecessary access to nd_alen.
* eval.c (rb_eval): use ARGSCAT for NODE_OP_ASGN1.
[ruby-dev:28585]
* parse.y (arg): use NODE_ARGSCAT for placeholder.
* lib/getoptlong.rb (GetoptLong::get): RDoc update patch from
mathew <meta at pobox.com>. [ruby-core:07738]
* variable.c (rb_const_set): raise error when no target klass is
supplied. [ruby-dev:28582]
* prec.c (prec_prec_f): documentation patch from
<gerardo.santana at gmail.com>. [ruby-core:07689]
* bignum.c (rb_big_pow): second operand may be too big even if
it's a Fixnum. [ruby-talk:187984]
* README.EXT: update symbol description. [ruby-talk:188104]
* COPYING: explicitly note GPLv2. [ruby-talk:187922]
* parse.y: remove some obsolete syntax rules (unparenthesized
method calls in argument list).
* eval.c (rb_call0): insecure calling should be checked for non
NODE_SCOPE method invocations too.
* eval.c (rb_alias): should preserve the current safe level as
well as method definition.
* process.c (rb_f_sleep): remove RDoc description about SIGALRM
which is not valid on the current implementation. [ruby-dev:28464]
Thu Mar 23 21:40:47 2006 K.Kosako <sndgk393 AT ybb.ne.jp>
* eval.c (method_missing): should support argument splat in
super. a bug in combination of super, splat and
method_missing. [ruby-talk:185438]
* configure.in: Solaris SunPro compiler -rapth patch from
<kuwa at labs.fujitsu.com>. [ruby-dev:28443]
* configure.in: remove enable_rpath=no for Solaris.
[ruby-dev:28440]
* ext/win32ole/win32ole.c (ole_val2olevariantdata): change behavior
of converting OLE Variant object with VT_ARRAY|VT_UI1 and Ruby
String object.
* ruby.1: a clarification patch from David Lutterkort
<dlutter at redhat.com>. [ruby-core:7508]
* lib/rdoc/ri/ri_paths.rb (RI::Paths): adding paths from rubygems
directories. a patch from Eric Hodel <drbrain at segment7.net>.
[ruby-core:07423]
* eval.c (rb_clear_cache_by_class): clearing wrong cache.
* ext/extmk.rb: use :remove_destination to install extension libraries
to avoid SEGV. [ruby-dev:28417]
* eval.c (rb_thread_fd_writable): should not re-schedule output
from KILLED thread (must be error printing).
* array.c (rb_ary_flatten_bang): allow specifying recursion
level. [ruby-talk:182170]
* array.c (rb_ary_flatten): ditto.
* gc.c (add_heap): a heap_slots may overflow. a patch from Stefan
Weil <weil at mail.berlios.de>.
* eval.c (rb_call): use separate cache for fcall/vcall
invocation.
* eval.c (rb_eval): NODE_FCALL, NODE_VCALL can call local
functions.
* eval.c (rb_mod_local): a new method to specify newly added
visibility "local".
* eval.c (search_method): search for local methods which are
visible only from the current class.
* class.c (rb_class_local_methods): a method to list local methods.
* object.c (Init_Object): add BasicObject class as a top level
BlankSlate class.
* ruby.h (SYM2ID): should not cast to signed long.
[ruby-core:07414]
* class.c (rb_include_module): allow module duplication.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@10235 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2006-06-09 17:20:17 -04:00
|
|
|
blk.call(:key, :value)
|
2003-10-29 12:47:24 -05:00
|
|
|
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
|
2007-06-15 00:25:07 -04:00
|
|
|
yield [:key, :value]
|
|
|
|
end
|
2007-11-08 23:46:58 -05:00
|
|
|
alias each_pair each
|
2003-10-29 12:47:24 -05:00
|
|
|
end
|
|
|
|
|
|
|
|
def test_assoc_yield
|
2007-06-15 00:25:07 -04:00
|
|
|
[{:key=>:value}, H.new].each {|h|
|
|
|
|
h.each{|a| assert_equal([:key, :value], a)}
|
|
|
|
h.each{|a,| assert_equal(:key, a)}
|
|
|
|
h.each{|*a| assert_equal([[:key, :value]], a)}
|
|
|
|
h.each{|k,v| assert_equal([:key, :value], [k,v])}
|
2007-11-08 23:46:58 -05:00
|
|
|
h.each_pair{|a| assert_equal([:key, :value], a)}
|
2007-06-15 00:25:07 -04:00
|
|
|
h.each_pair{|a,| assert_equal(:key, a)}
|
2007-11-08 23:46:58 -05:00
|
|
|
h.each_pair{|*a| assert_equal([[:key, :value]], a)}
|
2007-06-15 00:25:07 -04:00
|
|
|
h.each_pair{|k,v| assert_equal([:key, :value], [k,v])}
|
2003-10-29 12:47:24 -05:00
|
|
|
}
|
|
|
|
end
|
|
|
|
|
2003-09-04 12:18:59 -04:00
|
|
|
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
|
2003-09-04 14:00:09 -04:00
|
|
|
assert_equal(super, yield)
|
|
|
|
assert_equal(x, super(x, &nil))
|
2003-09-04 12:18:59 -04:00
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
def test_iter4
|
2003-09-05 11:15:43 -04:00
|
|
|
ITER_TEST4.new.foo(44){55}
|
2003-09-04 12:18:59 -04:00
|
|
|
end
|
2003-09-29 13:59:03 -04:00
|
|
|
|
|
|
|
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
|
2003-10-15 19:38:10 -04:00
|
|
|
|
|
|
|
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"
|
2003-10-20 04:33:49 -04:00
|
|
|
result = _test_return_trace_func(ok)
|
2003-10-15 19:38:10 -04:00
|
|
|
ensure
|
|
|
|
assert_equal(ok, result)
|
|
|
|
return
|
|
|
|
end
|
2007-01-31 00:54:42 -05:00
|
|
|
|
|
|
|
class IterString < ::String
|
|
|
|
def ===(other)
|
|
|
|
super if !block_given?
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
# Check that the block passed to an iterator
|
|
|
|
# does not get propagated inappropriately
|
|
|
|
def test_block_given_within_iterator
|
|
|
|
assert_equal(["b"], ["a", "b", "c"].grep(IterString.new("b")) {|s| s})
|
|
|
|
end
|
2007-08-08 03:07:03 -04:00
|
|
|
|
|
|
|
def test_enumerator
|
|
|
|
[1,2,3].each.with_index {|x,i|
|
|
|
|
assert_equal(x, i+1)
|
|
|
|
}
|
|
|
|
|
|
|
|
e = [1,2,3].each
|
|
|
|
assert_equal(1, e.next)
|
|
|
|
assert_equal(2, e.next)
|
|
|
|
assert_equal(3, e.next)
|
2008-09-24 13:44:39 -04:00
|
|
|
assert_raise(StopIteration){e.next}
|
2007-08-08 03:07:03 -04:00
|
|
|
e.rewind
|
|
|
|
assert_equal(1, e.next)
|
2007-08-24 06:48:43 -04:00
|
|
|
e.rewind
|
|
|
|
a = []
|
|
|
|
loop{a.push e.next}
|
|
|
|
assert_equal([1,2,3], a)
|
2007-08-08 03:07:03 -04:00
|
|
|
|
2008-02-29 08:44:50 -05:00
|
|
|
assert_equal([[8, 1, 10], [6, 2, 11], [4, 3, 12]],
|
|
|
|
[8,6,4].zip((1..10),(10..100)).to_a)
|
2007-08-08 03:07:03 -04:00
|
|
|
end
|
2003-09-04 12:18:59 -04:00
|
|
|
end
|