diff --git a/internal/vm/struct.go b/internal/vm/struct.go index db8a8a52..ebba0da2 100644 --- a/internal/vm/struct.go +++ b/internal/vm/struct.go @@ -114,6 +114,19 @@ func setupStruct(vm *VM) { names[i] = nm } sub := vm.newStructClass(base, names, kwInit) + // keyword_init? is a class method of each minted subclass (never of Struct + // itself): true / false when keyword_init: was given, nil when it was omitted. + sub.smethods["keyword_init?"] = &Method{name: "keyword_init?", owner: sub, + native: func(_ *VM, self object.Value, _ []object.Value, _ *Proc) object.Value { + switch structDefOf(self.(*RClass)).kwInit { + case kwTrue: + return object.True + case kwFalse: + return object.False + default: + return object.NilV + } + }} if haveName && name != "" { if !validConstName(name) { raise("NameError", "identifier %s needs to be constant", name) diff --git a/internal/vm/struct_kwinit_test.go b/internal/vm/struct_kwinit_test.go index 43d2a474..9494b183 100644 --- a/internal/vm/struct_kwinit_test.go +++ b/internal/vm/struct_kwinit_test.go @@ -33,3 +33,20 @@ func TestStructKeywordInit(t *testing.T) { } } } + +// TestStructKeywordInitPredicate covers Struct#keyword_init? — the tri-state +// class method (nil when omitted, true / false when given), inherited by a +// subclass. Asserted against MRI Ruby 4.0.6. +func TestStructKeywordInitPredicate(t *testing.T) { + cases := []struct{ src, want string }{ + {`p Struct.new(:a, :b).keyword_init?`, "nil\n"}, + {`p Struct.new(:a, keyword_init: true).keyword_init?`, "true\n"}, + {`p Struct.new(:a, keyword_init: false).keyword_init?`, "false\n"}, + {`class KSub < Struct.new(:a, keyword_init: true); end; p KSub.keyword_init?`, "true\n"}, + } + for _, c := range cases { + if got := eval(t, c.src); got != c.want { + t.Errorf("src=%q got=%q want=%q", c.src, got, c.want) + } + } +} diff --git a/scripts/conformance/rubyspec/FLOOR b/scripts/conformance/rubyspec/FLOOR index b99d6b80..128cbc3a 100644 --- a/scripts/conformance/rubyspec/FLOOR +++ b/scripts/conformance/rubyspec/FLOOR @@ -1 +1 @@ -15840 +15850