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

* parse.y (new_yield): remove magic argument rule; "yield [1,2]"

Browse source 
should yield single array of two elements, not two values.
  [ruby-dev:21726]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@4848 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
matz 2003-10-28 02:27:06 +00:00
parent ed5208d851
commit a1096ba77c
5 changed files with 63 additions and 72 deletions
Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
Tue Oct 28 11:24:18 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
* parse.y (new_yield): remove magic argument rule; "yield [1,2]"
should yield single array of two elements, not two values.
[ruby-dev:21726]
Mon Oct 27 19:19:55 2003 Nobuyoshi Nakada <nobu@ruby-lang.org> Mon Oct 27 19:19:55 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
* eval.c (rb_longjmp): ignore reentering error while warning. * eval.c (rb_longjmp): ignore reentering error while warning.

17
parse.y
View file

@ -5377,22 +5377,7 @@ static NODE *
new_yield(node) new_yield(node)
NODE *node; NODE *node;
{ {
long state = Qtrue; return NEW_YIELD(node, node ? Qtrue : Qfalse);
if (node) {
no_blockarg(node);
if (nd_type(node) == NODE_ARRAY && node->nd_next == 0) {
node = node->nd_head;
state = Qfalse;
}
if (nd_type(node) == NODE_SPLAT) {
state = Qtrue;
}
}
else {
state = Qfalse;
}
return NEW_YIELD(node, state);
} }
static NODE* static NODE*

14
sample/test.rb
View file

@ -151,13 +151,13 @@ def f; yield *[*[1,2]]; end; f {|*a| test_ok(a == [1,2])}
def f; yield; end; f {|a,b,*c| test_ok([a,b,c] == [nil,nil,[]])} def f; yield; end; f {|a,b,*c| test_ok([a,b,c] == [nil,nil,[]])}
def f; yield nil; end; f {|a,b,*c| test_ok([a,b,c] == [nil,nil,[]])} def f; yield nil; end; f {|a,b,*c| test_ok([a,b,c] == [nil,nil,[]])}
def f; yield 1; end; f {|a,b,*c| test_ok([a,b,c] == [1,nil,[]])} def f; yield 1; end; f {|a,b,*c| test_ok([a,b,c] == [1,nil,[]])}
def f; yield []; end; f {|a,b,*c| test_ok([a,b,c] == [nil,nil,[]])} def f; yield []; end; f {|a,b,*c| test_ok([a,b,c] == [[],nil,[]])}
def f; yield [1]; end; f {|a,b,*c| test_ok([a,b,c] == [1,nil,[]])} def f; yield [1]; end; f {|a,b,*c| test_ok([a,b,c] == [[1],nil,[]])}
def f; yield [nil]; end; f {|a,b,*c| test_ok([a,b,c] == [nil,nil,[]])} def f; yield [nil]; end; f {|a,b,*c| test_ok([a,b,c] == [[nil],nil,[]])}
def f; yield [[]]; end; f {|a,b,*c| test_ok([a,b,c] == [[],nil,[]])} def f; yield [[]]; end; f {|a,b,*c| test_ok([a,b,c] == [[[]],nil,[]])}
def f; yield [*[]]; end; f {|a,b,*c| test_ok([a,b,c] == [nil,nil,[]])} def f; yield [*[]]; end; f {|a,b,*c| test_ok([a,b,c] == [[],nil,[]])}
def f; yield [*[1]]; end; f {|a,b,*c| test_ok([a,b,c] == [1,nil,[]])} def f; yield [*[1]]; end; f {|a,b,*c| test_ok([a,b,c] == [[1],nil,[]])}
def f; yield [*[1,2]]; end; f {|a,b,*c| test_ok([a,b,c] == [1,2,[]])} def f; yield [*[1,2]]; end; f {|a,b,*c| test_ok([a,b,c] == [[1,2],nil,[]])}
def f; yield *nil; end; f {|a,b,*c| test_ok([a,b,c] == [nil,nil,[]])} def f; yield *nil; end; f {|a,b,*c| test_ok([a,b,c] == [nil,nil,[]])}
def f; yield *1; end; f {|a,b,*c| test_ok([a,b,c] == [1,nil,[]])} def f; yield *1; end; f {|a,b,*c| test_ok([a,b,c] == [1,nil,[]])}

14
test/ruby/test_assignment.rb
View file

