mirror of
https://github.com/ddidderr/wuffs.git
synced 2026-11-22 16:47:28 +01:00
Rename lib/interval's makeEmptyRange
This commit is contained in:
1 parent
194aaa0a7b
commit
3b56ace877
3 files changed
+24
-24
No files matched your search
+18
-18
@@ -153,7 +153,7 @@ func (x *biggerIntPair) raiseMax(y biggerInt) {
|
|||||||
|
|
||||||
func (x *biggerIntPair) toIntRange() IntRange {
|
func (x *biggerIntPair) toIntRange() IntRange {
|
||||||
if x[0].extra > 0 || x[1].extra < 0 {
|
if x[0].extra > 0 || x[1].extra < 0 {
|
||||||
return empty()
|
return makeEmptyRange()
|
||||||
}
|
}
|
||||||
return IntRange{x[0].i, x[1].i}
|
return IntRange{x[0].i, x[1].i}
|
||||||
}
|
}
|
||||||
@@ -219,8 +219,8 @@ func (x IntRange) String() string {
|
|||||||
return string(buf)
|
return string(buf)
|
||||||
}
|
}
|
||||||
|
|
||||||
// empty returns an empty IntRange: one that contains no elements.
|
// makeEmptyRange returns an empty IntRange: one that contains no elements.
|
||||||
func empty() IntRange {
|
func makeEmptyRange() IntRange {
|
||||||
return IntRange{big.NewInt(+1), big.NewInt(-1)}
|
return IntRange{big.NewInt(+1), big.NewInt(-1)}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -308,13 +308,13 @@ func (x IntRange) justZero() bool {
|
|||||||
// any negative or non-negative elements.
|
// any negative or non-negative elements.
|
||||||
func (x IntRange) split2Ways() (neg IntRange, nonNeg IntRange) {
|
func (x IntRange) split2Ways() (neg IntRange, nonNeg IntRange) {
|
||||||
if x.Empty() {
|
if x.Empty() {
|
||||||
return empty(), empty()
|
return makeEmptyRange(), makeEmptyRange()
|
||||||
}
|
}
|
||||||
if x[0] != nil && x[0].Sign() >= 0 {
|
if x[0] != nil && x[0].Sign() >= 0 {
|
||||||
return empty(), x
|
return makeEmptyRange(), x
|
||||||
}
|
}
|
||||||
if x[1] != nil && x[1].Sign() < 0 {
|
if x[1] != nil && x[1].Sign() < 0 {
|
||||||
return x, empty()
|
return x, makeEmptyRange()
|
||||||
}
|
}
|
||||||
|
|
||||||
neg[0] = x[0]
|
neg[0] = x[0]
|
||||||
@@ -337,10 +337,10 @@ func (x IntRange) split2Ways() (neg IntRange, nonNeg IntRange) {
|
|||||||
// negative or positive elements.
|
// negative or positive elements.
|
||||||
func (x IntRange) split() (neg IntRange, pos IntRange, negEmpty bool, hasZero bool, posEmpty bool) {
|
func (x IntRange) split() (neg IntRange, pos IntRange, negEmpty bool, hasZero bool, posEmpty bool) {
|
||||||
if x[0] != nil && x[0].Sign() > 0 {
|
if x[0] != nil && x[0].Sign() > 0 {
|
||||||
return empty(), x, true, false, x.Empty()
|
return makeEmptyRange(), x, true, false, x.Empty()
|
||||||
}
|
}
|
||||||
if x[1] != nil && x[1].Sign() < 0 {
|
if x[1] != nil && x[1].Sign() < 0 {
|
||||||
return x, empty(), x.Empty(), false, true
|
return x, makeEmptyRange(), x.Empty(), false, true
|
||||||
}
|
}
|
||||||
|
|
||||||
neg[0] = x[0]
|
neg[0] = x[0]
|
||||||
@@ -431,7 +431,7 @@ func (x *IntRange) inPlaceUnite(y IntRange) {
|
|||||||
// Intersect returns z = x ∩ y, the intersection of two intervals.
|
// Intersect returns z = x ∩ y, the intersection of two intervals.
|
||||||
func (x IntRange) Intersect(y IntRange) (z IntRange) {
|
func (x IntRange) Intersect(y IntRange) (z IntRange) {
|
||||||
if x.Empty() || y.Empty() {
|
if x.Empty() || y.Empty() {
|
||||||
return empty()
|
return makeEmptyRange()
|
||||||
}
|
}
|
||||||
|
|
||||||
if x[0] == nil {
|
if x[0] == nil {
|
||||||
@@ -460,7 +460,7 @@ func (x IntRange) Intersect(y IntRange) (z IntRange) {
|
|||||||
// Add returns z = x + y.
|
// Add returns z = x + y.
|
||||||
func (x IntRange) Add(y IntRange) (z IntRange) {
|
func (x IntRange) Add(y IntRange) (z IntRange) {
|
||||||
if x.Empty() || y.Empty() {
|
if x.Empty() || y.Empty() {
|
||||||
return empty()
|
return makeEmptyRange()
|
||||||
}
|
}
|
||||||
if x[0] != nil && y[0] != nil {
|
if x[0] != nil && y[0] != nil {
|
||||||
z[0] = big.NewInt(0).Add(x[0], y[0])
|
z[0] = big.NewInt(0).Add(x[0], y[0])
|
||||||
@@ -474,7 +474,7 @@ func (x IntRange) Add(y IntRange) (z IntRange) {
|
|||||||
// Sub returns z = x - y.
|
// Sub returns z = x - y.
|
||||||
func (x IntRange) Sub(y IntRange) (z IntRange) {
|
func (x IntRange) Sub(y IntRange) (z IntRange) {
|
||||||
if x.Empty() || y.Empty() {
|
if x.Empty() || y.Empty() {
|
||||||
return empty()
|
return makeEmptyRange()
|
||||||
}
|
}
|
||||||
if x[0] != nil && y[1] != nil && (x[1] != nil || y[0] != nil) {
|
if x[0] != nil && y[1] != nil && (x[1] != nil || y[0] != nil) {
|
||||||
z[0] = big.NewInt(0).Sub(x[0], y[1])
|
z[0] = big.NewInt(0).Sub(x[0], y[1])
|
||||||
@@ -504,7 +504,7 @@ func (x IntRange) Lsh(y IntRange) (z IntRange, ok bool) {
|
|||||||
|
|
||||||
func (x IntRange) mulLsh(y IntRange, shift bool) (z IntRange) {
|
func (x IntRange) mulLsh(y IntRange, shift bool) (z IntRange) {
|
||||||
if x.Empty() || y.Empty() {
|
if x.Empty() || y.Empty() {
|
||||||
return empty()
|
return makeEmptyRange()
|
||||||
}
|
}
|
||||||
if x.justZero() || (!shift && y.justZero()) {
|
if x.justZero() || (!shift && y.justZero()) {
|
||||||
return IntRange{big.NewInt(0), big.NewInt(0)}
|
return IntRange{big.NewInt(0), big.NewInt(0)}
|
||||||
@@ -588,7 +588,7 @@ func (x IntRange) mulLsh(y IntRange, shift bool) (z IntRange) {
|
|||||||
// contains zero, as it's invalid to divide by zero. Otherwise, ok is true.
|
// contains zero, as it's invalid to divide by zero. Otherwise, ok is true.
|
||||||
func (x IntRange) Quo(y IntRange) (z IntRange, ok bool) {
|
func (x IntRange) Quo(y IntRange) (z IntRange, ok bool) {
|
||||||
if x.Empty() || y.Empty() {
|
if x.Empty() || y.Empty() {
|
||||||
return empty(), true
|
return makeEmptyRange(), true
|
||||||
}
|
}
|
||||||
if y.ContainsZero() {
|
if y.ContainsZero() {
|
||||||
return IntRange{}, false
|
return IntRange{}, false
|
||||||
@@ -678,7 +678,7 @@ func (x IntRange) Quo(y IntRange) (z IntRange, ok bool) {
|
|||||||
// number. Otherwise, ok is true.
|
// number. Otherwise, ok is true.
|
||||||
func (x IntRange) Rsh(y IntRange) (z IntRange, ok bool) {
|
func (x IntRange) Rsh(y IntRange) (z IntRange, ok bool) {
|
||||||
if x.Empty() || y.Empty() {
|
if x.Empty() || y.Empty() {
|
||||||
return empty(), true
|
return makeEmptyRange(), true
|
||||||
}
|
}
|
||||||
if y.ContainsNegative() {
|
if y.ContainsNegative() {
|
||||||
return IntRange{}, false
|
return IntRange{}, false
|
||||||
@@ -734,7 +734,7 @@ func (x IntRange) Rsh(y IntRange) (z IntRange, ok bool) {
|
|||||||
// one negative value. Otherwise, ok is true.
|
// one negative value. Otherwise, ok is true.
|
||||||
func (x IntRange) And(y IntRange) (z IntRange, ok bool) {
|
func (x IntRange) And(y IntRange) (z IntRange, ok bool) {
|
||||||
if x.Empty() || y.Empty() {
|
if x.Empty() || y.Empty() {
|
||||||
return empty(), true
|
return makeEmptyRange(), true
|
||||||
}
|
}
|
||||||
if !x.ContainsNegative() && !y.ContainsNegative() {
|
if !x.ContainsNegative() && !y.ContainsNegative() {
|
||||||
return andBothNonNeg(x, y), true
|
return andBothNonNeg(x, y), true
|
||||||
@@ -747,7 +747,7 @@ func (x IntRange) And(y IntRange) (z IntRange, ok bool) {
|
|||||||
hasYNeg := !yNeg.Empty()
|
hasYNeg := !yNeg.Empty()
|
||||||
hasYNon := !yNon.Empty()
|
hasYNon := !yNon.Empty()
|
||||||
|
|
||||||
z = empty()
|
z = makeEmptyRange()
|
||||||
if hasXNeg {
|
if hasXNeg {
|
||||||
if hasYNeg {
|
if hasYNeg {
|
||||||
w := orBothNonNeg(IntRange{
|
w := orBothNonNeg(IntRange{
|
||||||
@@ -843,7 +843,7 @@ func andOneNegOneNonNeg(neg IntRange, non IntRange) (z IntRange) {
|
|||||||
// one negative value. Otherwise, ok is true.
|
// one negative value. Otherwise, ok is true.
|
||||||
func (x IntRange) Or(y IntRange) (z IntRange, ok bool) {
|
func (x IntRange) Or(y IntRange) (z IntRange, ok bool) {
|
||||||
if x.Empty() || y.Empty() {
|
if x.Empty() || y.Empty() {
|
||||||
return empty(), true
|
return makeEmptyRange(), true
|
||||||
}
|
}
|
||||||
if !x.ContainsNegative() && !y.ContainsNegative() {
|
if !x.ContainsNegative() && !y.ContainsNegative() {
|
||||||
return orBothNonNeg(x, y), true
|
return orBothNonNeg(x, y), true
|
||||||
@@ -856,7 +856,7 @@ func (x IntRange) Or(y IntRange) (z IntRange, ok bool) {
|
|||||||
hasYNeg := !yNeg.Empty()
|
hasYNeg := !yNeg.Empty()
|
||||||
hasYNon := !yNon.Empty()
|
hasYNon := !yNon.Empty()
|
||||||
|
|
||||||
z = empty()
|
z = makeEmptyRange()
|
||||||
if hasXNeg {
|
if hasXNeg {
|
||||||
if hasYNeg {
|
if hasYNeg {
|
||||||
w := andBothNonNeg(IntRange{
|
w := andBothNonNeg(IntRange{
|
||||||
|
|||||||
@@ -244,7 +244,7 @@ func TestContainsEtc(tt *testing.T) {
|
|||||||
// eqTestCases is appended to throughout the "range testCases" loop, but it
|
// eqTestCases is appended to throughout the "range testCases" loop, but it
|
||||||
// always contains exactly one empty IntRange.
|
// always contains exactly one empty IntRange.
|
||||||
eqTestCases := []IntRange{
|
eqTestCases := []IntRange{
|
||||||
empty(),
|
makeEmptyRange(),
|
||||||
}
|
}
|
||||||
|
|
||||||
for _, tc := range testCases {
|
for _, tc := range testCases {
|
||||||
@@ -283,8 +283,8 @@ func TestContainsEtc(tt *testing.T) {
|
|||||||
tt.Errorf("%s.Empty(): got %t, want %t", tc.s, got, want)
|
tt.Errorf("%s.Empty(): got %t, want %t", tc.s, got, want)
|
||||||
} else if !got {
|
} else if !got {
|
||||||
eqTestCases = append(eqTestCases, x)
|
eqTestCases = append(eqTestCases, x)
|
||||||
} else if !x.Eq(empty()) {
|
} else if !x.Eq(makeEmptyRange()) {
|
||||||
tt.Errorf("%v eq %v: got %t, want %t", x, empty(), got, want)
|
tt.Errorf("%v eq %v: got %t, want %t", x, makeEmptyRange(), got, want)
|
||||||
}
|
}
|
||||||
|
|
||||||
if got, want := x.justZero(), tc.s == "[ 0, 0]"; got != want {
|
if got, want := x.justZero(), tc.s == "[ 0, 0]"; got != want {
|
||||||
@@ -929,7 +929,7 @@ func TestOpAndWithZero(tt *testing.T) {
|
|||||||
x := IntRange{x0, x1}
|
x := IntRange{x0, x1}
|
||||||
want := zero
|
want := zero
|
||||||
if x.Empty() {
|
if x.Empty() {
|
||||||
want = empty()
|
want = makeEmptyRange()
|
||||||
}
|
}
|
||||||
|
|
||||||
if got, _ := x.And(zero); !got.Eq(want) {
|
if got, _ := x.And(zero); !got.Eq(want) {
|
||||||
@@ -949,7 +949,7 @@ func TestOpOrWithMinusOne(tt *testing.T) {
|
|||||||
x := IntRange{x0, x1}
|
x := IntRange{x0, x1}
|
||||||
want := minusOne
|
want := minusOne
|
||||||
if x.Empty() {
|
if x.Empty() {
|
||||||
want = empty()
|
want = makeEmptyRange()
|
||||||
}
|
}
|
||||||
|
|
||||||
if got, _ := x.Or(minusOne); !got.Eq(want) {
|
if got, _ := x.Or(minusOne); !got.Eq(want) {
|
||||||
|
|||||||
@@ -514,7 +514,7 @@ func bruteForce(x IntRange, y IntRange, opKey rune) (z IntRange, ok bool) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if first {
|
if first {
|
||||||
return empty(), true
|
return makeEmptyRange(), true
|
||||||
}
|
}
|
||||||
return IntRange{result[0].bigInt(), result[1].bigInt()}, true
|
return IntRange{result[0].bigInt(), result[1].bigInt()}, true
|
||||||
}
|
}
|
||||||
Reference in new issue
Block a user