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

Fix compile error when default value given for extension field.

Browse Source 
Update issue 111
Status: FixedInGit
This commit is contained in:
Petteri Aimonen
2014-04-01 16:47:53 +03:00
parent f4949119ad
commit 6c90e824c4
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
generator/nanopb_generator.py
View File

@@ -351,6 +351,8 @@ class Field:
result += '0)' result += '0)'
elif self.pbtype in ['BYTES', 'STRING'] and self.allocation != 'STATIC': elif self.pbtype in ['BYTES', 'STRING'] and self.allocation != 'STATIC':
result += '0)' # Arbitrary size default values not implemented result += '0)' # Arbitrary size default values not implemented
elif self.rules == 'OPTEXT':
result += '0)' # Default value for extensions is not implemented
else: else:
result += '&%s_default)' % (self.struct_name + self.name) result += '&%s_default)' % (self.struct_name + self.name)

2
tests/extensions/extensions.proto
View File

@@ -1,7 +1,7 @@
import 'alltypes.proto'; import 'alltypes.proto';
extend AllTypes { extend AllTypes {
optional int32 AllTypes_extensionfield1 = 255; optional int32 AllTypes_extensionfield1 = 255 [default = 5];
} }
message ExtensionMessage { message ExtensionMessage {