Store enums in maps

models/format.go

@@ -98,11 +98,7 @@ func GetDurationFormatter(flags Format) (f ValueFormatter) {
 	}
 }
 
-func GetEnumFormatter(flags Format, values []NamedNumber) (f ValueFormatter) {
-	enums := make(map[int64]string, len(values))
-	for _, enum := range values {
-		enums[enum.Value] = enum.Name
-	}
+func GetEnumFormatter(flags Format, values EnumValues) (f ValueFormatter) {
 	return func(value interface{}) (v Value) {
 		v.Format = flags
 		v.Raw = value
@@ -118,7 +114,7 @@ func GetEnumFormatter(flags Format, values []NamedNumber) (f ValueFormatter) {
 		}
 		v.Raw = intVal
 		if flags&FormatEnumName != 0 {
-			enumName, ok := enums[intVal]
+			enumName, ok := values[intVal]
 			if !ok {
 				enumName = "unknown"
 			}
@@ -133,11 +129,7 @@ func GetEnumFormatter(flags Format, values []NamedNumber) (f ValueFormatter) {
 	}
 }
 
-func GetEnumBitsFormatter(flags Format, values []NamedNumber) (f ValueFormatter) {
-	enums := make(map[uint64]string, len(values))
-	for _, enum := range values {
-		enums[uint64(enum.Value)] = enum.Name
-	}
+func GetEnumBitsFormatter(flags Format, values EnumValues) (f ValueFormatter) {
 	return func(value interface{}) (v Value) {
 		v.Format = flags
 		v.Raw = value
@@ -155,10 +147,10 @@ func GetEnumBitsFormatter(flags Format, values []NamedNumber) (f ValueFormatter)
 		for i, octet := range octets {
 			for j := 7; j >= 0; j-- {
 				if octet&(1<<uint(j)) != 0 {
-					bit := uint64(8*i + (7 - j))
+					bit := int64(8*i + (7 - j))
 					var bitFormatted string
 					if flags&FormatEnumName != 0 {
-						enumName, ok := enums[bit]
+						enumName, ok := values[bit]
 						if !ok {
 							enumName = "unknown"
 						}

models/type.go

@@ -2,19 +2,17 @@ package models
 
 import (
 	"fmt"
+	"sort"
 
 	"github.com/sleepinggenius2/gosmi/types"
 )
 
 type Enum struct {
 	BaseType types.BaseType
-	Values   []NamedNumber
+	Values   EnumValues
 }
 
-type NamedNumber struct {
-	Name  string
-	Value int64
-}
+type EnumValues map[int64]string
 
 type Range struct {
 	BaseType types.BaseType
@@ -42,3 +40,13 @@ func (t Type) String() string {
 	}
 	return fmt.Sprintf("Type[%s Status=%s, Format=%s, Units=%s]", typeStr, t.Status, t.Format, t.Units)
 }
+
+// Keys returns a sorted list of all keys
+func (values EnumValues) Keys() []int64 {
+	keys := make([]int64, 0, len(values))
+	for k := range values {
+		keys = append(keys, k)
+	}
+	sort.Slice(keys, func(i, j int) bool { return keys[i] < keys[j] })
+	return keys
+}

type.go

@@ -29,17 +29,13 @@ func (t *SmiType) getEnum() {
 		return
 	}
 
-	enum := models.Enum{
+	t.Enum = &models.Enum{
 		BaseType: types.BaseType(smiNamedNumber.value.basetype),
+		Values:   make(models.EnumValues),
 	}
 	for ; smiNamedNumber != nil; smiNamedNumber = C.smiGetNextNamedNumber(smiNamedNumber) {
-		namedNumber := models.NamedNumber{
-			Name:  C.GoString(smiNamedNumber.name),
-			Value: convertValue(smiNamedNumber.value),
-		}
-		enum.Values = append(enum.Values, namedNumber)
+		t.Enum.Values[convertValue(smiNamedNumber.value)] = C.GoString(smiNamedNumber.name)
 	}
-	t.Enum = &enum
 	return
 }