From 88f2dc5810b88f88b516bb6f11fc3cba1c255655 Mon Sep 17 00:00:00 2001
From: Petteri Aimonen <jpa@git.mail.kapsi.fi>
Date: Fri, 3 Apr 2015 20:43:13 +0300
Subject: Improve comment support in .options files.

Update issue 145
Status: FixedInGit
---
 tests/regression/issue_145/SConscript        | 9 +++++++++
 tests/regression/issue_145/comments.expected | 3 +++
 tests/regression/issue_145/comments.options  | 6 ++++++
 tests/regression/issue_145/comments.proto    | 5 +++++
 4 files changed, 23 insertions(+)
 create mode 100644 tests/regression/issue_145/SConscript
 create mode 100644 tests/regression/issue_145/comments.expected
 create mode 100644 tests/regression/issue_145/comments.options
 create mode 100644 tests/regression/issue_145/comments.proto

(limited to 'tests/regression')

diff --git a/tests/regression/issue_145/SConscript b/tests/regression/issue_145/SConscript
new file mode 100644
index 00000000..0b793a7a
--- /dev/null
+++ b/tests/regression/issue_145/SConscript
@@ -0,0 +1,9 @@
+# Regression test for Issue 145: Allow /* */ and // comments in .options files
+
+Import("env")
+
+env.NanopbProto(["comments", "comments.options"])
+env.Object('comments.pb.c')
+
+env.Match(['comments.pb.h', 'comments.expected'])
+
diff --git a/tests/regression/issue_145/comments.expected b/tests/regression/issue_145/comments.expected
new file mode 100644
index 00000000..7f874587
--- /dev/null
+++ b/tests/regression/issue_145/comments.expected
@@ -0,0 +1,3 @@
+char foo\[5\];
+char bar\[16\];
+
diff --git a/tests/regression/issue_145/comments.options b/tests/regression/issue_145/comments.options
new file mode 100644
index 00000000..89959ba2
--- /dev/null
+++ b/tests/regression/issue_145/comments.options
@@ -0,0 +1,6 @@
+/* Block comment */
+# Line comment
+// Line comment
+DummyMessage.foo /* Block comment */ max_size:5
+DummyMessage.bar max_size:16 # Line comment ###
+
diff --git a/tests/regression/issue_145/comments.proto b/tests/regression/issue_145/comments.proto
new file mode 100644
index 00000000..4e86b302
--- /dev/null
+++ b/tests/regression/issue_145/comments.proto
@@ -0,0 +1,5 @@
+message DummyMessage {
+    required string foo = 1;
+    required string bar = 2;
+}
+
-- 
cgit 1.2.3-korg