Skip to content

Commit 216d1d2

Browse files
committed
Fix Struct subclasses explicitly inherited and don't provide #members method
1 parent 87fe4ae commit 216d1d2

File tree

5 files changed

+26
-4
lines changed

5 files changed

+26
-4
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ Compatibility:
1212
* Support String patterns in `StringScanner#{exist?,scan_until,skip_until,check_until,search_full}` methods (@andrykonchin).
1313
* Implement `ObjectSpace::WeakKeyMap` (#3681, @andrykonchin).
1414
* Fix `String#slice` called with negative offset (@andrykonchin).
15+
* Fix explicitly inherited `Struct` subclasses and don't provide `#members` method (#3802, @andrykonchin).
1516

1617
Performance:
1718

spec/ruby/core/struct/fixtures/classes.rb

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,4 +29,6 @@ def initialize(*)
2929
super
3030
end
3131
end
32+
33+
class StructSubclass < Struct; end
3234
end

spec/ruby/core/struct/keyword_init_spec.rb

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
require_relative '../../spec_helper'
2+
require_relative 'fixtures/classes'
23

34
ruby_version_is "3.1" do
45
# See https://bugs.ruby-lang.org/issues/18008
@@ -36,5 +37,11 @@
3637
struct = Struct.new(:arg, keyword_init: {})
3738
struct.keyword_init?.should be_true
3839
end
40+
41+
context "class inheriting Struct" do
42+
it "isn't available in a subclass" do
43+
StructClasses::StructSubclass.should_not.respond_to?(:keyword_init?)
44+
end
45+
end
3946
end
4047
end

spec/ruby/core/struct/members_spec.rb

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,15 @@
1111

1212
it_behaves_like :struct_accessor, :members
1313
end
14+
15+
describe "StructClass#members" do
16+
it "returns an array of attribute names" do
17+
StructClasses::Car.members.should == [:make, :model, :year]
18+
end
19+
20+
context "class inheriting Struct" do
21+
it "isn't available in a subclass" do
22+
StructClasses::StructSubclass.should_not.respond_to?(:members)
23+
end
24+
end
25+
end

src/main/ruby/truffleruby/core/struct.rb

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,10 @@ def self.keyword_init?
8181
return nil if Primitive.nil?(self::KEYWORD_INIT)
8282
Primitive.as_boolean(self::KEYWORD_INIT)
8383
end
84+
85+
def self.members
86+
self::STRUCT_ATTRS.dup
87+
end
8488
end
8589

8690
const_set klass_name, klass if klass_name
@@ -318,10 +322,6 @@ def self.length
318322
self::STRUCT_ATTRS.size
319323
end
320324

321-
def self.members
322-
self::STRUCT_ATTRS.dup
323-
end
324-
325325
def members
326326
Primitive.class(self).members
327327
end

0 commit comments

Comments
 (0)