Pascal: fix looking for an identifier when there's a comment

universal-ctags · Dec 2, 2021 · 37b2ed7 · 37b2ed7
1 parent 5db3b42
commit 37b2ed7
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 0 deletions.
diff --git a/Units/parser-pascal.r/comment-after-keyword.d/expected.tags b/Units/parser-pascal.r/comment-after-keyword.d/expected.tags
@@ -0,0 +1 @@
+Fun1	input.pas	/^function {} Fun1: integer;$/;"	f	typeref:typename:integer
diff --git a/Units/parser-pascal.r/comment-after-keyword.d/input.pas b/Units/parser-pascal.r/comment-after-keyword.d/input.pas
@@ -0,0 +1,10 @@
+program hello;
+
+function {} Fun1: integer;
+begin
+   Fun1 := 1;
+end;
+
+begin
+   Fun1();
+end.
diff --git a/parsers/pascal.c b/parsers/pascal.c
@@ -290,6 +290,8 @@ static void findPascalTags (void)
 			/* grab block name */
 			while (isspace ((int) *dbp))
 				++dbp;
+			if (!starttoken(*dbp))
+				continue;
 			for (cp = dbp  ;  *cp != '\0' && !endtoken (*cp)  ;  cp++)
 				continue;
 			vStringNCopyS (name, (const char*) dbp,  cp - dbp);