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

* test/ruby/test_yield.rb (TestYieldGen): add test for yielding to

Browse source 
lambda using lambda parameter passing emulator.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@13087 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
akr 2007-08-18 03:44:28 +00:00
parent 6355e16257
commit f62fff5f41
3 changed files with 55 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Sat Aug 18 12:42:50 2007 Tanaka Akira <akr@fsij.org>
* test/ruby/test_yield.rb (TestYieldGen): add test for yielding to
lambda using lambda parameter passing emulator.
Sat Aug 18 12:24:30 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
* sample/test.rb, test/ruby/test_system.rb(valid_syntax?): keep

1
test/ruby/test_assignment.rb
View file

@ -636,7 +636,6 @@ class TestAssignmentGen < Test::Unit::TestCase
lopen = lhs.any? {|e| e == '*' || e == ',' }
ropen = rhs.any? {|e| e == '*' || e == ',' }
lhs = extract_single_element(lhs) if !lopen
rhs = ["(",rhs,")"] if ropen
begin
rv = eval((ropen ? ["[",assign[2],"]"] : assign[2]).join(''))
rescue Exception

69
test/ruby/test_yield.rb
View file

@ -154,7 +154,8 @@ class TestRubyYieldGen < Test::Unit::TestCase
[]],
:block_arg => [['&', :arg]],
#:test => [['def m() yield', :command_args_noblock, ' end; r = m {', :block_param_def, 'vars', '}; undef m; r']]
:test => [['def m() yield', :command_args_noblock, ' end; r = m {', :block_param_def, 'vars', '}; undef m; r']]
:test_proc => [['def m() yield', :command_args_noblock, ' end; r = m {', :block_param_def, 'vars', '}; undef m; r']],
:test_lambda => [['def m() yield', :command_args_noblock, ' end; r = m(&lambda {', :block_param_def, 'vars', '}); undef m; r']]
}
def rename_var(obj)
@ -192,20 +193,20 @@ class TestRubyYieldGen < Test::Unit::TestCase
eval code
end
def emu_bind_single(arg, param, result_binding)
def emu_bind_single(arg, param, islambda, result_binding)
#p [:emu_bind_single, arg, param]
if param.length == 1 && String === param[0] && /\A[a-z0-9]+\z/ =~ param[0]
result_binding[param[0]] = arg
elsif param.length == 1 && Array === param[0] && param[0][0] == '(' && param[0][-1] == ')'
arg = [arg] unless Array === arg
emu_bind_params(arg, split_by_comma(param[0][1...-1]), result_binding)
emu_bind_params(arg, split_by_comma(param[0][1...-1]), islambda, result_binding)
else
raise "unexpected param: #{param.inspect}"
end
result_binding
end
def emu_bind_params(args, params, result_binding={})
def emu_bind_params(args, params, islambda, result_binding={})
#p [:emu_bind_params, args, params]
if params.last == [] # extra comma
params.pop
@ -216,23 +217,35 @@ class TestRubyYieldGen < Test::Unit::TestCase
star_index = i if par[0] == '*'
}
if islambda
if star_index
if args.length < params.length - 1
throw :argumenterror, ArgumentError
end
else
if args.length != params.length
throw :argumenterror, ArgumentError
end
end
end
# TRICK #2 : adjust mismatch on number of arguments
if star_index
pre_params = params[0...star_index]
rest_param = params[star_index]
post_params = params[(star_index+1)..-1]
pre_params.each {|par| emu_bind_single(args.shift, par, result_binding) }
pre_params.each {|par| emu_bind_single(args.shift, par, islambda, result_binding) }
if post_params.length <= args.length
post_params.reverse_each {|par| emu_bind_single(args.pop, par, result_binding) }
post_params.reverse_each {|par| emu_bind_single(args.pop, par, islambda, result_binding) }
else
post_params.each {|par| emu_bind_single(args.shift, par, result_binding) }
post_params.each {|par| emu_bind_single(args.shift, par, islambda, result_binding) }
end
if rest_param != ['*']
emu_bind_single(args, rest_param[1..-1], result_binding)
emu_bind_single(args, rest_param[1..-1], islambda, result_binding)
end
else
params.each_with_index {|par, i|
emu_bind_single(args[i], par, result_binding)
emu_bind_single(args[i], par, islambda, result_binding)
}
end
@ -241,7 +254,7 @@ class TestRubyYieldGen < Test::Unit::TestCase
result_binding
end
def emu(t)
def emu(t, islambda)
#puts
#p t
command_args_noblock = t[1]
@ -270,25 +283,35 @@ class TestRubyYieldGen < Test::Unit::TestCase
params.pop
end
# TRICK #1 : single array argument is expanded if there are two or more params.
if args.length == 1 && Array === args[0] && 1 < params.length
args = args[0]
if !islambda
# TRICK #1 : single array argument is expanded if there are two or more params.
# * block parameter is not counted.
# * extra comma after single param forces the expansion.
if args.length == 1 && Array === args[0] && 1 < params.length
args = args[0]
end
end
emu_bind_params(args, params, result_binding)
emu_bind_params(args, params, islambda, result_binding)
#p result_binding
result_binding
end
def check_nofork(t)
def check_nofork(t, islambda=false)
t, vars = rename_var(t)
t = t.subst('vars') { " [#{vars.join(",")}]" }
emu_binding = emu(t)
emu_values = vars.map {|var| emu_binding.fetch(var, "NOVAL") }
emu_values = catch(:argumenterror) {
emu_binding = emu(t, islambda)
vars.map {|var| emu_binding.fetch(var, "NOVAL") }
}
s = t.to_s
#print "#{s}\t\t"
#STDOUT.flush
eval_values = eval(s)
begin
eval_values = eval(s)
rescue ArgumentError
eval_values = ArgumentError
end
#success = emu_values == eval_values ? 'succ' : 'fail'
#puts "eval:#{vs_ev.inspect[1...-1].delete(' ')}\temu:#{vs_emu.inspect[1...-1].delete(' ')}\t#{success}"
assert_equal(emu_values, eval_values, s)
@ -296,8 +319,16 @@ class TestRubyYieldGen < Test::Unit::TestCase
def test_yield
syntax = Sentence::Gen.expand_syntax(Syntax)
Sentence.each(syntax, :test, 4) {|t|
Sentence.each(syntax, :test_proc, 4) {|t|
check_nofork(t)
}
end
def test_yield_lambda
syntax = Sentence::Gen.expand_syntax(Syntax)
Sentence.each(syntax, :test_lambda, 4) {|t|
check_nofork(t, true)
}
end
end