summaryrefslogtreecommitdiffstats
path: root/generator
diff options
context:
space:
mode:
authorPetteri Aimonen <jpa@git.mail.kapsi.fi>2014-07-20 14:02:56 +0300
committerPetteri Aimonen <jpa@git.mail.kapsi.fi>2014-07-20 14:02:56 +0300
commitf2f9f8a9ed2f59e4ed229f09fc95f9168cc4b473 (patch)
tree645afbebb2e9774723edfbbf916a00f4bf739e3e /generator
parent788d2825b06426f50064dc5f29b07ce0be105b2b (diff)
Fix problem with .options file and extension fields.
The options for an extension field were being looked up under wrong name (MessageName instead of MessageName.fieldname). Fixed the problem and added regression test. Created a new subfolder for regression test cases. Update issue 125 Status: FixedInGit
Diffstat (limited to 'generator')
-rwxr-xr-xgenerator/nanopb_generator.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/generator/nanopb_generator.py b/generator/nanopb_generator.py
index 1f263a74..3bc8b39a 100755
--- a/generator/nanopb_generator.py
+++ b/generator/nanopb_generator.py
@@ -645,7 +645,7 @@ def parse_file(fdesc, file_options):
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))