Merge pull request #2125 from clausmoltkeleth/master

readtags should be able to read tag files generated for the excmd "combine"

Tmain/readtags-combine.d/backward.tags

@@ -0,0 +1,8 @@
+!_TAG_FILE_FORMAT	2	/extended format; --format=1 will not append ;" to lines/
+!_TAG_FILE_SORTED	1	/0=unsorted, 1=sorted, 2=foldcase/
+!_TAG_OUTPUT_MODE	u-ctags	/u-ctags or e-ctags/
+!_TAG_PROGRAM_AUTHOR	Universal Ctags Team	//
+!_TAG_PROGRAM_NAME	Universal Ctags	/Derived from Exuberant Ctags/
+!_TAG_PROGRAM_URL	https://ctags.io/	/official site/
+!_TAG_PROGRAM_VERSION	0.0.0	/6e3f1aa1/
+foo	input.c	2;?^int foo (void)$?;"	f	typeref:typename:int

Tmain/readtags-combine.d/exit-expected.txt

@@ -0,0 +1 @@
+0

Tmain/readtags-combine.d/forward.tags

@@ -0,0 +1,8 @@
+!_TAG_FILE_FORMAT	2	/extended format; --format=1 will not append ;" to lines/
+!_TAG_FILE_SORTED	1	/0=unsorted, 1=sorted, 2=foldcase/
+!_TAG_OUTPUT_MODE	u-ctags	/u-ctags or e-ctags/
+!_TAG_PROGRAM_AUTHOR	Universal Ctags Team	//
+!_TAG_PROGRAM_NAME	Universal Ctags	/Derived from Exuberant Ctags/
+!_TAG_PROGRAM_URL	https://ctags.io/	/official site/
+!_TAG_PROGRAM_VERSION	0.0.0	/6e3f1aa1/
+foo	input.c	0;/^int foo (void)$/;"	f	typeref:typename:int

Tmain/readtags-combine.d/run.sh

@@ -0,0 +1,18 @@
+#!/bin/sh
+
+# Copyright: 2019 CCI Europe. Author: Claus Moltke-Leth
+# License: GPL-2
+
+READTAGS=$3
+
+. ../utils.sh
+
+#V="valgrind --leak-check=full -v"
+V=
+
+if ! [ -x "${READTAGS}" ]; then
+	skip "no readtags"
+fi
+
+${V} ${READTAGS} -e -t forward.tags -l &&
+${V} ${READTAGS} -e -t backward.tags -l

Tmain/readtags-combine.d/stdout-expected.txt

@@ -0,0 +1,2 @@
+foo	input.c	0;/^int foo (void)$/;"	kind:f	typeref:typename:int
+foo	input.c	2;?^int foo (void)$?;"	kind:f	typeref:typename:int

read/readtags.c

@@ -442,6 +442,7 @@ static void parseTagLine (tagFile *file, tagEntry *const entry)
 		if (tab != NULL)
 		{
 			int fieldsPresent;
+			int combinedPattern;
 			*tab = '\0';
 			p = tab + 1;
 			if (*p == '/'  ||  *p == '?')
@@ -471,6 +472,30 @@ static void parseTagLine (tagFile *file, tagEntry *const entry)
 				entry->address.lineNumber = atol (p);
 				while (isdigit ((int) *(unsigned char*) p))
 					++p;
+				if (p)
+				{
+					combinedPattern = (strncmp (p, ";/", 2) == 0) ||
+											(strncmp (p, ";?", 2) == 0);
+					if (combinedPattern)
+					{
+						++p;
+						/* parse pattern */
+						int delimiter = *(unsigned char*) p;
+						do
+						{
+							p = strchr (p + 1, delimiter);
+						} while (p != NULL
+							 &&  isOdd (countContinuousBackslashesBackward (p - 1,
+													entry->address.pattern)));
+
+						if (p == NULL)
+						{
+							/* invalid pattern */
+						}
+						else
+							++p;
+					}
+				}
 			}
 			else
 			{