Code Review
/
apps
/
agl-service-can-low-level.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Publishing nanopb-0.3.3
[apps/agl-service-can-low-level.git]
/
generator
/
nanopb_generator.py
diff --git
a/generator/nanopb_generator.py
b/generator/nanopb_generator.py
index
4673ac6
..
364a22c
100755
(executable)
--- a/
generator/nanopb_generator.py
+++ b/
generator/nanopb_generator.py
@@
-1,9
+1,10
@@
#!/usr/bin/python
'''Generate header file for nanopb from a ProtoBuf FileDescriptorSet.'''
#!/usr/bin/python
'''Generate header file for nanopb from a ProtoBuf FileDescriptorSet.'''
-nanopb_version = "nanopb-0.3.3
-dev
"
+nanopb_version = "nanopb-0.3.3"
import sys
import sys
+import re
try:
# Add some dummy imports to keep packaging tools happy.
try:
# Add some dummy imports to keep packaging tools happy.
@@
-164,6
+165,13
@@
class Enum:
result = 'typedef enum _%s {\n' % self.names
result += ',\n'.join([" %s = %d" % x for x in self.values])
result += '\n} %s;' % self.names
result = 'typedef enum _%s {\n' % self.names
result += ',\n'.join([" %s = %d" % x for x in self.values])
result += '\n} %s;' % self.names
+
+ if not self.options.long_names:
+ # Define the long names always so that enum value references
+ # from other files work properly.
+ for i, x in enumerate(self.values):
+ result += '\n#define %s %s' % (self.value_longnames[i], x[0])
+
return result
class Field:
return result
class Field:
@@
-1005,9
+1013,8
@@
def generate_header(dependencies, headername, enums, messages, extensions, optio
yield '#define %-40s %s\n' % (identifier, msize)
yield '\n'
yield '#define %-40s %s\n' % (identifier, msize)
yield '\n'
- yield '/* helper macros for message type ids if set with */\n'
- yield '/* option (nanopb_msgopt).msgid = <id>; */\n\n'
-
+ yield '/* Message IDs (where set with "msgid" option) */\n'
+
yield '#ifdef PB_MSGID\n'
for msg in messages:
if hasattr(msg,'msgid'):
yield '#ifdef PB_MSGID\n'
for msg in messages:
if hasattr(msg,'msgid'):
@@
-1026,6
+1033,11
@@
def generate_header(dependencies, headername, enums, messages, extensions, optio
yield '\tPB_MSG(%d,%s,%s) \\\n' % (msg.msgid, m, msg.name)
yield '\n'
yield '\tPB_MSG(%d,%s,%s) \\\n' % (msg.msgid, m, msg.name)
yield '\n'
+ for msg in messages:
+ if hasattr(msg,'msgid'):
+ yield '#define %s_msgid %d\n' % (msg.name, msg.msgid)
+ yield '\n'
+
yield '#endif\n\n'
yield '#endif\n\n'
@@
-1153,9
+1165,13
@@
def read_options_file(infile):
[(namemask, options), ...]
'''
results = []
[(namemask, options), ...]
'''
results = []
- for i, line in enumerate(infile):
+ data = infile.read()
+ data = re.sub('/\*.*?\*/', '', data, flags = re.MULTILINE)
+ data = re.sub('//.*?$', '', data, flags = re.MULTILINE)
+ data = re.sub('#.*?$', '', data, flags = re.MULTILINE)
+ for i, line in enumerate(data.split('\n')):
line = line.strip()
line = line.strip()
- if not line
or line.startswith('//') or line.startswith('#')
:
+ if not line:
continue
parts = line.split(None, 1)
continue
parts = line.split(None, 1)
@@
-1368,8
+1384,15
@@
def main_plugin():
data = sys.stdin.read()
request = plugin_pb2.CodeGeneratorRequest.FromString(data)
data = sys.stdin.read()
request = plugin_pb2.CodeGeneratorRequest.FromString(data)
+ try:
+ # Versions of Python prior to 2.7.3 do not support unicode
+ # input to shlex.split(). Try to convert to str if possible.
+ params = str(request.parameter)
+ except UnicodeEncodeError:
+ params = request.parameter
+
import shlex
import shlex
- args = shlex.split(
request.parameter
)
+ args = shlex.split(
params
)
options, dummy = optparser.parse_args(args)
Globals.verbose_options = options.verbose
options, dummy = optparser.parse_args(args)
Globals.verbose_options = options.verbose