diff options
Diffstat (limited to 'bootstraptest')
| -rw-r--r-- | bootstraptest/test_block.rb | 26 | ||||
| -rw-r--r-- | bootstraptest/test_exception.rb | 14 | ||||
| -rw-r--r-- | bootstraptest/test_flow.rb | 2 | ||||
| -rw-r--r-- | bootstraptest/test_jump.rb | 8 | ||||
| -rw-r--r-- | bootstraptest/test_method.rb | 6 | ||||
| -rw-r--r-- | bootstraptest/test_proc.rb | 36 | ||||
| -rw-r--r-- | bootstraptest/test_syntax.rb | 12 |
7 files changed, 52 insertions, 52 deletions
diff --git a/bootstraptest/test_block.rb b/bootstraptest/test_block.rb index ce7f00b033..ea6768cc25 100644 --- a/bootstraptest/test_block.rb +++ b/bootstraptest/test_block.rb @@ -75,7 +75,7 @@ assert_equal %q{[1, 2, 3]}, %q{ } end end - + C.new.to_a } assert_equal %q{[4, 5, 6]}, %q{ @@ -87,7 +87,7 @@ assert_equal %q{[4, 5, 6]}, %q{ } end end - + C.new.map{|e| e + 3 } @@ -110,7 +110,7 @@ assert_equal %q{20}, %q{ def m yield 1 end - + m{|ib| m{|jb| i = 20 @@ -121,7 +121,7 @@ assert_equal %q{2}, %q{ def m yield 1 end - + m{|ib| m{|jb| ib = 20 @@ -135,11 +135,11 @@ assert_equal %q{3}, %q{ yield } end - + def iter2 yield end - + iter1{ jb = 2 iter1{ @@ -154,11 +154,11 @@ assert_equal %q{2}, %q{ yield } end - + def iter2 yield end - + iter1{ jb = 2 iter1{ @@ -226,11 +226,11 @@ assert_equal %q{[10, 20, 30, 40, nil, nil]}, %q{ } assert_equal %q{[1]}, %q{ $a = [] - + def iter yield 1 end - + def m x = iter{|x| $a << x @@ -450,7 +450,7 @@ assert_equal 'ok', %q{ end vs1 = [] C.new.each {|*v| vs1 << v } - vs2 = [] + vs2 = [] C.new.to_enum.each {|*v| vs2 << v } vs1 == vs2 ? :ok : :ng }, '[ruby-dev:32329]' @@ -468,9 +468,9 @@ assert_equal '[nil, []]', %q{ def m() yield nil,[] end l = lambda {|*v| v} GC.stress=true - r = m(&l) + r = m(&l) GC.stress=false - r.inspect + r.inspect }, '[ruby-dev:32567]' assert_equal NilClass.to_s, %q{ diff --git a/bootstraptest/test_exception.rb b/bootstraptest/test_exception.rb index 33154a546d..f7d5eeaa07 100644 --- a/bootstraptest/test_exception.rb +++ b/bootstraptest/test_exception.rb @@ -97,7 +97,7 @@ assert_equal %q{[#<RuntimeError: FOO>, #<RuntimeError: FOO>]}, %q{ def m $! end - + begin begin raise "FOO" @@ -205,11 +205,11 @@ assert_equal %q{3}, %q{ assert_equal %q{ok3}, %q{ class E1 < Exception end - + def m yield end - + begin begin begin @@ -239,7 +239,7 @@ assert_equal %q{7}, %q{ $i += 2 break ensure - + end ensure $i += 4 @@ -247,7 +247,7 @@ assert_equal %q{7}, %q{ $i = 0 } end - + def iter yield end @@ -349,7 +349,7 @@ assert_equal %q{12}, %q{ 7+7 end } -assert_equal %q{ok}, %q{ # +assert_equal %q{ok}, %q{ # proc{ begin raise @@ -376,7 +376,7 @@ assert_match /undefined method `foo\'/, %q{#` def inspect bar {} end - + def bar raise ensure diff --git a/bootstraptest/test_flow.rb b/bootstraptest/test_flow.rb index 84ef216421..02062755aa 100644 --- a/bootstraptest/test_flow.rb +++ b/bootstraptest/test_flow.rb @@ -29,7 +29,7 @@ assert_equal %q{ok}, %q{ end end end - + ('a').lines.map{|e| break :ok } diff --git a/bootstraptest/test_jump.rb b/bootstraptest/test_jump.rb index c53d83591e..595aaa7c4b 100644 --- a/bootstraptest/test_jump.rb +++ b/bootstraptest/test_jump.rb @@ -100,7 +100,7 @@ assert_equal %q{ok}, %q{ def m yield end - + m{ begin ensure @@ -190,7 +190,7 @@ assert_equal %q{100}, %q{ $i = 100 end end - + def iter yield end @@ -216,7 +216,7 @@ assert_equal %q{1}, %q{ return 1 end end - + m } assert_equal %q{1}, %q{ @@ -227,7 +227,7 @@ assert_equal %q{1}, %q{ return 1 end end - + m } assert_equal 'ok', %q{ diff --git a/bootstraptest/test_method.rb b/bootstraptest/test_method.rb index 8d0db6e478..f015efd6d7 100644 --- a/bootstraptest/test_method.rb +++ b/bootstraptest/test_method.rb @@ -914,7 +914,7 @@ assert_equal %q{[:ok, :ok, :ok, :ok, :ok, :ok, :ng, :ng]}, %q{ o1 = c1.new o2 = c2.new - + test{o1.m} test{o2.mm} test{o1.send :m} @@ -1074,7 +1074,7 @@ assert_equal '[1, 2, [3, 4]]', %q{ def regular(a, b, *c) [a, b, c] end - regular(*[], 1, *[], *[2, 3], *[], 4) + regular(*[], 1, *[], *[2, 3], *[], 4) }, '[ruby-core:19413]' assert_equal '[1, [:foo, 3, 4, :foo]]', %q{ @@ -1093,7 +1093,7 @@ assert_equal '["B", "A"]', %q{ end class B < A - define_method(:m) do + define_method(:m) do ['B', super()] end end diff --git a/bootstraptest/test_proc.rb b/bootstraptest/test_proc.rb index 28a23777a3..66acd5a482 100644 --- a/bootstraptest/test_proc.rb +++ b/bootstraptest/test_proc.rb @@ -2,11 +2,11 @@ assert_equal %q{[1, 2, 3]}, %q{ def getproc &b b end - + def m yield end - + m{ i = 1 m{ @@ -24,14 +24,14 @@ assert_equal %q{7}, %q{ def make_proc(&b) b end - + def make_closure a = 0 make_proc{ a+=1 } end - + cl = make_closure cl.call + cl.call * cl.call } @@ -41,7 +41,7 @@ assert_equal %q{ok}, %q{ :ok end end - + def block C.method(:new).to_proc end @@ -52,7 +52,7 @@ assert_equal %q{[0, 1, :last, 0, 2, :last]}, %q{ def proc &b b end - + pr = [] proc{|i_b| p3 = proc{|j_b| @@ -63,18 +63,18 @@ assert_equal %q{[0, 1, :last, 0, 2, :last]}, %q{ p3.call(1) p3.call(2) }.call(0) - + pr[0].call(:last).concat pr[1].call(:last) } assert_equal %q{12}, %q{ def iter yield end - + def getproc &b b end - + iter{ bvar = 3 getproc{ @@ -87,11 +87,11 @@ assert_equal %q{200}, %q{ def iter yield end - + def getproc &b b end - + loc1 = 0 pr1 = iter{ bl1 = 1 @@ -101,7 +101,7 @@ assert_equal %q{200}, %q{ loc1 + bl1 } } - + pr2 = iter{ bl1 = 1 getproc{ @@ -110,7 +110,7 @@ assert_equal %q{200}, %q{ loc1 + bl1 } } - + pr1.call; pr2.call pr1.call; pr2.call pr1.call; pr2.call @@ -120,21 +120,21 @@ assert_equal %q{[1, 2]}, %q{ def proc(&pr) pr end - + def m a = 1 m2{ a } end - + def m2 b = 2 proc{ [yield, b] } end - + pr = m x = ['a', 1,2,3,4,5,6,7,8,9,0, 1,2,3,4,5,6,7,8,9,0, @@ -147,14 +147,14 @@ assert_equal %q{1}, %q{ def proc(&pr) pr end - + def m a = 1 m2{ a } end - + def m2 b = 2 proc{ diff --git a/bootstraptest/test_syntax.rb b/bootstraptest/test_syntax.rb index ae1488353e..ef1c622ace 100644 --- a/bootstraptest/test_syntax.rb +++ b/bootstraptest/test_syntax.rb @@ -110,7 +110,7 @@ assert_equal %q{100}, %q{ end return arg end - + test(100) } assert_equal %q{ok}, %q{ @@ -169,7 +169,7 @@ assert_equal %q{[:false, :false, :false, :false, :false, :false, :false, :false, res end end - + def each_test conds = make_perm(['fv', 'tv'], 3) bangs = make_perm(['', '!'], 3) @@ -184,10 +184,10 @@ assert_equal %q{[:false, :false, :false, :false, :false, :false, :false, :false, } } end - + fv = false tv = true - + $ans = [] each_test{|syn, conds, bangs, exprs| c1, c2, c3 = conds @@ -695,7 +695,7 @@ assert_equal 'ok', %q{ while true counter -= 1 break if counter == 0 - next + next redo end :ok @@ -706,7 +706,7 @@ assert_equal 'ok', %q{ while true counter -= 1 break if counter == 0 - next + next "#{ redo }" end :ok |