Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions internal/vm/builtins.go
Original file line number Diff line number Diff line change
Expand Up @@ -4226,6 +4226,14 @@ func (vm *VM) bootstrap() {
})
vm.cRange.define("member?", rangeCover)
vm.cRange.define("===", rangeCover)
// Range#overlap?(other) reports whether the two ranges share any element.
vm.cRange.define("overlap?", func(vm *VM, self object.Value, args []object.Value, _ *Proc) object.Value {
o, ok := args[0].(*object.Range)
if !ok {
raise("TypeError", "wrong argument type %s (expected Range)", vm.classOf(args[0]).name)
}
return object.Bool(rangeOverlap(self.(*object.Range), o))
})
vm.cRange.define("min", func(vm *VM, self object.Value, args []object.Value, blk *Proc) object.Value {
r := self.(*object.Range)
if len(args) > 0 { // min(n): the n smallest (the range is ascending)
Expand Down
40 changes: 40 additions & 0 deletions internal/vm/range_edges.go
Original file line number Diff line number Diff line change
Expand Up @@ -230,3 +230,43 @@ func rangeSizeFloatEnd(lo, hf float64, excl bool) object.Value {
}
return object.IntValue(int64(math.Floor(diff)) + 1)
}

// rangeOverlap implements Range#overlap? — whether self and o share at least one
// element. It mirrors MRI's range_overlap: the ranges are disjoint when one's
// end is below the other's begin (touching ends count only when both endpoints
// are inclusive), and an empty (backward, or same-endpoint exclusive) range
// overlaps nothing. A nil bound is treated as an infinity. Incomparable bounds
// report no overlap.
func rangeOverlap(self, o *object.Range) bool {
// self.end below o.begin, or o.end below self.begin → disjoint.
if !object.IsNil(self.Hi) && !object.IsNil(o.Lo) {
c, ok := rangeCmp(self.Hi, o.Lo)
if !ok || c < 0 || (c == 0 && (self.Exclusive || o.Exclusive)) {
return false
}
}
if !object.IsNil(o.Hi) && !object.IsNil(self.Lo) {
c, ok := rangeCmp(o.Hi, self.Lo)
if !ok || c < 0 || (c == 0 && (self.Exclusive || o.Exclusive)) {
return false
}
}
// Either range being empty (begin past end, or equal with an exclusive end)
// means it holds no elements, so nothing overlaps it.
if rangeIsEmpty(self) || rangeIsEmpty(o) {
return false
}
return true
}

// rangeIsEmpty reports whether a bounded range holds no elements: its begin lies
// past its end, or the two coincide with an exclusive end. An unbounded range is
// never empty.
func rangeIsEmpty(r *object.Range) bool {
if object.IsNil(r.Lo) || object.IsNil(r.Hi) {
return false
}
// A valid range always has comparable bounds, so rangeCmp reports a result.
c, _ := rangeCmp(r.Lo, r.Hi)
return c > 0 || (c == 0 && r.Exclusive)
}
31 changes: 31 additions & 0 deletions internal/vm/range_edges_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -166,3 +166,34 @@ func TestRangeReverseEachErrors(t *testing.T) {
})
}
}

// TestRangeOverlap covers Range#overlap? — shared-element detection with
// inclusive/exclusive ends, unbounded sides, empty/backward ranges and the
// non-Range TypeError. Asserted against MRI Ruby 4.0.6.
func TestRangeOverlap(t *testing.T) {
cases := []struct{ src, want string }{
{`p (1..5).overlap?(3..7)`, "true\n"},
{`p (1..5).overlap?(6..8)`, "false\n"},
{`p (1..5).overlap?(5..8)`, "true\n"}, // inclusive ends touch
{`p (1...5).overlap?(5..8)`, "false\n"}, // exclusive end just misses
{`p (1..5).overlap?(10..)`, "false\n"}, // endless other, disjoint
{`p (..5).overlap?(3..)`, "true\n"}, // beginless meets endless
{`p (1..3).overlap?(4..2)`, "false\n"}, // backward (empty) other
{`p (1..5).overlap?(5..1)`, "false\n"}, // empty other touching self's end
{`p (1...1).overlap?(0..2)`, "false\n"}, // empty self
{`p ("a".."c").overlap?("b".."d")`, "true\n"},
{`p (1.0..2.0).overlap?(1.5..3.0)`, "true\n"},
{`p (1..5).overlap?("a".."z")`, "false\n"}, // incomparable bounds
{`p ("a".."z").overlap?(1..5)`, "false\n"},
{`p (1..).overlap?("a".."z")`, "false\n"}, // endless self, incomparable
}
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)
}
}
if err := runErr(t, `(1..5).overlap?(3)`); err == nil ||
!strings.Contains(err.Error(), "wrong argument type Integer (expected Range)") {
t.Errorf("overlap?(non-Range): err=%v", err)
}
}
2 changes: 1 addition & 1 deletion scripts/conformance/rubyspec/FLOOR
Original file line number Diff line number Diff line change
@@ -1 +1 @@
15790
15800