Skip to content
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

Add generics for extend slice #169

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Add generics for extend slice #169

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
43 changes: 9 additions & 34 deletions encode.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,60 +141,35 @@ func safeReadOffset(buf []byte) (uint64, []byte, error) {

// ---- extend functions ----

func extendByteSlice(b []byte, needLen int) []byte {
func ExtendSlice[T any](b []T, needLen int) []T {
if b == nil {
b = []T{}
}
b = b[:cap(b)]
if n := needLen - cap(b); n > 0 {
b = append(b, make([]byte, n)...)
b = append(b, make([]T, n)...)
}
return b[:needLen]
}

// ExtendUint64 extends a uint64 buffer to a given size
func ExtendUint64(b []uint64, needLen int) []uint64 {
if b == nil {
b = []uint64{}
}
b = b[:cap(b)]
if n := needLen - cap(b); n > 0 {
b = append(b, make([]uint64, n)...)
}
return b[:needLen]
return ExtendSlice(b, needLen)
}

// ExtendUint32 extends a uint32 buffer to a given size
func ExtendUint32(b []uint32, needLen int) []uint32 {
if b == nil {
b = []uint32{}
}
b = b[:cap(b)]
if n := needLen - cap(b); n > 0 {
b = append(b, make([]uint32, n)...)
}
return b[:needLen]
return ExtendSlice(b, needLen)
}

// ExtendUint16 extends a uint16 buffer to a given size
func ExtendUint16(b []uint16, needLen int) []uint16 {
if b == nil {
b = []uint16{}
}
b = b[:cap(b)]
if n := needLen - cap(b); n > 0 {
b = append(b, make([]uint16, n)...)
}
return b[:needLen]
return ExtendSlice(b, needLen)
}

// ExtendUint16 extends a uint16 buffer to a given size
func ExtendUint8(b []uint8, needLen int) []uint8 {
if b == nil {
b = []uint8{}
}
b = b[:cap(b)]
if n := needLen - cap(b); n > 0 {
b = append(b, make([]uint8, n)...)
}
return b[:needLen]
return ExtendSlice(b, needLen)
}

// ---- unmarshal dynamic content ----
Expand Down
16 changes: 10 additions & 6 deletions encode_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,13 +96,17 @@ func TestBitlist_MaxValue(t *testing.T) {
}

func TestEncode_ExtendUint(t *testing.T) {
if v0 := ExtendUint64(nil, 0); v0 == nil {
var v0 []uint8
if v0 := ExtendSlice(v0, 0); v0 == nil {
t.Fatal("uint64 cannot be nil")
}
if v1 := ExtendUint16(nil, 0); v1 == nil {
t.Fatal("uint16 cannot be nil")
}
if v2 := ExtendUint8(nil, 0); v2 == nil {
t.Fatal("uint8 cannot be nil")
}

func BenchmarkExtendSlice(b *testing.B) {
b.ReportAllocs()

dst := []uint64{}
for i := 0; i < b.N; i++ {
dst = ExtendSlice(dst, 1000)
}
}
Loading
Loading