From d8bddabb8372d1c684d7cd7cf4bb04131acb9ff1 Mon Sep 17 00:00:00 2001
From: Petteri Aimonen <jpa@git.mail.kapsi.fi>
Date: Thu, 5 Jul 2012 20:02:06 +0300
Subject: Fix bug with .proto without messages (again), and add a test case for
 it.

---
 generator/nanopb_generator.py | 19 ++++++++++---------
 tests/Makefile                |  3 ++-
 tests/no_messages.proto       |  7 +++++++
 3 files changed, 19 insertions(+), 10 deletions(-)
 create mode 100644 tests/no_messages.proto

diff --git a/generator/nanopb_generator.py b/generator/nanopb_generator.py
index 1923cc1c..b9018aeb 100644
--- a/generator/nanopb_generator.py
+++ b/generator/nanopb_generator.py
@@ -414,15 +414,16 @@ def generate_header(dependencies, headername, enums, messages):
     for msg in messages:
         yield msg.fields_declaration() + '\n'
     
-    count_required_fields = lambda m: len([f for f in msg.fields if f.htype == 'PB_HTYPE_REQUIRED'])
-    largest_msg = max(messages, key = count_required_fields)
-    largest_count = count_required_fields(largest_msg)
-    if largest_count > 64:
-        yield '\n/* Check that missing required fields will be properly detected */\n'
-        yield '#if PB_MAX_REQUIRED_FIELDS < %d\n' % largest_count
-        yield '#error Properly detecting missing required fields in %s requires \\\n' % largest_msg.name
-        yield '       setting PB_MAX_REQUIRED_FIELDS to %d or more.\n' % largest_count
-        yield '#endif\n'
+    if messages:
+        count_required_fields = lambda m: len([f for f in msg.fields if f.htype == 'PB_HTYPE_REQUIRED'])
+        largest_msg = max(messages, key = count_required_fields)
+        largest_count = count_required_fields(largest_msg)
+        if largest_count > 64:
+            yield '\n/* Check that missing required fields will be properly detected */\n'
+            yield '#if PB_MAX_REQUIRED_FIELDS < %d\n' % largest_count
+            yield '#error Properly detecting missing required fields in %s requires \\\n' % largest_msg.name
+            yield '       setting PB_MAX_REQUIRED_FIELDS to %d or more.\n' % largest_count
+            yield '#endif\n'
     
     worst = 0
     worst_field = ''
diff --git a/tests/Makefile b/tests/Makefile
index 24e9ba62..8c063f30 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -1,7 +1,7 @@
 CFLAGS=-ansi -Wall -Werror -I .. -g -O0 --coverage
 LDFLAGS=--coverage
 DEPS=../pb_decode.h ../pb_encode.h ../pb.h person.pb.h callbacks.pb.h unittests.h unittestproto.pb.h alltypes.pb.h missing_fields.pb.h
-TESTS=test_decode1 test_encode1 decode_unittests encode_unittests
+TESTS=test_decode1 test_encode1 decode_unittests encode_unittests test_no_messages
 
 all: breakpoints $(TESTS) run_unittests
 
@@ -28,6 +28,7 @@ test_encode_callbacks: test_encode_callbacks.o pb_encode.o callbacks.pb.o
 test_missing_fields: test_missing_fields.o pb_encode.o pb_decode.o missing_fields.pb.o
 decode_unittests: decode_unittests.o pb_decode.o unittestproto.pb.o
 encode_unittests: encode_unittests.o pb_encode.o unittestproto.pb.o
+test_no_messages: no_messages.pb.h no_messages.pb.c no_messages.pb.o
 
 %.pb: %.proto
 	protoc -I. -I../generator -I/usr/include -o$@ $<
diff --git a/tests/no_messages.proto b/tests/no_messages.proto
new file mode 100644
index 00000000..279216b0
--- /dev/null
+++ b/tests/no_messages.proto
@@ -0,0 +1,7 @@
+/* Test that a file without any messages works. */
+
+enum Test {
+    First = 1;
+}
+
+
-- 
cgit 1.2.3-korg