summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rwxr-xr-xgenerator/nanopb_generator.py95
-rw-r--r--tests/alltypes/decode_alltypes.c3
-rw-r--r--tests/alltypes/encode_alltypes.c2
-rw-r--r--tests/basic_buffer/decode_buffer.c2
-rw-r--r--tests/basic_stream/decode_stream.c2
5 files changed, 84 insertions, 20 deletions
diff --git a/generator/nanopb_generator.py b/generator/nanopb_generator.py
index 2d2071e1..6031e893 100755
--- a/generator/nanopb_generator.py
+++ b/generator/nanopb_generator.py
@@ -292,35 +292,63 @@ class Field:
result = None
return result
+ def get_initializer(self, null_init):
+ '''Return literal expression for this field's default value.'''
+
+ if self.pbtype == 'MESSAGE':
+ if null_init:
+ return '%s_init_zero' % self.ctype
+ else:
+ return '%s_init_default' % self.ctype
+
+ if self.default is None or null_init:
+ if self.pbtype == 'STRING':
+ return '""'
+ elif self.pbtype == 'BYTES':
+ return '{0, {0}}'
+ elif self.pbtype == 'ENUM':
+ return '(%s)0' % self.ctype
+ else:
+ return '0'
+
+ default = str(self.default)
+
+ if self.pbtype == 'STRING':
+ default = default.encode('utf-8').encode('string_escape')
+ default = default.replace('"', '\\"')
+ default = '"' + default + '"'
+ elif self.pbtype == 'BYTES':
+ data = default.decode('string_escape')
+ data = ['0x%02x' % ord(c) for c in data]
+ if len(data) == 0:
+ default = '{0, {0}}'
+ else:
+ default = '{%d, {%s}}' % (len(data), ','.join(data))
+ elif self.pbtype in ['FIXED32', 'UINT32']:
+ default += 'u'
+ elif self.pbtype in ['FIXED64', 'UINT64']:
+ default += 'ull'
+ elif self.pbtype in ['SFIXED64', 'INT64']:
+ default += 'll'
+
+ return default
+
def default_decl(self, declaration_only = False):
'''Return definition for this field's default value.'''
if self.default is None:
return None
- ctype, default = self.ctype, self.default
+ ctype = self.ctype
+ default = self.get_initializer(False)
array_decl = ''
if self.pbtype == 'STRING':
if self.allocation != 'STATIC':
return None # Not implemented
-
array_decl = '[%d]' % self.max_size
- default = str(self.default).encode('string_escape')
- default = default.replace('"', '\\"')
- default = '"' + default + '"'
elif self.pbtype == 'BYTES':
if self.allocation != 'STATIC':
return None # Not implemented
-
- data = self.default.decode('string_escape')
- data = ['0x%02x' % ord(c) for c in data]
- default = '{%d, {%s}}' % (len(data), ','.join(data))
- elif self.pbtype in ['FIXED32', 'UINT32']:
- default += 'u'
- elif self.pbtype in ['FIXED64', 'UINT64']:
- default += 'ull'
- elif self.pbtype in ['SFIXED64', 'INT64']:
- default += 'll'
if declaration_only:
return 'extern const %s %s_default%s;' % (ctype, self.struct_name + self.name, array_decl)
@@ -442,7 +470,7 @@ class ExtensionRange(Field):
def tags(self):
return ''
-
+
def encoded_size(self, allmsgs):
# We exclude extensions from the count, because they cannot be known
# until runtime. Other option would be to return None here, but this
@@ -553,6 +581,32 @@ class Message:
result += types + '\n'
return result
+ def get_initializer(self, null_init):
+ if not self.ordered_fields:
+ return '{0}'
+
+ parts = []
+ for field in self.ordered_fields:
+ if field.allocation == 'STATIC':
+ if field.rules == 'REPEATED':
+ parts.append('0')
+ parts.append('{'
+ + ', '.join([field.get_initializer(null_init)] * field.max_count)
+ + '}')
+ elif field.rules == 'OPTIONAL':
+ parts.append('false')
+ parts.append(field.get_initializer(null_init))
+ else:
+ parts.append(field.get_initializer(null_init))
+ elif field.allocation == 'POINTER':
+ parts.append('NULL')
+ elif field.allocation == 'CALLBACK':
+ if field.pbtype == 'EXTENSION':
+ parts.append('NULL')
+ else:
+ parts.append('{{NULL}, NULL}')
+ return '{' + ', '.join(parts) + '}'
+
def default_decl(self, declaration_only = False):
result = ""
for field in self.fields:
@@ -755,6 +809,15 @@ def generate_header(dependencies, headername, enums, messages, extensions, optio
yield msg.default_decl(True)
yield '\n'
+ yield '/* Initializer values for message structs */\n'
+ for msg in messages:
+ identifier = '%s_init_default' % msg.name
+ yield '#define %-40s %s\n' % (identifier, msg.get_initializer(False))
+ for msg in messages:
+ identifier = '%s_init_zero' % msg.name
+ yield '#define %-40s %s\n' % (identifier, msg.get_initializer(True))
+ yield '\n'
+
yield '/* Field tags (for use in manual encoding/decoding) */\n'
for msg in sort_dependencies(messages):
for field in msg.fields:
diff --git a/tests/alltypes/decode_alltypes.c b/tests/alltypes/decode_alltypes.c
index 0202ebc1..67cb72c4 100644
--- a/tests/alltypes/decode_alltypes.c
+++ b/tests/alltypes/decode_alltypes.c
@@ -19,7 +19,8 @@
the decoding and checks the fields. */
bool check_alltypes(pb_istream_t *stream, int mode)
{
- AllTypes alltypes;
+ /* Uses _init_default to just make sure that it works. */
+ AllTypes alltypes = AllTypes_init_default;
/* Fill with garbage to better detect initialization errors */
memset(&alltypes, 0xAA, sizeof(alltypes));
diff --git a/tests/alltypes/encode_alltypes.c b/tests/alltypes/encode_alltypes.c
index fa8eec94..deec7903 100644
--- a/tests/alltypes/encode_alltypes.c
+++ b/tests/alltypes/encode_alltypes.c
@@ -13,7 +13,7 @@ int main(int argc, char **argv)
int mode = (argc > 1) ? atoi(argv[1]) : 0;
/* Initialize the structure with constants */
- AllTypes alltypes = {0};
+ AllTypes alltypes = AllTypes_init_zero;
alltypes.req_int32 = -1001;
alltypes.req_int64 = -1002;
diff --git a/tests/basic_buffer/decode_buffer.c b/tests/basic_buffer/decode_buffer.c
index fae9e2fa..291d164c 100644
--- a/tests/basic_buffer/decode_buffer.c
+++ b/tests/basic_buffer/decode_buffer.c
@@ -16,7 +16,7 @@
bool print_person(pb_istream_t *stream)
{
int i;
- Person person;
+ Person person = Person_init_zero;
if (!pb_decode(stream, Person_fields, &person))
return false;
diff --git a/tests/basic_stream/decode_stream.c b/tests/basic_stream/decode_stream.c
index 667bf3c5..798dcc50 100644
--- a/tests/basic_stream/decode_stream.c
+++ b/tests/basic_stream/decode_stream.c
@@ -12,7 +12,7 @@
bool print_person(pb_istream_t *stream)
{
int i;
- Person person;
+ Person person = Person_init_zero;
if (!pb_decode(stream, Person_fields, &person))
return false;