#!/usr/bin/python
'''Generate header file for nanopb from a ProtoBuf FileDescriptorSet.'''
-nanopb_version = "nanopb-0.2.8"
+nanopb_version = "nanopb-0.3.0-dev"
import sys
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)
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
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:
for names, message in iterate_messages(fdesc, base_name):
message_options = get_nanopb_suboptions(message, file_options, names)
+
+ if message_options.skip_message:
+ continue
+
messages.append(Message(names, message, message_options))
for enum in message.enum_type:
enum_options = get_nanopb_suboptions(enum, message_options, names + enum.name)
enums.append(Enum(names, enum, enum_options))
for names, extension in iterate_extensions(fdesc, base_name):
- field_options = get_nanopb_suboptions(extension, file_options, names)
+ field_options = get_nanopb_suboptions(extension, file_options, names + extension.name)
if field_options.type != nanopb_pb2.FT_IGNORE:
extensions.append(ExtensionField(names, extension, field_options))
for dependency in dependencies:
noext = os.path.splitext(dependency)[0]
- yield options.genformat % (noext + '.' + options.extension + '.h')
+ yield options.genformat % (noext + options.extension + '.h')
yield '\n'
yield '#ifdef __cplusplus\n'
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:
"Output will be written to file.pb.h and file.pb.c.")
optparser.add_option("-x", dest="exclude", metavar="FILE", action="append", default=[],
help="Exclude file from generated #include list.")
-optparser.add_option("-e", "--extension", dest="extension", metavar="EXTENSION", default="pb",
- help="Set extension to use instead of 'pb' for generated files. [default: %default]")
+optparser.add_option("-e", "--extension", dest="extension", metavar="EXTENSION", default=".pb",
+ help="Set extension to use instead of '.pb' for generated files. [default: %default]")
optparser.add_option("-f", "--options-file", dest="options_file", metavar="FILE", default="%s.options",
help="Set name of a separate generator options file.")
optparser.add_option("-Q", "--generated-include-format", dest="genformat",
fdesc = descriptor.FileDescriptorSet.FromString(data).file[0]
# Check if there is a separate .options file
+ had_abspath = False
try:
optfilename = options.options_file % os.path.splitext(filename)[0]
except TypeError:
# No %s specified, use the filename as-is
optfilename = options.options_file
-
+ had_abspath = True
+
if os.path.isfile(optfilename):
if options.verbose:
sys.stderr.write('Reading options from ' + optfilename + '\n')
Globals.separate_options = read_options_file(open(optfilename, "rU"))
else:
+ # If we are given a full filename and it does not exist, give an error.
+ # However, don't give error when we automatically look for .options file
+ # with the same name as .proto.
+ if options.verbose or had_abspath:
+ sys.stderr.write('Options file not found: ' + optfilename)
+
Globals.separate_options = []
+
Globals.matched_namemasks = set()
# Parse the file
file_options = get_nanopb_suboptions(fdesc, toplevel_options, Names([filename]))
enums, messages, extensions = parse_file(fdesc, file_options)
-
+
# Decide the file names
noext = os.path.splitext(filename)[0]
- headername = noext + '.' + options.extension + '.h'
- sourcename = noext + '.' + options.extension + '.c'
+ headername = noext + options.extension + '.h'
+ sourcename = noext + options.extension + '.c'
headerbasename = os.path.basename(headername)
# List of .proto files that should not be included in the C header file