Supports numbers of different bases

example/example_diff_base.go

@@ -0,0 +1,20 @@
+package example
+
+//go:generate ../bin/go-enum --forcelower -b example
+
+/*
+ENUM(
+
+	B3  = 03
+	B4  = 04
+	B5  = 5
+	B6  = 0b110
+	B7  = 0b111
+	B8  = 0x08
+	B9  = 0x09
+	B10 = 0x0B
+	B11 = 0x2B
+
+)
+*/
+type DiffBase int

example/example_diff_base_test.go

@@ -0,0 +1,64 @@
+//go:build example
+// +build example
+
+package example
+
+import (
+	"github.com/stretchr/testify/assert"
+	"testing"
+)
+
+func TestDiffBase(t *testing.T) {
+
+	tests := []struct {
+		name     string
+		actual   int
+		expected DiffBase
+	}{
+		{
+			name:     "DiffBaseB3",
+			actual:   3,
+			expected: DiffBaseB3,
+		},
+		{
+			name:     "DiffBaseB4",
+			actual:   4,
+			expected: DiffBaseB4,
+		},
+		{
+			name:     "DiffBaseB5",
+			actual:   5,
+			expected: DiffBaseB5,
+		}, {
+			name:     "DiffBaseB6",
+			actual:   6,
+			expected: DiffBaseB6,
+		}, {
+			name:     "DiffBaseB7",
+			actual:   7,
+			expected: DiffBaseB7,
+		}, {
+			name:     "DiffBaseB8",
+			actual:   8,
+			expected: DiffBaseB8,
+		}, {
+			name:     "DiffBaseB9",
+			actual:   9,
+			expected: DiffBaseB9,
+		}, {
+			name:     "DiffBaseB10",
+			actual:   0x0B,
+			expected: DiffBaseB10,
+		}, {
+			name:     "DiffBaseB11",
+			actual:   0x2B,
+			expected: DiffBaseB11,
+		},
+	}
+
+	for _, test := range tests {
+		t.Run(test.name, func(tt *testing.T) {
+			assert.Equal(tt, int(test.expected), test.actual)
+		})
+	}
+}

generator/generator.go

@@ -446,15 +446,17 @@ func (g *Generator) parseEnum(ts *ast.TypeSpec) (*Enum, error) {
 							valueStr = trimQuotes(dataVal)
 						}
 					} else if unsigned {
-						newData, err := strconv.ParseUint(dataVal, 10, 64)
+						dataVal, base := getNumberBase(dataVal)
+						newData, err := strconv.ParseUint(dataVal, base, 64)
 						if err != nil {
 							err = fmt.Errorf("failed parsing the data part of enum value '%s': %w", value, err)
 							fmt.Println(err)
 							return nil, err
 						}
 						data = newData
 					} else {
-						newData, err := strconv.ParseInt(dataVal, 10, 64)
+						dataVal, base := getNumberBase(dataVal)
+						newData, err := strconv.ParseInt(dataVal, base, 64)
 						if err != nil {
 							err = fmt.Errorf("failed parsing the data part of enum value '%s': %w", value, err)
 							fmt.Println(err)
@@ -522,6 +524,18 @@ func unescapeComment(comment string) string {
 	return val
 }
 
+// getNumberBase will return the base of the number if it is prefixed with 0x, 0, or 0b
+func getNumberBase(value string) (string, int) {
+	if strings.HasPrefix(strings.ToLower(value), "0x") {
+		return value[2:], 16
+	} else if strings.HasPrefix(strings.ToLower(value), "0b") {
+		return value[2:], 2
+	} else if strings.HasPrefix(value, "0") && len(value) > 1 {
+		return value[1:], 8
+	}
+	return value, 10
+}
+
 // sanitizeValue will ensure the value name generated adheres to golang's
 // identifier syntax as described here: https://golang.org/ref/spec#Identifiers
 // identifier = letter { letter | unicode_digit }