@ -130,13 +130,13 @@ class TestAssignment < Test::Unit::TestCase
def f; yield; end; f {|a,b,*c| assert_equal([nil,nil,[]], [a,b,c])} def f; yield; end; f {|a,b,*c| assert_equal([nil,nil,[]], [a,b,c])}
def f; yield nil; end; f {|a,b,*c| assert_equal([nil,nil,[]], [a,b,c])} def f; yield nil; end; f {|a,b,*c| assert_equal([nil,nil,[]], [a,b,c])}
def f; yield 1; end; f {|a,b,*c| assert_equal([1,nil,[]], [a,b,c])} def f; yield 1; end; f {|a,b,*c| assert_equal([1,nil,[]], [a,b,c])}
def f; yield []; end; f {|a,b,*c| assert_equal([nil,nil,[]], [a,b,c])} def f; yield []; end; f {|a,b,*c| assert_equal([[],nil,[]], [a,b,c])}
def f; yield [1]; end; f {|a,b,*c| assert_equal([1,nil,[]], [a,b,c])} def f; yield [1]; end; f {|a,b,*c| assert_equal([[1],nil,[]], [a,b,c])}
def f; yield [nil]; end; f {|a,b,*c| assert_equal([nil,nil,[]], [a,b,c])} def f; yield [nil]; end; f {|a,b,*c| assert_equal([[nil],nil,[]], [a,b,c])}
def f; yield [[]]; end; f {|a,b,*c| assert_equal([[],nil,[]], [a,b,c])} def f; yield [[]]; end; f {|a,b,*c| assert_equal([[[]],nil,[]], [a,b,c])}
def f; yield [*[]]; end; f {|a,b,*c| assert_equal([nil,nil,[]], [a,b,c])} def f; yield [*[]]; end; f {|a,b,*c| assert_equal([[],nil,[]], [a,b,c])}
def f; yield [*[1]]; end; f {|a,b,*c| assert_equal([1,nil,[]], [a,b,c])} def f; yield [*[1]]; end; f {|a,b,*c| assert_equal([[1],nil,[]], [a,b,c])}
def f; yield [*[1,2]]; end; f {|a,b,*c| assert_equal([1,2,[]], [a,b,c])} def f; yield [*[1,2]]; end; f {|a,b,*c| assert_equal([[1,2],nil,[]], [a,b,c])}
def f; yield *nil; end; f {|a,b,*c| assert_equal([nil,nil,[]], [a,b,c])} def f; yield *nil; end; f {|a,b,*c| assert_equal([nil,nil,[]], [a,b,c])}
def f; yield *1; end; f {|a,b,*c| assert_equal([1,nil,[]], [a,b,c])} def f; yield *1; end; f {|a,b,*c| assert_equal([1,nil,[]], [a,b,c])}

84
test/ruby/test_hash.rb
View file

@ -4,13 +4,13 @@ $KCODE = 'none'
class TestHash < Test::Unit::TestCase class TestHash < Test::Unit::TestCase
def test_hash def test_hash
$x = {1=>2, 2=>4, 3=>6} x = {1=>2, 2=>4, 3=>6}
$y = {1, 2, 2, 4, 3, 6} y = {1, 2, 2, 4, 3, 6}
assert_equal(2, $x[1]) assert_equal(2, x[1])
assert(begin assert(begin
for k,v in $y for k,v in y
raise if k*2 != v raise if k*2 != v
end end
true true
@ -18,59 +18,59 @@ class TestHash < Test::Unit::TestCase
false false
end) end)
assert_equal(3, $x.length) assert_equal(3, x.length)
assert($x.has_key?(1)) assert(x.has_key?(1))
assert($x.has_value?(4)) assert(x.has_value?(4))
assert_equal([4,6], $x.values_at(2,3)) assert_equal([4,6], x.values_at(2,3))
assert_equal({1=>2, 2=>4, 3=>6}, $x) assert_equal({1=>2, 2=>4, 3=>6}, x)
$z = $y.keys.join(":") z = y.keys.join(":")
assert_equal("1:2:3", $z) assert_equal("1:2:3", z)
$z = $y.values.join(":") z = y.values.join(":")
assert_equal("2:4:6", $z) assert_equal("2:4:6", z)
assert_equal($x, $y) assert_equal(x, y)
$y.shift y.shift
assert_equal(2, $y.length) assert_equal(2, y.length)
$z = [1,2] z = [1,2]
$y[$z] = 256 y[z] = 256
assert_equal(256, $y[$z]) assert_equal(256, y[z])
$x = Hash.new(0) x = Hash.new(0)
$x[1] = 1 x[1] = 1
assert_equal(1, $x[1]) assert_equal(1, x[1])
assert_equal(0, $x[2]) assert_equal(0, x[2])
$x = Hash.new([]) x = Hash.new([])
assert_equal([], $x[22]) assert_equal([], x[22])
assert_same($x[22], $x[22]) assert_same(x[22], x[22])
$x = Hash.new{[]} x = Hash.new{[]}
assert_equal([], $x[22]) assert_equal([], x[22])
assert_not_same($x[22], $x[22]) assert_not_same(x[22], x[22])
$x = Hash.new{|h,k| $z = k; h[k] = k*2} x = Hash.new{|h,k| z = k; h[k] = k*2}
$z = 0 z = 0
assert_equal(44, $x[22]) assert_equal(44, x[22])
assert_equal(22, $z) assert_equal(22, z)
$z = 0 z = 0
assert_equal(44, $x[22]) assert_equal(44, x[22])
assert_equal(0, $z) assert_equal(0, z)
$x.default = 5 x.default = 5
assert_equal(5, $x[23]) assert_equal(5, x[23])
$x = Hash.new x = Hash.new
def $x.default(k) def x.default(k)
$z = k $z = k
self[k] = k*2 self[k] = k*2
end end
$z = 0 $z = 0
assert_equal(44, $x[22]) assert_equal(44, x[22])
assert_equal(22, $z) assert_equal(22, $z)
$z = 0 $z = 0
assert_equal(44, $x[22]) assert_equal(44, x[22])
assert_equal(0, $z) assert_equal(0, $z)
end end
end end