rik/nanopb
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix generator error when long_names:false is combined with Oneofs.

Browse Source 
Update issue 147
Status: FixedInGit
This commit is contained in:
Petteri Aimonen
2015-02-26 17:33:36 +02:00
parent 651e97456b
commit 4a6580726e
2 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
generator/nanopb_generator.py
View File

@@ -587,6 +587,9 @@ class OneOf(Field):
self.name = oneof_desc.name self.name = oneof_desc.name
self.ctype = 'union' self.ctype = 'union'
self.fields = [] self.fields = []
self.allocation = 'ONEOF'
self.default = None
self.rules = 'ONEOF'
def add_field(self, field): def add_field(self, field):
if field.allocation == 'CALLBACK': if field.allocation == 'CALLBACK':

9
tests/options/options.proto
View File

@@ -75,3 +75,12 @@ message SkippedMessage
option (nanopb_msgopt).skip_message = true; option (nanopb_msgopt).skip_message = true;
required int32 foo = 1; required int32 foo = 1;
} }
// Message with oneof field
message OneofMessage
{
oneof foo {
int32 bar = 1;
}
}