Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
F
flatbuffers
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
flatbuffers
Commits
09dea79a
Commit
09dea79a
authored
Jul 26, 2019
by
ll-antn
Committed by
Wouter van Oortmerssen
Jul 26, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Support nested_flatbuffer attribute when parsing bfbs schema (#5448)
parent
b632061e
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
1 deletion
+10
-1
idl_parser.cpp
src/idl_parser.cpp
+7
-1
monsterdata_test.golden
tests/monsterdata_test.golden
+3
-0
No files found.
src/idl_parser.cpp
View file @
09dea79a
...
...
@@ -3131,7 +3131,7 @@ Offset<reflection::Field> FieldDef::Serialize(FlatBufferBuilder *builder,
}
bool
FieldDef
::
Deserialize
(
Parser
&
parser
,
const
reflection
::
Field
*
field
)
{
name
=
parser
.
UnqualifiedName
(
field
->
name
()
->
str
()
);
name
=
field
->
name
()
->
str
(
);
defined_namespace
=
parser
.
current_namespace_
;
if
(
!
value
.
type
.
Deserialize
(
parser
,
field
->
type
()))
return
false
;
...
...
@@ -3158,6 +3158,12 @@ bool FieldDef::Deserialize(Parser &parser, const reflection::Field *field) {
value
.
type
.
element
!=
BASE_TYPE_UCHAR
)
return
false
;
}
if
(
auto
nested
=
attributes
.
Lookup
(
"nested_flatbuffer"
))
{
auto
nested_qualified_name
=
parser
.
current_namespace_
->
GetFullyQualifiedName
(
nested
->
constant
);
nested_flatbuffer
=
parser
.
LookupStruct
(
nested_qualified_name
);
if
(
!
nested_flatbuffer
)
return
false
;
}
DeserializeDoc
(
doc_comment
,
field
->
documentation
());
return
true
;
}
...
...
tests/monsterdata_test.golden
View file @
09dea79a
...
...
@@ -56,6 +56,9 @@
name: "Wilma"
}
],
testnestedflatbuffer: {
name: "NestedMonster"
},
testbool: true,
testhashs32_fnv1: -579221183,
testhashu32_fnv1: 3715746113,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment