diff options
| -rw-r--r-- | src/idl_gen_go.cpp | 7 | ||||
| -rw-r--r-- | src/idl_gen_python.cpp | 9 | ||||
| -rw-r--r-- | tests/MyGame/Example/Monster.py | 1 | ||||
| -rw-r--r-- | tests/MyGame/Example/Stat.go | 7 | ||||
| -rw-r--r-- | tests/MyGame/Example/Stat.py | 7 | ||||
| -rw-r--r-- | tests/MyGame/Example/TestSimpleTableWithEnum.go | 7 | ||||
| -rw-r--r-- | tests/MyGame/Example/TestSimpleTableWithEnum.py | 7 |
7 files changed, 35 insertions, 10 deletions
diff --git a/src/idl_gen_go.cpp b/src/idl_gen_go.cpp index 5841e121..0c624240 100644 --- a/src/idl_gen_go.cpp +++ b/src/idl_gen_go.cpp @@ -509,13 +509,12 @@ static void GenTableBuilders(const StructDef &struct_def, // Generate struct or table methods. static void GenStruct(const StructDef &struct_def, - std::string *code_ptr, - StructDef *root_struct_def) { + std::string *code_ptr) { if (struct_def.generated) return; GenComment(struct_def.doc_comment, code_ptr, nullptr); BeginClass(struct_def, code_ptr); - if (&struct_def == root_struct_def) { + if (!struct_def.fixed) { // Generate a special accessor for the table that has been declared as // the root type. NewRootTypeFromBuffer(struct_def, code_ptr); @@ -637,7 +636,7 @@ class GoGenerator : public BaseGenerator { for (auto it = parser_.structs_.vec.begin(); it != parser_.structs_.vec.end(); ++it) { std::string declcode; - go::GenStruct(**it, &declcode, parser_.root_struct_def_); + go::GenStruct(**it, &declcode); if (!SaveType(**it, declcode, true)) return false; } diff --git a/src/idl_gen_python.cpp b/src/idl_gen_python.cpp index 7b8d168c..2917854d 100644 --- a/src/idl_gen_python.cpp +++ b/src/idl_gen_python.cpp @@ -94,7 +94,7 @@ static void NewRootTypeFromBuffer(const StructDef &struct_def, code += Indent + Indent + "x = " + struct_def.name + "()\n"; code += Indent + Indent + "x.Init(buf, n + offset)\n"; code += Indent + Indent + "return x\n"; - code += "\n\n"; + code += "\n"; } // Initialize an existing object with other data, to avoid an allocation. @@ -478,13 +478,12 @@ static void GenTableBuilders(const StructDef &struct_def, // Generate struct or table methods. static void GenStruct(const StructDef &struct_def, - std::string *code_ptr, - StructDef *root_struct_def) { + std::string *code_ptr) { if (struct_def.generated) return; GenComment(struct_def.doc_comment, code_ptr, nullptr, "# "); BeginClass(struct_def, code_ptr); - if (&struct_def == root_struct_def) { + if (!struct_def.fixed) { // Generate a special accessor for the table that has been declared as // the root type. NewRootTypeFromBuffer(struct_def, code_ptr); @@ -620,7 +619,7 @@ class PythonGenerator : public BaseGenerator { it != parser_.structs_.vec.end(); ++it) { auto &struct_def = **it; std::string declcode; - GenStruct(struct_def, &declcode, parser_.root_struct_def_); + GenStruct(struct_def, &declcode); if (!SaveType(struct_def, declcode, true)) return false; } return true; diff --git a/tests/MyGame/Example/Monster.py b/tests/MyGame/Example/Monster.py index 4f1ca2df..40d7e8ac 100644 --- a/tests/MyGame/Example/Monster.py +++ b/tests/MyGame/Example/Monster.py @@ -15,7 +15,6 @@ class Monster(object): x.Init(buf, n + offset) return x - # Monster def Init(self, buf, pos): self._tab = flatbuffers.table.Table(buf, pos) diff --git a/tests/MyGame/Example/Stat.go b/tests/MyGame/Example/Stat.go index 7c33716b..1071cae8 100644 --- a/tests/MyGame/Example/Stat.go +++ b/tests/MyGame/Example/Stat.go @@ -9,6 +9,13 @@ type Stat struct { _tab flatbuffers.Table } +func GetRootAsStat(buf []byte, offset flatbuffers.UOffsetT) *Stat { + n := flatbuffers.GetUOffsetT(buf[offset:]) + x := &Stat{} + x.Init(buf, n + offset) + return x +} + func (rcv *Stat) Init(buf []byte, i flatbuffers.UOffsetT) { rcv._tab.Bytes = buf rcv._tab.Pos = i diff --git a/tests/MyGame/Example/Stat.py b/tests/MyGame/Example/Stat.py index 71577e86..b0e251d4 100644 --- a/tests/MyGame/Example/Stat.py +++ b/tests/MyGame/Example/Stat.py @@ -7,6 +7,13 @@ import flatbuffers class Stat(object): __slots__ = ['_tab'] + @classmethod + def GetRootAsStat(cls, buf, offset): + n = flatbuffers.encode.Get(flatbuffers.packer.uoffset, buf, offset) + x = Stat() + x.Init(buf, n + offset) + return x + # Stat def Init(self, buf, pos): self._tab = flatbuffers.table.Table(buf, pos) diff --git a/tests/MyGame/Example/TestSimpleTableWithEnum.go b/tests/MyGame/Example/TestSimpleTableWithEnum.go index fe9cf2db..965c7189 100644 --- a/tests/MyGame/Example/TestSimpleTableWithEnum.go +++ b/tests/MyGame/Example/TestSimpleTableWithEnum.go @@ -9,6 +9,13 @@ type TestSimpleTableWithEnum struct { _tab flatbuffers.Table } +func GetRootAsTestSimpleTableWithEnum(buf []byte, offset flatbuffers.UOffsetT) *TestSimpleTableWithEnum { + n := flatbuffers.GetUOffsetT(buf[offset:]) + x := &TestSimpleTableWithEnum{} + x.Init(buf, n + offset) + return x +} + func (rcv *TestSimpleTableWithEnum) Init(buf []byte, i flatbuffers.UOffsetT) { rcv._tab.Bytes = buf rcv._tab.Pos = i diff --git a/tests/MyGame/Example/TestSimpleTableWithEnum.py b/tests/MyGame/Example/TestSimpleTableWithEnum.py index 5b950979..8d64e971 100644 --- a/tests/MyGame/Example/TestSimpleTableWithEnum.py +++ b/tests/MyGame/Example/TestSimpleTableWithEnum.py @@ -7,6 +7,13 @@ import flatbuffers class TestSimpleTableWithEnum(object): __slots__ = ['_tab'] + @classmethod + def GetRootAsTestSimpleTableWithEnum(cls, buf, offset): + n = flatbuffers.encode.Get(flatbuffers.packer.uoffset, buf, offset) + x = TestSimpleTableWithEnum() + x.Init(buf, n + offset) + return x + # TestSimpleTableWithEnum def Init(self, buf, pos): self._tab = flatbuffers.table.Table(buf, pos) |