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

Fix generator error with OneOfs

Browse Source
This commit is contained in:
Petteri Aimonen
2015-01-07 18:59:44 +02:00
parent fa444be424
commit 8ef0392231
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
generator/nanopb_generator.py
View File

@@ -582,7 +582,8 @@ class ExtensionField(Field):
# --------------------------------------------------------------------------- # ---------------------------------------------------------------------------
class OneOf(Field): class OneOf(Field):
def __init__(self, oneof_desc): def __init__(self, struct_name, oneof_desc):
self.struct_name = struct_name
self.name = oneof_desc.name self.name = oneof_desc.name
self.ctype = 'union' self.ctype = 'union'
self.fields = [] self.fields = []
@@ -655,7 +656,7 @@ class Message:
if hasattr(desc, 'oneof_decl'): if hasattr(desc, 'oneof_decl'):
for f in desc.oneof_decl: for f in desc.oneof_decl:
oneof = OneOf(f) oneof = OneOf(self.name, f)
self.oneofs.append(oneof) self.oneofs.append(oneof)
self.fields.append(oneof) self.fields.append(oneof)