mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
65651b34b1
This avoids O(n) on lookups with structs over 10 members. This also avoids O(n) behavior on all assignments on Struct members. Members 0..9 still use existing C methods to read in O(1) time Benchmark results: vm2_struct_big_aref_hi* 1.305 vm2_struct_big_aref_lo* 1.157 vm2_struct_big_aset* 3.306 vm2_struct_small_aref* 1.015 vm2_struct_small_aset* 3.273 Note: I chose use loading instructions from an array instead of writing directly to linked-lists in compile.c for ease-of-maintainability. We may move the method definitions to prelude.rb-like files in the future. I have also tested this patch with the following patch to disable the C ref_func methods and ensured the test suite and rubyspec works --- a/struct.c +++ b/struct.c @@ -209,7 +209,7 @@ setup_struct(VALUE nstr, VALUE members) ID id = SYM2ID(ptr_members[i]); VALUE off = LONG2NUM(i); - if (i < N_REF_FUNC) { + if (0 && i < N_REF_FUNC) { rb_define_method_id(nstr, id, ref_func[i], 0); } else { * iseq.c (rb_method_for_self_aref, rb_method_for_self_aset): new methods to generate bytecode for struct.c [Feature #10575] * struct.c (rb_struct_ref, rb_struct_set): remove (define_aref_method, define_aset_method): new functions (setup_struct): use new functions * test/ruby/test_struct.rb: add test for struct >10 members * benchmark/bm_vm2_struct_big_aref_hi.rb: new benchmark * benchmark/bm_vm2_struct_big_aref_lo.rb: ditto * benchmark/bm_vm2_struct_big_aset.rb: ditto * benchmark/bm_vm2_struct_small_aref.rb: ditto * benchmark/bm_vm2_struct_small_aset.rb: ditto git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@48748 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
341 lines
8.2 KiB
Ruby
341 lines
8.2 KiB
Ruby
# -*- coding: us-ascii -*-
|
|
require 'test/unit'
|
|
require 'timeout'
|
|
|
|
module TestStruct
|
|
def test_struct
|
|
struct_test = @Struct.new("Test", :foo, :bar)
|
|
assert_equal(@Struct::Test, struct_test)
|
|
|
|
test = struct_test.new(1, 2)
|
|
assert_equal(1, test.foo)
|
|
assert_equal(2, test.bar)
|
|
assert_equal(1, test[0])
|
|
assert_equal(2, test[1])
|
|
|
|
a, b = test.to_a
|
|
assert_equal(1, a)
|
|
assert_equal(2, b)
|
|
|
|
test[0] = 22
|
|
assert_equal(22, test.foo)
|
|
|
|
test.bar = 47
|
|
assert_equal(47, test.bar)
|
|
end
|
|
|
|
# [ruby-dev:26247] more than 10 struct members causes segmentation fault
|
|
def test_morethan10members
|
|
list = %w( a b c d e f g h i j k l m n o p )
|
|
until list.empty?
|
|
c = @Struct.new(* list.map {|ch| ch.intern }).new
|
|
list.each do |ch|
|
|
c.__send__(ch)
|
|
end
|
|
list.pop
|
|
end
|
|
end
|
|
|
|
def test_small_structs
|
|
names = [:a, :b, :c, :d]
|
|
1.upto(4) {|n|
|
|
fields = names[0, n]
|
|
klass = @Struct.new(*fields)
|
|
o = klass.new(*(0...n).to_a)
|
|
fields.each_with_index {|name, i|
|
|
assert_equal(i, o[name])
|
|
}
|
|
o = klass.new(*(0...n).to_a.reverse)
|
|
fields.each_with_index {|name, i|
|
|
assert_equal(n-i-1, o[name])
|
|
}
|
|
}
|
|
end
|
|
|
|
def test_inherit
|
|
klass = @Struct.new(:a)
|
|
klass2 = Class.new(klass)
|
|
o = klass2.new(1)
|
|
assert_equal(1, o.a)
|
|
end
|
|
|
|
def test_members
|
|
klass = @Struct.new(:a)
|
|
o = klass.new(1)
|
|
assert_equal([:a], klass.members)
|
|
assert_equal([:a], o.members)
|
|
end
|
|
|
|
def test_ref
|
|
klass = @Struct.new(:a)
|
|
o = klass.new(1)
|
|
assert_equal(1, o[:a])
|
|
assert_raise(NameError) { o[:b] }
|
|
end
|
|
|
|
def test_set
|
|
klass = @Struct.new(:a)
|
|
o = klass.new(1)
|
|
o[:a] = 2
|
|
assert_equal(2, o[:a])
|
|
assert_raise(NameError) { o[:b] = 3 }
|
|
end
|
|
|
|
def test_struct_new
|
|
assert_raise(NameError) { @Struct.new("foo") }
|
|
assert_nothing_raised { @Struct.new("Foo") }
|
|
@Struct.instance_eval { remove_const(:Foo) }
|
|
assert_nothing_raised { @Struct.new(:a) { } }
|
|
assert_raise(RuntimeError) { @Struct.new(:a) { raise } }
|
|
|
|
assert_equal([:utime, :stime, :cutime, :cstime], Process.times.members)
|
|
end
|
|
|
|
def test_initialize
|
|
klass = @Struct.new(:a)
|
|
assert_raise(ArgumentError) { klass.new(1, 2) }
|
|
end
|
|
|
|
def test_each
|
|
klass = @Struct.new(:a, :b)
|
|
o = klass.new(1, 2)
|
|
assert_equal([1, 2], o.each.to_a)
|
|
end
|
|
|
|
def test_each_pair
|
|
klass = @Struct.new(:a, :b)
|
|
o = klass.new(1, 2)
|
|
assert_equal([[:a, 1], [:b, 2]], o.each_pair.to_a)
|
|
bug7382 = '[ruby-dev:46533]'
|
|
a = []
|
|
o.each_pair {|x| a << x}
|
|
assert_equal([[:a, 1], [:b, 2]], a, bug7382)
|
|
end
|
|
|
|
def test_inspect
|
|
klass = @Struct.new(:a)
|
|
o = klass.new(1)
|
|
assert_equal("#<struct a=1>", o.inspect)
|
|
o.a = o
|
|
assert_match(/^#<struct a=#<struct #<.*?>:...>>$/, o.inspect)
|
|
|
|
@Struct.new("Foo", :a)
|
|
o = @Struct::Foo.new(1)
|
|
assert_equal("#<struct #@Struct::Foo a=1>", o.inspect)
|
|
@Struct.instance_eval { remove_const(:Foo) }
|
|
|
|
klass = @Struct.new(:a, :b)
|
|
o = klass.new(1, 2)
|
|
assert_equal("#<struct a=1, b=2>", o.inspect)
|
|
|
|
klass = @Struct.new(:@a)
|
|
o = klass.new(1)
|
|
assert_equal(1, o.__send__(:@a))
|
|
assert_equal("#<struct :@a=1>", o.inspect)
|
|
o.__send__(:"@a=", 2)
|
|
assert_equal(2, o.__send__(:@a))
|
|
assert_equal("#<struct :@a=2>", o.inspect)
|
|
o.__send__("@a=", 3)
|
|
assert_equal(3, o.__send__(:@a))
|
|
assert_equal("#<struct :@a=3>", o.inspect)
|
|
|
|
methods = klass.instance_methods(false)
|
|
assert_equal([:@a, :"@a="].inspect, methods.inspect, '[Bug #8756]')
|
|
assert_include(methods, :@a)
|
|
assert_include(methods, :"@a=")
|
|
end
|
|
|
|
def test_init_copy
|
|
klass = @Struct.new(:a)
|
|
o = klass.new(1)
|
|
assert_equal(o, o.dup)
|
|
end
|
|
|
|
def test_aref
|
|
klass = @Struct.new(:a)
|
|
o = klass.new(1)
|
|
assert_equal(1, o[0])
|
|
assert_raise(IndexError) { o[-2] }
|
|
assert_raise(IndexError) { o[1] }
|
|
assert_raise_with_message(NameError, /foo/) {o["foo"]}
|
|
assert_raise_with_message(NameError, /foo/) {o[:foo]}
|
|
end
|
|
|
|
def test_aset
|
|
klass = @Struct.new(:a)
|
|
o = klass.new(1)
|
|
o[0] = 2
|
|
assert_equal(2, o[:a])
|
|
assert_raise(IndexError) { o[-2] = 3 }
|
|
assert_raise(IndexError) { o[1] = 3 }
|
|
assert_raise_with_message(NameError, /foo/) {o["foo"] = 3}
|
|
assert_raise_with_message(NameError, /foo/) {o[:foo] = 3}
|
|
end
|
|
|
|
def test_values_at
|
|
klass = @Struct.new(:a, :b, :c, :d, :e, :f)
|
|
o = klass.new(1, 2, 3, 4, 5, 6)
|
|
assert_equal([2, 4, 6], o.values_at(1, 3, 5))
|
|
assert_equal([2, 3, 4, 3, 4, 5], o.values_at(1..3, 2...5))
|
|
end
|
|
|
|
def test_select
|
|
klass = @Struct.new(:a, :b, :c, :d, :e, :f)
|
|
o = klass.new(1, 2, 3, 4, 5, 6)
|
|
assert_equal([1, 3, 5], o.select {|v| v % 2 != 0 })
|
|
assert_raise(ArgumentError) { o.select(1) }
|
|
end
|
|
|
|
def test_big_struct
|
|
klass1 = @Struct.new(*('a'..'z').map(&:to_sym))
|
|
o = klass1.new
|
|
assert_nil o.z
|
|
assert_equal(:foo, o.z = :foo)
|
|
assert_equal(:foo, o.z)
|
|
assert_equal(:foo, o[25])
|
|
end
|
|
|
|
def test_equal
|
|
klass1 = @Struct.new(:a)
|
|
klass2 = @Struct.new(:a, :b)
|
|
o1 = klass1.new(1)
|
|
o2 = klass1.new(1)
|
|
o3 = klass2.new(1)
|
|
assert_equal(o1, o2)
|
|
assert_not_equal(o1, o3)
|
|
end
|
|
|
|
def test_hash
|
|
klass = @Struct.new(:a)
|
|
o = klass.new(1)
|
|
assert_kind_of(Fixnum, o.hash)
|
|
end
|
|
|
|
def test_eql
|
|
klass1 = @Struct.new(:a)
|
|
klass2 = @Struct.new(:a, :b)
|
|
o1 = klass1.new(1)
|
|
o2 = klass1.new(1)
|
|
o3 = klass2.new(1)
|
|
assert_operator(o1, :eql?, o2)
|
|
assert_not_operator(o1, :eql?, o3)
|
|
end
|
|
|
|
def test_size
|
|
klass = @Struct.new(:a)
|
|
o = klass.new(1)
|
|
assert_equal(1, o.size)
|
|
end
|
|
|
|
def test_error
|
|
assert_raise(TypeError){
|
|
@Struct.new(0)
|
|
}
|
|
end
|
|
|
|
def test_redefinition_warning
|
|
@Struct.new("RedefinitionWarning")
|
|
e = EnvUtil.verbose_warning do
|
|
@Struct.new("RedefinitionWarning")
|
|
end
|
|
assert_match(/redefining constant #@Struct::RedefinitionWarning/, e)
|
|
end
|
|
|
|
def test_nonascii
|
|
struct_test = @Struct.new("R\u{e9}sum\u{e9}", :"r\u{e9}sum\u{e9}")
|
|
assert_equal(@Struct.const_get("R\u{e9}sum\u{e9}"), struct_test, '[ruby-core:24849]')
|
|
a = struct_test.new(42)
|
|
assert_equal("#<struct #@Struct::R\u{e9}sum\u{e9} r\u{e9}sum\u{e9}=42>", a.inspect, '[ruby-core:24849]')
|
|
e = EnvUtil.verbose_warning do
|
|
@Struct.new("R\u{e9}sum\u{e9}", :"r\u{e9}sum\u{e9}")
|
|
end
|
|
assert_nothing_raised(Encoding::CompatibilityError) do
|
|
assert_match(/redefining constant #@Struct::R\u{e9}sum\u{e9}/, e)
|
|
end
|
|
end
|
|
|
|
def test_junk
|
|
struct_test = @Struct.new("Foo", "a\000")
|
|
o = struct_test.new(1)
|
|
assert_equal(1, o.send("a\000"))
|
|
@Struct.instance_eval { remove_const(:Foo) }
|
|
end
|
|
|
|
def test_comparison_when_recursive
|
|
klass1 = @Struct.new(:a, :b, :c)
|
|
|
|
x = klass1.new(1, 2, nil); x.c = x
|
|
y = klass1.new(1, 2, nil); y.c = y
|
|
Timeout.timeout(1) {
|
|
assert_equal x, y
|
|
assert_operator x, :eql?, y
|
|
}
|
|
|
|
z = klass1.new(:something, :other, nil); z.c = z
|
|
Timeout.timeout(1) {
|
|
assert_not_equal x, z
|
|
assert_not_operator x, :eql?, z
|
|
}
|
|
|
|
x.c = y; y.c = x
|
|
Timeout.timeout(1) {
|
|
assert_equal x, y
|
|
assert_operator x, :eql?, y
|
|
}
|
|
|
|
x.c = z; z.c = x
|
|
Timeout.timeout(1) {
|
|
assert_not_equal x, z
|
|
assert_not_operator x, :eql?, z
|
|
}
|
|
end
|
|
|
|
def test_to_h
|
|
klass = @Struct.new(:a, :b, :c, :d, :e, :f)
|
|
o = klass.new(1, 2, 3, 4, 5, 6)
|
|
assert_equal({a:1, b:2, c:3, d:4, e:5, f:6}, o.to_h)
|
|
end
|
|
|
|
def test_question_mark_in_member
|
|
klass = @Struct.new(:a, :b?)
|
|
x = Object.new
|
|
o = klass.new("test", x)
|
|
assert_same(x, o.b?)
|
|
o.send("b?=", 42)
|
|
assert_equal(42, o.b?)
|
|
end
|
|
|
|
def test_bang_mark_in_member
|
|
klass = @Struct.new(:a, :b!)
|
|
x = Object.new
|
|
o = klass.new("test", x)
|
|
assert_same(x, o.b!)
|
|
o.send("b!=", 42)
|
|
assert_equal(42, o.b!)
|
|
end
|
|
|
|
def test_setter_method_returns_value
|
|
klass = @Struct.new(:a)
|
|
x = klass.new
|
|
assert_equal "[Bug #9353]", x.send(:a=, "[Bug #9353]")
|
|
end
|
|
|
|
class TopStruct < Test::Unit::TestCase
|
|
include TestStruct
|
|
|
|
def initialize(*)
|
|
super
|
|
@Struct = Struct
|
|
end
|
|
end
|
|
|
|
class SubStruct < Test::Unit::TestCase
|
|
include TestStruct
|
|
SubStruct = Class.new(Struct)
|
|
|
|
def initialize(*)
|
|
super
|
|
@Struct = SubStruct
|
|
end
|
|
end
|
|
end
|