idl: Fix parsing of hex integer values (#560)

* idl: Fix parsing of hex integer values

* Address comments

* Fix literal space in Makefile

Makefile

@@ -121,8 +121,7 @@ COVER_IGNORE_FILES = \
 	 $(wildcard plugin/api/*.go)
 
 # literal space
-space :=
-space +=
+space := $(subst ,, )
 
 .PHONY: cover
 cover:

gen/constant_test.go

@@ -45,6 +45,36 @@ func TestConstants(t *testing.T) {
 		i    interface{}
 		o    interface{}
 	}{
+		{
+			"int16",
+			tk.Int16,
+			int16(12345),
+		},
+		{
+			"int32",
+			tk.Int32,
+			int32(1234567890),
+		},
+		{
+			"int64",
+			tk.Int64,
+			int64(1234567890123456789),
+		},
+		{
+			"hex16",
+			tk.Hex16,
+			int16(0x1234),
+		},
+		{
+			"hex32",
+			tk.Hex32,
+			int32(0x12345678),
+		},
+		{
+			"hex64",
+			tk.Hex64,
+			int64(0x1234567890abcdef),
+		},
 		{
 			"primitiveContainers",
 			tk.PrimitiveContainers,

gen/enum_test.go

@@ -96,6 +96,37 @@ func TestEqualsEnumWithValues(t *testing.T) {
 	}
 }
 
+func TestValueOfEnumWithHexValues(t *testing.T) {
+	tests := []struct {
+		e te.EnumWithHexValues
+		i int32
+	}{
+		{te.EnumWithHexValuesX, 0x123},
+		{te.EnumWithHexValuesY, 0x456},
+		{te.EnumWithHexValuesZ, 0x789},
+	}
+	for _, tt := range tests {
+		assert.Equal(t, int32(tt.e), tt.i, "Value for %v does not match", tt.e)
+	}
+}
+
+func TestEqualsEnumWithHexValues(t *testing.T) {
+	tests := []struct {
+		lhs, rhs te.EnumWithHexValues
+		want     bool
+	}{
+		{te.EnumWithHexValuesX, te.EnumWithHexValuesX, true},
+		{te.EnumWithHexValuesY, te.EnumWithHexValuesY, true},
+		{te.EnumWithHexValuesZ, te.EnumWithHexValuesZ, true},
+		{te.EnumWithHexValuesX, te.EnumWithHexValuesY, false},
+		{te.EnumWithHexValuesY, te.EnumWithHexValuesZ, false},
+		{te.EnumWithHexValuesZ, te.EnumWithHexValuesX, false},
+	}
+	for _, tt := range tests {
+		assert.Equal(t, tt.lhs.Equals(tt.rhs), tt.want)
+	}
+}
+
 func TestEnumDefaultWire(t *testing.T) {
 	tests := []struct {
 		e te.EnumDefault

gen/internal/tests/thrift/constants.thrift

@@ -6,6 +6,14 @@ include "./structs.thrift"
 include "./unions.thrift"
 include "./typedefs.thrift"
 
+const i16 int16 = 12345
+const i32 int32 = 1234567890
+const i64 int64 = 1234567890123456789
+
+const i16 hex16 = 0x1234
+const i32 hex32 = 0x12345678
+const i64 hex64 = 0x1234567890abcdef
+
 const containers.PrimitiveContainers primitiveContainers = {
     "listOfInts": other_constants.listOfInts, // imported constant
     "setOfStrings": ["foo", "bar"],

gen/internal/tests/thrift/enums.thrift

@@ -10,6 +10,12 @@ enum EnumWithValues {
     Z = 789,
 }
 
+enum EnumWithHexValues {
+    X = 0x123,
+    Y = 0x456,
+    Z = 0x789,
+}
+
 enum EnumWithDuplicateValues {
     P, // 0
     Q = -1,

gen/quick_test.go

@@ -535,6 +535,11 @@ func TestQuickSuite(t *testing.T) {
 			Generator: enumValueGenerator(te.EnumWithValues_Values),
 			Kind:      thriftEnum,
 		},
+		{
+			Sample:    te.EnumWithHexValues(0),
+			Generator: enumValueGenerator(te.EnumWithHexValues_Values),
+			Kind:      thriftEnum,
+		},
 		{
 			Sample:    te.LowerCaseEnum(0),
 			Generator: enumValueGenerator(te.LowerCaseEnum_Values),