Use enum types in generated read/mutate methods for Go (#4978)

google · Oct 8, 2018 · a4c362a · a4c362a
1 parent 7c3c027
commit a4c362a
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 9 deletions.
diff --git a/src/idl_gen_go.cpp b/src/idl_gen_go.cpp
@@ -675,7 +675,7 @@ static std::string GenGetter(const Type &type) {
     case BASE_TYPE_STRING: return "rcv._tab.ByteVector";
     case BASE_TYPE_UNION: return "rcv._tab.Union";
     case BASE_TYPE_VECTOR: return GenGetter(type.VectorType());
-    default: return "rcv._tab.Get" + MakeCamel(GenTypeGet(type));
+    default: return "rcv._tab.Get" + MakeCamel(GenTypeBasic(type));
   }
 }
 
@@ -711,6 +711,9 @@ static std::string GenTypePointer(const Type &type) {
 }
 
 static std::string GenTypeGet(const Type &type) {
+  if (type.enum_def != nullptr && !type.enum_def->is_union) {
+    return GetEnumTypeName(*type.enum_def);
+  }
   return IsScalar(type.base_type) ? GenTypeBasic(type) : GenTypePointer(type);
 }
 

diff --git a/tests/MyGame/Example/Monster.go b/tests/MyGame/Example/Monster.go
diff --git a/tests/MyGame/Example/TestSimpleTableWithEnum.go b/tests/MyGame/Example/TestSimpleTableWithEnum.go
diff --git a/tests/MyGame/Example/Vec3.go b/tests/MyGame/Example/Vec3.go
diff --git a/tests/go_test.go b/tests/go_test.go
@@ -156,6 +156,10 @@ func CheckReadBuffer(buf []byte, offset flatbuffers.UOffsetT, fail func(string,
 			fail(FailString("name", "MyMonster", got))
 		}
 
+		if got := monster.Color(); example.ColorBlue != got {
+			fail(FailString("color", example.ColorBlue, got))
+		}
+
 		// initialize a Vec3 from Pos()
 		vec := new(example.Vec3)
 		vec = monster.Pos(vec)

diff --git a/tests/namespace_test/NamespaceA/TableInFirstNS.go b/tests/namespace_test/NamespaceA/TableInFirstNS.go