Merge pull request #3578 from masatake/readtags--escaping-input-fields

readtags: print the input fields literally even if -E option is given

Author: masatake

Tmain/readtags-escaping-input-no-roundtrip.d/output.tags

@@ -0,0 +1 @@
+x	a\tb\nc/f.c	/^int x;$/;"	kind:v	typeref:typename:int

Tmain/readtags-escaping-input-no-roundtrip.d/run.sh

@@ -0,0 +1,15 @@
+#!/bin/sh
+
+# Copyright: 2022 Masatake YAMATO
+# License: GPL-2
+
+READTAGS=$3
+
+. ../utils.sh
+
+if ! [ -x "${READTAGS}" ]; then
+	skip "no readtags"
+fi
+
+${READTAGS} -eE -t output.tags -l
+${READTAGS} -e  -t output.tags -l

Tmain/readtags-escaping-input-no-roundtrip.d/stderr-expected.txt

@@ -0,0 +1,2 @@
+x	a\tb\nc/f.c	/^int x;$/;"	kind:v	typeref:typename:int
+x	a\tb\nc/f.c	/^int x;$/;"	kind:v	typeref:typename:int

Tmain/readtags-escaping-input-no-roundtrip.d/stdout-expected.txt

@@ -0,0 +1,29 @@
+#!/bin/sh
+
+# Copyright: 2022 Masatake YAMATO
+# License: GPL-2
+
+CTAGS=$1
+READTAGS=$3
+INPUT=$(printf "a\tb\nc")
+
+. ../utils.sh
+
+exit_if_win32
+
+if ! [ -x "${READTAGS}" ]; then
+	skip "no readtags"
+fi
+
+mkdir -p "${INPUT}"
+echo "int x;" > "${INPUT}/f.c"
+
+O="--quiet --options=NONE -o - -R --fields=+z"
+echo "# ctags:"
+${CTAGS} $O "${INPUT}"
+
+echo "# ctags | readtags:"
+${CTAGS} $O "${INPUT}" | ${READTAGS} -eE -t - -l
+
+rm -f "${INPUT}/f.c"
+rmdir "${INPUT}"

Tmain/readtags-escaping-input.d/run.sh

@@ -0,0 +1,4 @@
+# ctags:
+x	a\tb\nc/f.c	/^int x;$/;"	kind:v	typeref:typename:int
+# ctags | readtags:
+x	a\tb\nc/f.c	/^int x;$/;"	kind:v	typeref:typename:int

Tmain/readtags-escaping-input.d/stderr-expected.txt

@@ -8,13 +8,13 @@ regular_tag\\	/path/to/file	/^pattern$/
 regular_tag\t	/path/to/file	/^pattern$/
 
 # regular-input-b_.tags
-regular_tag	/path/to/file\\	/^pattern$/
+regular_tag	/path/to/file\	/^pattern$/
 
 # regular-input-bb.tags
-regular_tag	/path/to/file\\\\	/^pattern$/
+regular_tag	/path/to/file\\	/^pattern$/
 
 # regular-input-bt.tags
-regular_tag	/path/to/file\\t	/^pattern$/
+regular_tag	/path/to/file\t	/^pattern$/
 
 # regular-kind-b_.tags
 regular_tag	/path/to/file	/^pattern$/;"	kind:\\
@@ -32,11 +32,11 @@ regular_tag	/path/to/file	/^pattern$/;"	kind:\\
 !_PTAG\t	value	/comment/
 
 # pseudo-input-b_.tags
-!_PTAG	value\\	/comment/
+!_PTAG	value\	/comment/
 
 # pseudo-input-bb.tags
-!_PTAG	value\\\\	/comment/
+!_PTAG	value\\	/comment/
 
 # pseudo-input-bt.tags
-!_PTAG	value\\t	/comment/
+!_PTAG	value\t	/comment/
 

Tmain/readtags-escaping-input.d/stdout-expected.txt

@@ -142,8 +142,7 @@ static void tagsPrintTag (const tagEntry *entry,
 					print_str, print_char, outfp);
 
 	print_char ('\t', outfp);
-	printValue  (entry->file, printingWithEscaping,
-				 print_str, print_char, outfp);
+	print_str (entry->file, outfp);
 	print_char ('\t', outfp);
 	print_str (entry->address.pattern, outfp);