BigfootDev/flatbuffers
1
0
Fork 1
mirror of https://github.com/google/flatbuffers.git synced 2026-06-30 11:20:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

[Go] Fix namespaces on enums (#5406)

Browse Source
This commit is contained in:
John Luxford
2019-06-13 22:25:03 -05:00
committed by Robert Winslow
parent a7e20b1996
commit a6be1d0d74
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/idl_gen_go.cpp
View File

@@ -143,7 +143,7 @@ class GoGenerator : public BaseGenerator {
// Construct the name of the type for this enum. // Construct the name of the type for this enum.
std::string GetEnumTypeName(const EnumDef &enum_def) { std::string GetEnumTypeName(const EnumDef &enum_def) {
return WrapInNameSpaceAndTrack(cur_name_space_, GoIdentity(enum_def.name)); return WrapInNameSpaceAndTrack(enum_def.defined_namespace, GoIdentity(enum_def.name));
} }
// Create a type for the enum values. // Create a type for the enum values.

8
tests/namespace_test/NamespaceA/TableInFirstNS.go
View File

@@ -41,15 +41,15 @@ func (rcv *TableInFirstNS) FooTable(obj *NamespaceA__NamespaceB.TableInNestedNS)
return nil return nil
} }
func (rcv *TableInFirstNS) FooEnum() EnumInNestedNS { func (rcv *TableInFirstNS) FooEnum() NamespaceA__NamespaceB.EnumInNestedNS {
o := flatbuffers.UOffsetT(rcv._tab.Offset(6)) o := flatbuffers.UOffsetT(rcv._tab.Offset(6))
if o != 0 { if o != 0 {
return EnumInNestedNS(rcv._tab.GetInt8(o + rcv._tab.Pos)) return NamespaceA__NamespaceB.EnumInNestedNS(rcv._tab.GetInt8(o + rcv._tab.Pos))
} }
return 0 return 0
} }
func (rcv *TableInFirstNS) MutateFooEnum(n EnumInNestedNS) bool { func (rcv *TableInFirstNS) MutateFooEnum(n NamespaceA__NamespaceB.EnumInNestedNS) bool {
return rcv._tab.MutateInt8Slot(6, int8(n)) return rcv._tab.MutateInt8Slot(6, int8(n))
} }
@@ -72,7 +72,7 @@ func TableInFirstNSStart(builder *flatbuffers.Builder) {
func TableInFirstNSAddFooTable(builder *flatbuffers.Builder, fooTable flatbuffers.UOffsetT) { func TableInFirstNSAddFooTable(builder *flatbuffers.Builder, fooTable flatbuffers.UOffsetT) {
builder.PrependUOffsetTSlot(0, flatbuffers.UOffsetT(fooTable), 0) builder.PrependUOffsetTSlot(0, flatbuffers.UOffsetT(fooTable), 0)
} }
func TableInFirstNSAddFooEnum(builder *flatbuffers.Builder, fooEnum EnumInNestedNS) { func TableInFirstNSAddFooEnum(builder *flatbuffers.Builder, fooEnum NamespaceA__NamespaceB.EnumInNestedNS) {
builder.PrependInt8Slot(1, int8(fooEnum), 0) builder.PrependInt8Slot(1, int8(fooEnum), 0)
} }
func TableInFirstNSAddFooStruct(builder *flatbuffers.Builder, fooStruct flatbuffers.UOffsetT) { func TableInFirstNSAddFooStruct(builder *flatbuffers.Builder, fooStruct flatbuffers.UOffsetT) {