From 6c90e824c4e8f54c71645b63b1ea33b1e028cb97 Mon Sep 17 00:00:00 2001 From: Petteri Aimonen Date: Tue, 1 Apr 2014 16:47:53 +0300 Subject: Fix compile error when default value given for extension field. Update issue 111 Status: FixedInGit --- generator/nanopb_generator.py | 2 ++ tests/extensions/extensions.proto | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/generator/nanopb_generator.py b/generator/nanopb_generator.py index c32b26ad..0660d20e 100755 --- a/generator/nanopb_generator.py +++ b/generator/nanopb_generator.py @@ -351,6 +351,8 @@ class Field: result += '0)' elif self.pbtype in ['BYTES', 'STRING'] and self.allocation != 'STATIC': result += '0)' # Arbitrary size default values not implemented + elif self.rules == 'OPTEXT': + result += '0)' # Default value for extensions is not implemented else: result += '&%s_default)' % (self.struct_name + self.name) diff --git a/tests/extensions/extensions.proto b/tests/extensions/extensions.proto index d85e8193..da8432e0 100644 --- a/tests/extensions/extensions.proto +++ b/tests/extensions/extensions.proto @@ -1,7 +1,7 @@ import 'alltypes.proto'; extend AllTypes { - optional int32 AllTypes_extensionfield1 = 255; + optional int32 AllTypes_extensionfield1 = 255 [default = 5]; } message ExtensionMessage { -- cgit 1.2.3-korg