Skip to content

[Go] Fix BitSet OR operation #3427

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
parrt merged 1 commit into from
Dec 23, 2021
Merged

[Go] Fix BitSet OR operation #3427

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 9 additions & 4 deletions runtime/Go/antlr/utils.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,13 +121,18 @@ func (b *BitSet) clear(index int) {
}

func (b *BitSet) or(set *BitSet) {
size := intMax(b.minLen(), set.minLen())
if size > len(b.data) {
data := make([]uint64, size)
// Get min size necessary to represent the bits in both sets.
bLen := b.minLen()
setLen := set.minLen()
maxLen := intMax(bLen, setLen)
if maxLen > len(b.data) {
// Increase the size of len(b.data) to repesent the bits in both sets.
data := make([]uint64, maxLen)
copy(data, b.data)
b.data = data
}
for i := 0; i < size; i++ {
// len(b.data) is at least setLen.
for i := 0; i < setLen; i++ {
b.data[i] |= set.data[i]
}
}
Expand Down
175 changes: 40 additions & 135 deletions runtime/Go/antlr/utils_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,150 +2,55 @@ package antlr

import "testing"

func testBitSet(t *testing.T, bs *BitSet, str string, length int, contains []int, minValue int, minLen int) {
t.Helper()
if got, want := bs.String(), str; got != want {
t.Errorf("%+v.String() = %q, want %q", bs, got, want)
}
if got, want := bs.length(), length; got != want {
t.Errorf("%+v.length() = %q, want %q", bs, got, want)
}
for i := 0; i < len(bs.data)*bitsPerWord; i++ {
var want bool
for _, val := range contains {
if i == val {
want = true
break
}
}
if got := bs.contains(i); got != want {
t.Errorf("%+v.contains(%v) = %v, want %v", bs, i, got, want)
}
}
if got, want := bs.minValue(), minValue; got != want {
t.Errorf("%+v.minValue() = %v, want %v", bs, got, want)
}
if got, want := bs.minLen(), minLen; got != want {
t.Errorf("%+v.minLen() = %v, want %v", bs, got, want)
}
}

func TestBitSet(t *testing.T) {
bs1 := NewBitSet()
if got, want := bs1.String(), "{}"; got != want {
t.Errorf("String() = %q, want %q", got, want)
}
if got, want := bs1.length(), 0; got != want {
t.Errorf("length() = %q, want %q", got, want)
}
if got, want := bs1.contains(1), false; got != want {
t.Errorf("contains(%v) = %v, want %v", 1, got, want)
}
if got, want := bs1.minValue(), 2147483647; got != want {
t.Errorf("minValue() = %v, want %v", got, want)
}
testBitSet(t, bs1, "{}", 0, []int{}, 2147483647, 0)
bs1.add(0)
if got, want := bs1.String(), "{0}"; got != want {
t.Errorf("String() = %q, want %q", got, want)
}
if got, want := bs1.length(), 1; got != want {
t.Errorf("length() = %q, want %q", got, want)
}
if got, want := bs1.contains(0), true; got != want {
t.Errorf("contains(%v) = %v, want %v", 1, got, want)
}
if got, want := bs1.minValue(), 0; got != want {
t.Errorf("minValue() = %v, want %v", got, want)
}
testBitSet(t, bs1, "{0}", 1, []int{0}, 0, 1)
bs1.add(63)
if got, want := bs1.String(), "{0, 63}"; got != want {
t.Errorf("String() = %q, want %q", got, want)
}
if got, want := bs1.length(), 2; got != want {
t.Errorf("length() = %q, want %q", got, want)
}
if got, want := bs1.contains(1), false; got != want {
t.Errorf("contains(%v) = %v, want %v", 1, got, want)
}
if got, want := bs1.contains(0), true; got != want {
t.Errorf("contains(%v) = %v, want %v", 1, got, want)
}
if got, want := bs1.contains(63), true; got != want {
t.Errorf("contains(%v) = %v, want %v", 1, got, want)
}
if got, want := bs1.minValue(), 0; got != want {
t.Errorf("minValue() = %v, want %v", got, want)
}
testBitSet(t, bs1, "{0, 63}", 2, []int{0, 63}, 0, 1)
bs1.remove(0)
if got, want := bs1.String(), "{63}"; got != want {
t.Errorf("String() = %q, want %q", got, want)
}
if got, want := bs1.length(), 1; got != want {
t.Errorf("length() = %q, want %q", got, want)
}
if got, want := bs1.contains(0), false; got != want {
t.Errorf("contains(%v) = %v, want %v", 1, got, want)
}
if got, want := bs1.contains(63), true; got != want {
t.Errorf("contains(%v) = %v, want %v", 1, got, want)
}
if got, want := bs1.minValue(), 63; got != want {
t.Errorf("minValue() = %v, want %v", got, want)
}
testBitSet(t, bs1, "{63}", 1, []int{63}, 63, 1)
bs1.add(20)
if got, want := bs1.String(), "{20, 63}"; got != want {
t.Errorf("String() = %q, want %q", got, want)
}
if got, want := bs1.length(), 2; got != want {
t.Errorf("length() = %q, want %q", got, want)
}
if got, want := bs1.contains(0), false; got != want {
t.Errorf("contains(%v) = %v, want %v", 1, got, want)
}
if got, want := bs1.contains(20), true; got != want {
t.Errorf("contains(%v) = %v, want %v", 1, got, want)
}
if got, want := bs1.contains(63), true; got != want {
t.Errorf("contains(%v) = %v, want %v", 1, got, want)
}
if got, want := bs1.minValue(), 20; got != want {
t.Errorf("minValue() = %v, want %v", got, want)
}
testBitSet(t, bs1, "{20, 63}", 2, []int{20, 63}, 20, 1)
bs1.clear(63)
if got, want := bs1.String(), "{20}"; got != want {
t.Errorf("String() = %q, want %q", got, want)
}
if got, want := bs1.length(), 1; got != want {
t.Errorf("length() = %q, want %q", got, want)
}
if got, want := bs1.contains(0), false; got != want {
t.Errorf("contains(%v) = %v, want %v", 1, got, want)
}
if got, want := bs1.contains(20), true; got != want {
t.Errorf("contains(%v) = %v, want %v", 1, got, want)
}
if got, want := bs1.contains(63), false; got != want {
t.Errorf("contains(%v) = %v, want %v", 1, got, want)
}
if got, want := bs1.minValue(), 20; got != want {
t.Errorf("minValue() = %v, want %v", got, want)
}
testBitSet(t, bs1, "{20}", 1, []int{20}, 20, 1)
bs2 := NewBitSet()
bs2.add(64)
bs1.or(bs2)
if got, want := bs1.String(), "{20, 64}"; got != want {
t.Errorf("String() = %q, want %q", got, want)
}
if got, want := bs1.length(), 2; got != want {
t.Errorf("length() = %q, want %q", got, want)
}
if got, want := bs1.contains(0), false; got != want {
t.Errorf("contains(%v) = %v, want %v", 1, got, want)
}
if got, want := bs1.contains(20), true; got != want {
t.Errorf("contains(%v) = %v, want %v", 1, got, want)
}
if got, want := bs1.contains(63), false; got != want {
t.Errorf("contains(%v) = %v, want %v", 1, got, want)
}
if got, want := bs1.contains(64), true; got != want {
t.Errorf("contains(%v) = %v, want %v", 1, got, want)
}
if got, want := bs1.minValue(), 20; got != want {
t.Errorf("minValue() = %v, want %v", got, want)
}
testBitSet(t, bs1, "{20, 64}", 2, []int{20, 64}, 20, 2)
bs1.remove(20)
if got, want := bs1.String(), "{64}"; got != want {
t.Errorf("String() = %q, want %q", got, want)
}
if got, want := bs1.length(), 1; got != want {
t.Errorf("length() = %q, want %q", got, want)
}
if got, want := bs1.contains(0), false; got != want {
t.Errorf("contains(%v) = %v, want %v", 1, got, want)
}
if got, want := bs1.contains(20), false; got != want {
t.Errorf("contains(%v) = %v, want %v", 1, got, want)
}
if got, want := bs1.contains(63), false; got != want {
t.Errorf("contains(%v) = %v, want %v", 1, got, want)
}
if got, want := bs1.contains(64), true; got != want {
t.Errorf("contains(%v) = %v, want %v", 1, got, want)
}
if got, want := bs1.minValue(), 64; got != want {
t.Errorf("minValue() = %v, want %v", got, want)
}
testBitSet(t, bs1, "{64}", 1, []int{64}, 64, 2)
bs3 := NewBitSet()
bs3.add(63)
bs1.or(bs3)
testBitSet(t, bs1, "{63, 64}", 2, []int{63, 64}, 63, 2)
}