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

Jump to bottom

nil pointer is also considered an empty map. #2

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

nil pointer is also considered an empty map. #2

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
18 changes: 17 additions & 1 deletion internal/generic_types/containers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -622,11 +622,18 @@ func newGenericMapType(items []GenericMapItem) *GenericMapType {

// Len returns the number of items in m.
func (m *GenericMapType) Len() int {
if m == nil {
return 0
}
return int(m.len)
}

// Load returns value identified by key. ok is set to true if key exists in the map, false otherwise.
func (m *GenericMapType) Load(key GenericMapKeyType) (value GenericMapValueType, ok bool) {
var zeroValue GenericMapValueType
if m == nil {
return zeroValue, false
}
bucket := m.backingVector.Get(m.pos(key))
if bucket != nil {
for _, item := range bucket {
Expand All @@ -636,12 +643,15 @@ func (m *GenericMapType) Load(key GenericMapKeyType) (value GenericMapValueType,
}
}

var zeroValue GenericMapValueType
return zeroValue, false
}

// Store returns a new GenericMapType containing value identified by key.
func (m *GenericMapType) Store(key GenericMapKeyType, value GenericMapValueType) *GenericMapType {
if m == nil {
return NewGenericMapType(GenericMapItem{Key: key, Value: value})
}

// Grow backing vector if load factor is too high
if m.Len() >= m.backingVector.Len()*int(upperMapLoadFactor) {
buckets := newPrivateGenericMapItemBuckets(m.Len() + 1)
Expand Down Expand Up @@ -677,6 +687,9 @@ func (m *GenericMapType) Store(key GenericMapKeyType, value GenericMapValueType)

// Delete returns a new GenericMapType without the element identified by key.
func (m *GenericMapType) Delete(key GenericMapKeyType) *GenericMapType {
if m == nil {
return nil
}
pos := m.pos(key)
bucket := m.backingVector.Get(pos)
if bucket != nil {
Expand Down Expand Up @@ -713,6 +726,9 @@ func (m *GenericMapType) Delete(key GenericMapKeyType) *GenericMapType {
// Range calls f repeatedly passing it each key and value as argument until either
// all elements have been visited or f returns false.
func (m *GenericMapType) Range(f func(GenericMapKeyType, GenericMapValueType) bool) {
if m == nil {
return
}
m.backingVector.Range(func(bucket privateGenericMapItemBucket) bool {
for _, item := range bucket {
if !f(item.Key, item.Value) {
Expand Down
18 changes: 17 additions & 1 deletion internal/templates/templates.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -362,11 +362,18 @@ func new{{.MapTypeName}}(items []{{.MapItemTypeName}}) *{{.MapTypeName}} {

// Len returns the number of items in m.
func (m *{{.MapTypeName}}) Len() int {
if m == nil {
return 0
}
return int(m.len)
}

// Load returns value identified by key. ok is set to true if key exists in the map, false otherwise.
func (m *{{.MapTypeName}}) Load(key {{.MapKeyTypeName}}) (value {{.MapValueTypeName}}, ok bool) {
var zeroValue {{.MapValueTypeName}}
if m == nil {
return zeroValue, false
}
bucket := m.backingVector.Get(m.pos(key))
if bucket != nil {
for _, item := range bucket {
Expand All @@ -376,12 +383,15 @@ func (m *{{.MapTypeName}}) Load(key {{.MapKeyTypeName}}) (value {{.MapValueTypeN
}
}

var zeroValue {{.MapValueTypeName}}
return zeroValue, false
}

// Store returns a new {{.MapTypeName}} containing value identified by key.
func (m *{{.MapTypeName}}) Store(key {{.MapKeyTypeName}}, value {{.MapValueTypeName}}) *{{.MapTypeName}} {
if m == nil {
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A regular Go map would panic in this case. Do you think it makes sense to implicitly create a new map here?

return New{{.MapTypeName}}({{.MapItemTypeName}}{Key: key, Value: value})
}

// Grow backing vector if load factor is too high
if m.Len() >= m.backingVector.Len()*int(upperMapLoadFactor) {
buckets := newPrivate{{.MapItemTypeName}}Buckets(m.Len() + 1)
Expand Down Expand Up @@ -417,6 +427,9 @@ func (m *{{.MapTypeName}}) Store(key {{.MapKeyTypeName}}, value {{.MapValueTypeN

// Delete returns a new {{.MapTypeName}} without the element identified by key.
func (m *{{.MapTypeName}}) Delete(key {{.MapKeyTypeName}}) *{{.MapTypeName}} {
if m == nil {
return nil
}
pos := m.pos(key)
bucket := m.backingVector.Get(pos)
if bucket != nil {
Expand Down Expand Up @@ -453,6 +466,9 @@ func (m *{{.MapTypeName}}) Delete(key {{.MapKeyTypeName}}) *{{.MapTypeName}} {
// Range calls f repeatedly passing it each key and value as argument until either
// all elements have been visited or f returns false.
func (m *{{.MapTypeName}}) Range(f func({{.MapKeyTypeName}}, {{.MapValueTypeName}}) bool) {
if m == nil {
return
}
m.backingVector.Range(func(bucket private{{.MapItemTypeName}}Bucket) bool {
for _, item := range bucket {
if !f(item.Key, item.Value) {
Expand Down