rik/nanopb
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add proper suffixes for integer default values.

Browse Source 
Update issue 102
Status: FixedInGit
This commit is contained in:
Petteri Aimonen
2014-02-04 20:24:44 +02:00
parent 5efeb392e0
commit a2f8112166
2 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
generator/nanopb_generator.py
View File

@@ -315,6 +315,12 @@ class Field:
data = self.default.decode('string_escape') data = self.default.decode('string_escape')
data = ['0x%02x' % ord(c) for c in data] data = ['0x%02x' % ord(c) for c in data]
default = '{%d, {%s}}' % (len(data), ','.join(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: if declaration_only:
return 'extern const %s %s_default%s;' % (ctype, self.struct_name + self.name, array_decl) return 'extern const %s %s_default%s;' % (ctype, self.struct_name + self.name, array_decl)

20
tests/alltypes/alltypes.proto
View File

@@ -14,16 +14,16 @@ enum HugeEnum {
} }
message Limits { message Limits {
required int32 int32_min = 1; required int32 int32_min = 1 [default = 2147483647];
required int32 int32_max = 2; required int32 int32_max = 2 [default = -2147483648];
required uint32 uint32_min = 3; required uint32 uint32_min = 3 [default = 4294967295];
required uint32 uint32_max = 4; required uint32 uint32_max = 4 [default = 0];
required int64 int64_min = 5; required int64 int64_min = 5 [default = 9223372036854775807];
required int64 int64_max = 6; required int64 int64_max = 6 [default = -9223372036854775807]; /* GCC gives a warning about -2**63, so just avoid the trouble for now.. */
required uint64 uint64_min = 7; required uint64 uint64_min = 7 [default = 18446744073709551615];
required uint64 uint64_max = 8; required uint64 uint64_max = 8 [default = 0];
required HugeEnum enum_min = 9; required HugeEnum enum_min = 9 [default = Positive];
required HugeEnum enum_max = 10; required HugeEnum enum_max = 10 [default = Negative];
} }
enum MyEnum { enum MyEnum {