diff options
| author |   Petteri Aimonen <jpa@git.mail.kapsi.fi> | 2013-07-22 18:59:15 +0300 |
|---|---|---|
| committer | Petteri Aimonen <jpa@git.mail.kapsi.fi> | 2013-07-22 18:59:15 +0300 |
| commit | 1f13e8cd2c5bb091677f35e53ae5757774e7d1ba (patch) | |
| tree | 99bfe3fcafe147f514f00128615a0a7b850d53ea /generator/nanopb_generator.py | |
| parent | 64947cb382271e2ab17dbf40ab634846d7d30ad9 (diff) | |
Fix bugs in extension support when multiple extension fields are present.
Diffstat (limited to 'generator/nanopb_generator.py')
| -rw-r--r-- | generator/nanopb_generator.py | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/generator/nanopb_generator.py b/generator/nanopb_generator.py index 3bac9a92..f39614b3 100644 --- a/generator/nanopb_generator.py +++ b/generator/nanopb_generator.py @@ -313,16 +313,19 @@ class ExtensionField(Field): raise NotImplementedError("Only 'optional' is supported for extension fields. " + "(%s.rules == %s)" % (self.fullname, self.rules)) + self.rules = 'OPTEXT' + def extension_decl(self): '''Declaration of the extension type in the .pb.h file''' - return 'extern const pb_extension_type_t %s;' % self.fullname + return 'extern const pb_extension_type_t %s;\n' % self.fullname def extension_def(self): '''Definition of the extension type in the .pb.c file''' + result = 'typedef struct {\n' result += str(self) - result += '} %s;\n' % self.struct_name - result += ('static const pb_field_t %s_field = %s;\n' % + result += '\n} %s;\n\n' % self.struct_name + result += ('static const pb_field_t %s_field = \n %s;\n\n' % (self.fullname, self.pb_field_t(None))) result += 'const pb_extension_type_t %s = {\n' % self.fullname result += ' NULL,\n' |