Merge pull request #3141 from karolba/master

ttcn: Skip comments correctly
universal-ctags · Aug 28, 2021 · 61e20a6 · 61e20a6
2 parents e573996 + f769ca3
commit 61e20a6
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/Units/parser-ttcn.r/ttcn-types.d/input.ttcn b/Units/parser-ttcn.r/ttcn-types.d/input.ttcn
@@ -14,7 +14,9 @@ type record Tee
 {
     record of integer nestedIntegersRecord,
     record length (0..5) of integer nestedRangedIntegersRecord,
+    /* a comment */
     set of integer nestedIntegersSet,
+    // a comment
     set length (2..4) of integer nestedRangerdIntegersSet,
     enumerated {e_type1, e_type2} nestedEnum,
     union {Type1 t1, Type2 t2} nestedUnion

diff --git a/parsers/ttcn.c b/parsers/ttcn.c
@@ -344,6 +344,7 @@ static int getNonWhiteSpaceChar (void)
 			{
 				/* Line comment */
 				while (((c = getcFromInputFile()) != EOF) && (c != '\n'));
+				continue;
 			}
 			else if (c2=='*')
 			{
@@ -358,6 +359,7 @@ static int getNonWhiteSpaceChar (void)
 						ungetcToInputFile(c2);
 					}
 				}
+				continue;
 			}
 			else
 			{