ctags.rb 1.1.3 → 1.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cfbac3daba802b08417f169179cad4065c970508
-  data.tar.gz: 2d857ac04dbdf3d888cf5d15ec5603d3209d2f64
+  metadata.gz: 8b821271b05b1a17a231a6f4a082836b0cec4e26
+  data.tar.gz: 12ac7ea29a1741618a50f0405a6ba478e0d81717
 SHA512:
-  metadata.gz: c59dc1ea1a051d3fad425ed522570db502d3d5494601d709fffab79f4915f47a2e0d496358734e0fc2aac5738f59c4a5e5c96333f964d8c411b6277b286836dc
-  data.tar.gz: 8d0a10102b4f6436443cca2f61797d1952423c956c18f724834155cb808f7f4e6966a379583ed99678d28c02275e46fa2cedc2b8ca7ee5082d723c1e3ce44295
+  metadata.gz: bd09d22aba9136f883c26c2525530f6d430c471bbd62cbfcde7d910b6291135f58acaa74f5873d49ad7eecf64bb83360bac6200f9f2c98e932ec9c35743c38e4
+  data.tar.gz: fbd5e1366c696c39aafcc0451f6227813145427cbdca1b2dde776477dd2cf907af4bbf8a36f15dd0e6ac26e1fddef4fea4865289fadb505bd7add88fce41f218

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ctags.rb (1.1.3)
+    ctags.rb (1.1.4)
       posix-spawn (~> 0.3.6)
       ripper-tags (~> 0.1.3)
       yajl-ruby

data/ext/extconf.rb

@@ -17,7 +17,7 @@ xsystem('pwd') # to create mkmf.log before the chdir
 
 Dir.chdir("#{CWD}/vendor/jansson-2.9") do
   sys "./configure --prefix=#{CWD}/dst --disable-shared" unless File.exists?('config.h')
-  sys "touch *"
+  sys "touch configure aclocal.m4 Makefile.am Makefile.in"
   sys "make install"
 end
 

data/ext/vendor/ctags/Tmain/input-encoding-option.d/tags-expected.txt

@@ -1,6 +1,7 @@
 !_TAG_FILE_ENCODING	UTF-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/

data/ext/vendor/ctags/Tmain/interactive-mode.d/run.sh

@@ -2,6 +2,9 @@
 # License: GPL-2
 
 CTAGS=$1
+. ../utils.sh
+
+is_feature_available ${CTAGS} interactive
 
 echo identification message on startup
 echo =======================================
@@ -38,7 +41,7 @@ echo =======================================
 echo
 echo generate tags from data
 echo =======================================
-size=$(stat -f %z test.rb)
+size=$(filesize test.rb)
 (
   echo '{"command":"generate-tags", "filename":"test.rb", "size":'$size'}'
   cat test.rb

data/ext/vendor/ctags/Tmain/json-output-format.d/input.go

@@ -0,0 +1,4 @@
+package main
+
+func main() {
+}

data/ext/vendor/ctags/Tmain/json-output-format.d/stdout-expected.txt

@@ -2,10 +2,14 @@
 {"_type": "tag", "name": "Foo", "path": "input.py", "pattern": "/^class Foo:$/", "kind": "class"}
 {"_type": "tag", "name": "doIt", "path": "input.py", "pattern": "/^    def doIt():$/", "kind": "member", "scope": "Foo", "scopeKind": "class"}
 {"_type": "tag", "name": "main", "path": "input.c", "pattern": "/^main(void)$/", "typeref": "int", "kind": "function"}
+{"_type": "tag", "name": "main", "path": "input.go", "pattern": "/^func main() {$/", "kind": "func"}
+{"_type": "tag", "name": "main", "path": "input.go", "pattern": "/^package main$/", "kind": "package"}
 # json --fields=*
 {"_type": "tag", "name": "Foo", "path": "input.py", "pattern": "/^class Foo:$/", "access": "public", "inherits": "", "language": "Python", "line": 1, "kind": "class", "end": "3"}
 {"_type": "tag", "name": "doIt", "path": "input.py", "pattern": "/^    def doIt():$/", "access": "public", "language": "Python", "line": 2, "signature": "()", "kind": "member", "scope": "Foo", "scopeKind": "class", "end": "3"}
 {"_type": "tag", "name": "main", "path": "input.c", "pattern": "/^main(void)$/", "language": "C", "line": 4, "signature": "(void)", "typeref": "int", "kind": "function", "end": "7"}
+{"_type": "tag", "name": "main", "path": "input.go", "pattern": "/^func main() {$/", "language": "Go", "line": 3, "signature": "()", "kind": "func"}
+{"_type": "tag", "name": "main", "path": "input.go", "pattern": "/^package main$/", "language": "Go", "line": 1, "kind": "package"}
 # json --fields=* --extra=*
 {"_type": "ptag", "name": "JSON_OUTPUT_VERSION", "path": "0.0", "pattern": "in development"}
 {"_type": "ptag", "name": "TAG_FILE_FORMAT", "path": "2", "pattern": "extended format; --format=1 will not append ;\" to lines"}
@@ -16,7 +20,11 @@
 {"_type": "tag", "name": "Foo", "path": "input.py", "pattern": "/^class Foo:$/", "access": "public", "inherits": "", "language": "Python", "line": 1, "kind": "class", "end": "3"}
 {"_type": "tag", "name": "Foo.doIt", "path": "input.py", "pattern": "/^    def doIt():$/", "access": "public", "language": "Python", "line": 2, "signature": "()", "kind": "member", "scope": "Foo", "extra": "qualified", "scopeKind": "class", "end": "3"}
 {"_type": "tag", "name": "doIt", "path": "input.py", "pattern": "/^    def doIt():$/", "access": "public", "language": "Python", "line": 2, "signature": "()", "kind": "member", "scope": "Foo", "scopeKind": "class", "end": "3"}
-{"_type": "tag", "name": "input.c", "path": "input.c", "pattern": "", "language": "C", "line": 1, "kind": "file", "extra": "inputFile", "end": "7"}
-{"_type": "tag", "name": "input.py", "path": "input.py", "pattern": "", "language": "Python", "line": 1, "kind": "file", "extra": "inputFile", "end": "3"}
+{"_type": "tag", "name": "input.c", "path": "input.c", "pattern": "/^}$/", "language": "C", "line": 1, "kind": "file", "extra": "inputFile", "end": "7"}
+{"_type": "tag", "name": "input.go", "path": "input.go", "pattern": "/^}$/", "language": "Go", "line": 1, "kind": "file", "extra": "inputFile", "end": "4"}
+{"_type": "tag", "name": "input.py", "path": "input.py", "pattern": "/^        pass$/", "language": "Python", "line": 1, "kind": "file", "extra": "inputFile", "end": "3"}
 {"_type": "tag", "name": "main", "path": "input.c", "pattern": "/^main(void)$/", "language": "C", "line": 4, "signature": "(void)", "typeref": "int", "kind": "function", "end": "7"}
+{"_type": "tag", "name": "main", "path": "input.go", "pattern": "/^func main() {$/", "language": "Go", "line": 3, "signature": "()", "kind": "func"}
+{"_type": "tag", "name": "main", "path": "input.go", "pattern": "/^package main$/", "language": "Go", "line": 1, "kind": "package"}
+{"_type": "tag", "name": "main.main", "path": "input.go", "pattern": "/^func main() {$/", "language": "Go", "line": 3, "signature": "()", "kind": "func", "extra": "qualified"}
 {"_type": "tag", "name": "stdio.h", "path": "input.c", "pattern": "/^#include <stdio.h>/", "language": "C", "line": 1, "kind": "header", "role": "system", "extra": "reference"}

data/ext/vendor/ctags/Tmain/list-pseudo-tags.d/stdout-expected.txt

@@ -7,3 +7,4 @@ TAG_PROGRAM_URL	the official site URL of this ctags implementation	on
 TAG_PROGRAM_VERSION	the version of this ctags implementation	on
 TAG_KIND_SEPARATOR	the separators used in kinds	off
 TAG_KIND_DESCRIPTION	the letters, names and descriptions of kinds in a parser	off
+TAG_OUTPUT_MODE	the output mode: u-ctags or e-ctags	on

data/ext/vendor/ctags/Tmain/output-encoding-option.d/tags-expected.txt

@@ -1,6 +1,7 @@
 !_TAG_FILE_ENCODING	cp932	//
 !_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/

data/ext/vendor/ctags/Tmain/output-format-option.d/run.sh

@@ -5,6 +5,6 @@ CTAGS=$1
 
 . ../utils.sh
 
-run_with_format ctags
+run_with_format u-ctags
 run_with_format etags
 run_with_format xref

data/ext/vendor/ctags/Tmain/output-format-option.d/stdout-expected.txt

@@ -1,4 +1,4 @@
-# ctags
+# u-ctags
 main	input.c	/^main(void)$/;"	f	typeref:typename:int
 # etags
 

data/ext/vendor/ctags/Tmain/output-input-field-with-no-escape.d/run.sh

@@ -0,0 +1,20 @@
+# Copyright: 2016 Masatake YAMATO
+# License: GPL-2
+
+. ../utils.sh
+
+CTAGS=$1
+
+
+
+if ! ( echo '#define foo' > 'a\b.c' ) 2> /dev/null; then
+	   skip "unsuitable platform to run this test"
+fi
+
+echo '# u-ctags'
+${CTAGS} --pseudo-tags=TAG_OUTPUT_MODE --extra=+p --output-format=u-ctags -o - 'a\b.c'
+
+echo '# e-ctags'
+${CTAGS} --pseudo-tags=TAG_OUTPUT_MODE --extra=+p --output-format=e-ctags -o - 'a\b.c'
+
+rm 'a\b.c'

data/ext/vendor/ctags/Tmain/output-input-field-with-no-escape.d/stdout-expected.txt

@@ -0,0 +1,6 @@
+# u-ctags
+!_TAG_OUTPUT_MODE	u-ctags	/u-ctags or e-ctags/
+foo	a\\b.c	/^#define foo$/;"	d	file:
+# e-ctags
+!_TAG_OUTPUT_MODE	e-ctags	/u-ctags or e-ctags/
+foo	a\b.c	/^#define foo$/;"	d	file:

data/ext/vendor/ctags/Tmain/ptag-kind-desc.d/stdout-expected.txt

@@ -4,6 +4,7 @@
 !_TAG_KIND_DESCRIPTION!Sh	a,alias	/aliases/
 !_TAG_KIND_DESCRIPTION!Sh	f,function	/functions/
 !_TAG_KIND_DESCRIPTION!Sh	s,script	/script files/
+!_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/
@@ -11,6 +12,7 @@
 !_TAG_FILE_FORMAT	2	/extended format; --format=1 will not append ;" to lines/
 !_TAG_FILE_SORTED	1	/0=unsorted, 1=sorted, 2=foldcase/
 !_TAG_KIND_DESCRIPTION!foo	k,kind	/kinds/
+!_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/

data/ext/vendor/ctags/Tmain/tags-pseudo-tags.d/stdout-expected.txt

@@ -19,6 +19,7 @@
 !_TAG_KIND_SEPARATOR!PHP	\\	/nn/
 !_TAG_KIND_SEPARATOR!PHP	\\	/nt/
 !_TAG_KIND_SEPARATOR!PHP	\\	/nv/
+!_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/

data/ext/vendor/ctags/Tmain/utils.sh

@@ -1,19 +1,29 @@
 __SKIP__=77
 
+skip()
+{
+	echo "$@"
+	exit ${__SKIP__}
+}
+
 remove_commit_id()
 {
     # Remove a commit id embedded in tags file
     sed -i -e '/!_TAG_PROGRAM_VERSION.*/s#/[^/]*/#//#' $1
 }
 
+filesize()
+{
+    wc -c "$1" | awk '{ print $1 }'
+}
+
 is_feature_available()
 {
     local ctags=$1
     local feat=$2
 
     if ! ${ctags} --list-features | grep -q "$feat"; then
-	echo "feature \"$feat\" is not available in $ctags"
-	exit ${__SKIP__}
+		skip "feature \"$feat\" is not available in $ctags"
     fi
 }
 

data/ext/vendor/ctags/Units/parser-php.r/php-full-qualified-tags-no-esc.d/args.ctags

@@ -0,0 +1,4 @@
+--extra=+qp
+--output-format=e-ctags
+--pseudo-tags=TAG_OUTPUT_MODE
+

data/ext/vendor/ctags/Units/parser-php.r/php-full-qualified-tags-no-esc.d/expected.tags

@@ -0,0 +1,6 @@
+!_TAG_OUTPUT_MODE	e-ctags	/u-ctags or e-ctags/
+__construct	input.php	/^    public function __construct() {$/;"	f	class:foo\bar
+bar	input.php	/^class bar {$/;"	c	namespace:foo
+foo	input.php	/^namespace foo;$/;"	n
+foo\bar	input.php	/^class bar {$/;"	c	namespace:foo
+foo\bar::__construct	input.php	/^    public function __construct() {$/;"	f	class:foo\bar

data/ext/vendor/ctags/Units/parser-php.r/php-full-qualified-tags-no-esc.d/input.php

@@ -0,0 +1,10 @@
+Taken from an issue report (#787) by @sserbin
+
+<?php
+namespace foo;
+
+class bar {
+    public function __construct() {
+    }
+}
+>

data/ext/vendor/ctags/docs/contributions.rst

@@ -141,6 +141,7 @@ GNU style:
 		...
 
 non-GNU style:
+
 .. code-block:: C
 
 	if (...)

data/ext/vendor/ctags/docs/format.rst

@@ -472,3 +472,16 @@ Exceptions
    this exceptions. See {tagname} of Proposal section for more detail
    about the conversion.
 
+.. _compat-output:
+Compatible output and weakness
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. NOT REVIEWED YET
+
+Default behavior (``--output-format=u-ctags`` option) has the
+exceptions.  In ther hand, with ``--output-format=e-ctags`` option
+ctags has no exception; Universal-ctags command may use the same file
+format as Exuberant-ctags. However, ``--output-format=e-ctags`` throws
+away a tag entry which name includes a space or a tab
+character. ``TAG_OUTPUT_MODE`` psuedo tag tells which format is
+used when ctags generating tags file.

data/ext/vendor/ctags/docs/interactive-mode.rst

@@ -0,0 +1,61 @@
+.. _interactive-mode:
+
+======================================================================
+``--interactive`` Mode
+======================================================================
+
+Universtal ctags can be run with ``--interactive``, which enters a REPL that
+can be used programatically to control ctags generation. In this mode, json
+commands are received over stdin, and corresponding responses are emitted over
+stdout.
+
+Communication with Universal ctags over stdio uses the `json lines`_ format, where each
+json object appears on a single line and is terminated with a newline.
+
+When ``ctags --interactive`` is invoked, it will emit a single json object to stdout announcing
+its name and version. This signals the start of the interactive loop, and the user can begin sending
+commands over stdin.
+
+.. code-block:: console
+
+    $ ctags --interactive
+    {"name": "Universal Ctags", "version": "0.0.0"}
+
+The following commands are currently supported in interactive mode:
+
+- generate-tags_
+
+generate-tags
+-------------
+
+The ``generate-tags`` command takes two arguments:
+
+- ``filename``: name of the file to generate tags for (required)
+- ``size``: size in bytes of the file, if the contents will be received over stdin (optional)
+
+The simplest way to generate tags for a file is by passing its path on disk. The response will include
+one json object per line representing each tag, followed by a single json object with the ``completed``
+field emitted once the file has been fully processed.
+
+.. code-block:: console
+
+    $ echo '{"command":"generate-tags", "filename":"test.rb"}' | ctags --interactive
+    {"name": "Universal Ctags", "version": "0.0.0"}
+    {"_type": "tag", "name": "foobar", "path": "test.rb", "pattern": "/^  def foobar$/", "kind": "method", "scope": "Test", "scopeKind": "class"}
+    {"completed": "generate-tags"}
+
+The ``generate-tags`` command can also be used to generate tags for code which is not present on disk. For example,
+an IDE might want to generate ctags for an unsaved buffer while the user is editing code. When ``size`` is specified,
+the corresponding number of bytes are read over stdin after the json object and newline.
+
+.. code-block:: console
+
+    $ (
+      echo '{"command":"generate-tags", "filename":"test.rb", "size": 17}'
+      echo 'def foobaz() end'
+    ) | ctags --interactive
+    {"name": "Universal Ctags", "version": "0.0.0"}
+    {"_type": "tag", "name": "foobaz", "path": "test.rb", "pattern": "/^def foobaz() end$/", "kind": "method"}
+    {"completed": "generate-tags"}
+
+.. _json lines: http://jsonlines.org/

data/ext/vendor/ctags/docs/news.rst

@@ -284,7 +284,7 @@ header is easy because it starts with a `#` character.
 ``--with-list-header=no`` suppresses output of the column header.
 
 Kinds synchronization
-----------------------------------------------------------------------
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 In Universal-ctags, as in Exuberant-ctags, most kinds are parser
 local; enabling (or disabling) a kind in a parser has no effect on
@@ -589,6 +589,13 @@ will be processed as
 
 	int x(int a,int b);
 
+``--interactive`` Mode
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+A new ``--interactive`` option launches a JSON based command REPL which
+can be used to control ctags generation programatically.
+
+See :ref:`--interactive Mode <interactive-mode>` for more details.
 
 Changes to the tags file format
 ---------------------------------------------------------------------
@@ -873,6 +880,14 @@ The third line means `\\` is used when for combining a namespace item
 Of course, ctags uses the more specific line when choosing a
 separator; the third line has higher priority than the first.
 
+``TAG_OUTPUT_MODE``
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. NOT REVIEWED YET
+
+This pseudo tag represents output mode: u-ctags or e-ctags.
+
+See also :ref:`Compatible output and weakness <compat-output>`.
 
 Parser own fields
 ---------------------------------------------------------------------

data/ext/vendor/ctags/docs/output-format.rst

@@ -17,3 +17,4 @@ This section deals with individual output-format topics.
 	:maxdepth: 2
 
 	output-json.rst
+	output-xref.rst

data/ext/vendor/ctags/docs/output-xref.rst

@@ -0,0 +1,10 @@
+.. _output-xref:
+
+.. NOT REVIEWED YET
+
+======================================================================
+Xref output
+======================================================================
+
+* Priting `z`{kind} field in xref format doesn't include `kind:` prefix.
+* Priting `Z`{scope} field in xref format doesn't include `scope:` prefix.

data/ext/vendor/ctags/main/entry.c

@@ -1040,21 +1040,14 @@ static unsigned int queueTagEntry(const tagEntryInfo *const tag)
 }
 
 
-static void buildFqTagCache (const tagEntryInfo *const tag)
-{
-	/* TODO: WRITER_DEFAULT should not be used here.*/
-	renderFieldEscaped (WRITER_DEFAULT, FIELD_SCOPE_KIND_LONG, tag, NO_PARSER_FIELD);
-	renderFieldEscaped (WRITER_DEFAULT, FIELD_SCOPE, tag, NO_PARSER_FIELD);
-}
-
 extern void setupWriter (void)
 {
 	writerSetup (TagFile.mio);
 }
 
-extern void teardownWriter (const char *filename)
+extern bool teardownWriter (const char *filename)
 {
-	writerTeardown (TagFile.mio, filename);
+	return writerTeardown (TagFile.mio, filename);
 }
 
 static void writeTagEntry (const tagEntryInfo *const tag)
@@ -1074,7 +1067,10 @@ static void writeTagEntry (const tagEntryInfo *const tag)
 	if (includeExtensionFlags ()
 	    && isXtagEnabled (XTAG_QUALIFIED_TAGS)
 	    && doesInputLanguageRequestAutomaticFQTag ())
-		buildFqTagCache (tag);
+	{
+		/* const is discarded to update the cache field of TAG. */
+		writerBuildFqTagCache ( (tagEntryInfo *const)tag);
+	}
 
 	length = writerWriteTag (TagFile.mio, tag);
 

data/ext/vendor/ctags/main/entry.h

@@ -113,7 +113,7 @@ extern const char *tagFileName (void);
 extern void openTagFile (void);
 extern void closeTagFile (const bool resize);
 extern void  setupWriter (void);
-extern void  teardownWriter (const char *inputFilename);
+extern bool  teardownWriter (const char *inputFilename);
 extern int makeTagEntry (const tagEntryInfo *const tag);
 extern void initTagEntry (tagEntryInfo *const e, const char *const name,
 			  const kindOption *kind);

data/ext/vendor/ctags/main/field.c

@@ -35,27 +35,33 @@ struct sFieldDesc {
 	fieldType sibling;
 };
 
-static const char *renderFieldName (const tagEntryInfo *const tag, const char *value, vString* b);
-static const char *renderFieldInput (const tagEntryInfo *const tag, const char *value, vString* b);
-static const char *renderFieldCompactInputLine (const tagEntryInfo *const tag, const char *value, vString* b);
-static const char *renderFieldSignature (const tagEntryInfo *const tag, const char *value, vString* b);
-static const char *renderFieldScope (const tagEntryInfo *const tag, const char *value, vString* b);
-static const char *renderFieldTyperef (const tagEntryInfo *const tag, const char *value, vString* b);
-static const char *renderFieldInherits (const tagEntryInfo *const tag, const char *value, vString* b);
-static const char *renderFieldKindName (const tagEntryInfo *const tag, const char *value, vString* b);
-static const char *renderFieldLineNumber (const tagEntryInfo *const tag, const char *value, vString* b);
-static const char *renderFieldLanguage (const tagEntryInfo *const tag, const char *value, vString* b);
-static const char *renderFieldAccess (const tagEntryInfo *const tag, const char *value, vString* b);
-static const char *renderFieldKindLetter (const tagEntryInfo *const tag, const char *value, vString* b);
-static const char *renderFieldImplementation (const tagEntryInfo *const tag, const char *value, vString* b);
-static const char *renderFieldFile (const tagEntryInfo *const tag, const char *value, vString* b);
-static const char *renderFieldPattern (const tagEntryInfo *const tag, const char *value, vString* b);
-static const char *renderFieldRole (const tagEntryInfo *const tag, const char *value, vString* b);
-static const char *renderFieldRefMarker (const tagEntryInfo *const tag, const char *value, vString* b);
-static const char *renderFieldExtra (const tagEntryInfo *const tag, const char *value, vString* b);
-static const char *renderFieldXpath (const tagEntryInfo *const tag, const char *value, vString* b);
-static const char *renderFieldScopeKindName(const tagEntryInfo *const tag, const char *value, vString* b);
-static const char *renderFieldEnd (const tagEntryInfo *const tag, const char *value, vString* b);
+static const char *renderFieldName (const tagEntryInfo *const tag, const char *value, vString* b, bool *rejected);
+static const char *renderFieldNameNoEscape (const tagEntryInfo *const tag, const char *value CTAGS_ATTR_UNUSED, vString* b,
+											bool *rejected);
+static const char *renderFieldInput (const tagEntryInfo *const tag, const char *value, vString* b, bool *rejected);
+static const char *renderFieldInputNoEscape (const tagEntryInfo *const tag, const char *value, vString* b,
+											 bool *rejected);
+static const char *renderFieldCompactInputLine (const tagEntryInfo *const tag, const char *value, vString* b, bool *rejected);
+static const char *renderFieldSignature (const tagEntryInfo *const tag, const char *value, vString* b, bool *rejected);
+static const char *renderFieldScope (const tagEntryInfo *const tag, const char *value, vString* b, bool *rejected);
+static const char *renderFieldScopeNoEscape (const tagEntryInfo *const tag, const char *value, vString* b,
+											 bool *rejected);
+static const char *renderFieldTyperef (const tagEntryInfo *const tag, const char *value, vString* b, bool *rejected);
+static const char *renderFieldInherits (const tagEntryInfo *const tag, const char *value, vString* b, bool *rejected);
+static const char *renderFieldKindName (const tagEntryInfo *const tag, const char *value, vString* b, bool *rejected);
+static const char *renderFieldLineNumber (const tagEntryInfo *const tag, const char *value, vString* b, bool *rejected);
+static const char *renderFieldLanguage (const tagEntryInfo *const tag, const char *value, vString* b, bool *rejected);
+static const char *renderFieldAccess (const tagEntryInfo *const tag, const char *value, vString* b, bool *rejected);
+static const char *renderFieldKindLetter (const tagEntryInfo *const tag, const char *value, vString* b, bool *rejected);
+static const char *renderFieldImplementation (const tagEntryInfo *const tag, const char *value, vString* b, bool *rejected);
+static const char *renderFieldFile (const tagEntryInfo *const tag, const char *value, vString* b, bool *rejected);
+static const char *renderFieldPattern (const tagEntryInfo *const tag, const char *value, vString* b, bool *rejected);
+static const char *renderFieldRole (const tagEntryInfo *const tag, const char *value, vString* b, bool *rejected);
+static const char *renderFieldRefMarker (const tagEntryInfo *const tag, const char *value, vString* b, bool *rejected);
+static const char *renderFieldExtra (const tagEntryInfo *const tag, const char *value, vString* b, bool *rejected);
+static const char *renderFieldXpath (const tagEntryInfo *const tag, const char *value, vString* b, bool *rejected);
+static const char *renderFieldScopeKindName(const tagEntryInfo *const tag, const char *value, vString* b, bool *rejected);
+static const char *renderFieldEnd (const tagEntryInfo *const tag, const char *value, vString* b, bool *rejected);
 
 static bool     isLanguageFieldAvailable  (const tagEntryInfo *const tag);
 static bool     isTyperefFieldAvailable   (const tagEntryInfo *const tag);
@@ -70,15 +76,15 @@ static bool     isXpathFieldAvailable     (const tagEntryInfo *const tag);
 static bool     isEndFieldAvailable       (const tagEntryInfo *const tag);
 
 
-#define DEFINE_FIELD_SPEC(L, N, V, H, F)		\
-	DEFINE_FIELD_SPEC_FULL (L, N, V, H, F, NULL)
-#define DEFINE_FIELD_SPEC_FULL(L, N, V, H, F, A)\
+#define DEFINE_FIELD_SPEC(L, N, V, H, ...)		\
+	DEFINE_FIELD_SPEC_FULL (L, N, V, H, NULL, __VA_ARGS__)
+#define DEFINE_FIELD_SPEC_FULL(L, N, V, H, A, ...)	\
 	{					\
 		.letter        = L,		\
 		.name          = N,		\
 		.description   = H,		\
 		.enabled       = V,		\
-		.renderEscaped = F,		\
+		.renderEscaped = { __VA_ARGS__ },		\
 		.isValueAvailable = A,		\
 	}
 
@@ -88,85 +94,100 @@ static fieldSpec fieldSpecsFixed [] = {
         /* FIXED FIELDS */
 	DEFINE_FIELD_SPEC ('N', "name",     true,
 			  "tag name (fixed field)",
-			  {[WRITER_CTAGS] = renderFieldName}),
+			  [WRITER_U_CTAGS] = renderFieldName,
+			  [WRITER_E_CTAGS] = renderFieldNameNoEscape),
 	DEFINE_FIELD_SPEC ('F', "input",    true,
 			   "input file (fixed field)",
-			   {[WRITER_CTAGS] = renderFieldInput}),
+			   [WRITER_U_CTAGS] = renderFieldInput,
+			   [WRITER_E_CTAGS] = renderFieldInputNoEscape),
 	DEFINE_FIELD_SPEC ('P', "pattern",  true,
 			   "pattern (fixed field)",
-			   {[WRITER_CTAGS] = renderFieldPattern}),
+			   [WRITER_U_CTAGS] = renderFieldPattern),
 };
 
 static fieldSpec fieldSpecsExuberant [] = {
 	DEFINE_FIELD_SPEC ('C', "compact",        false,
 			   "compact input line (fixed field, only used in -x option)",
-			   {[WRITER_CTAGS] = renderFieldCompactInputLine}),
+			   [WRITER_U_CTAGS] = renderFieldCompactInputLine),
 
 	/* EXTENSION FIELDS */
 	DEFINE_FIELD_SPEC_FULL ('a', "access",         false,
 		      "Access (or export) of class members",
-		      {[WRITER_CTAGS] = renderFieldAccess}, isAccessFieldAvailable),
+			  isAccessFieldAvailable,
+		      [WRITER_U_CTAGS] = renderFieldAccess),
 	DEFINE_FIELD_SPEC_FULL ('f', "file",           true,
 		      "File-restricted scoping",
-		      {[WRITER_CTAGS] = renderFieldFile}, isFileFieldAvailable),
+			  isFileFieldAvailable,
+		      [WRITER_U_CTAGS] = renderFieldFile),
 	DEFINE_FIELD_SPEC_FULL ('i', "inherits",       false,
 		      "Inheritance information",
-		      {[WRITER_CTAGS] = renderFieldInherits}, isInheritsFieldAvailable),
+			  isInheritsFieldAvailable,
+		      [WRITER_U_CTAGS] = renderFieldInherits),
 	DEFINE_FIELD_SPEC ('K', NULL,             false,
 		      "Kind of tag as full name",
-		      {[WRITER_CTAGS] = renderFieldKindName}),
+		      [WRITER_U_CTAGS] = renderFieldKindName),
 	DEFINE_FIELD_SPEC ('k', NULL,             true,
 			   "Kind of tag as a single letter",
-			   {[WRITER_CTAGS] = renderFieldKindLetter}),
+			   [WRITER_U_CTAGS] = renderFieldKindLetter),
 	DEFINE_FIELD_SPEC_FULL ('l', "language",       false,
 			   "Language of input file containing tag",
-			   {[WRITER_CTAGS] = renderFieldLanguage}, isLanguageFieldAvailable),
+			   isLanguageFieldAvailable,
+			   [WRITER_U_CTAGS] = renderFieldLanguage),
 	DEFINE_FIELD_SPEC_FULL ('m', "implementation", false,
 			   "Implementation information",
-			   {[WRITER_CTAGS] = renderFieldImplementation}, isImplementationFieldAvailable),
+			   isImplementationFieldAvailable,
+			   [WRITER_U_CTAGS] = renderFieldImplementation),
 	DEFINE_FIELD_SPEC ('n', "line",           false,
 			   "Line number of tag definition",
-			   {[WRITER_CTAGS] = renderFieldLineNumber}),
+			   [WRITER_U_CTAGS] = renderFieldLineNumber),
 	DEFINE_FIELD_SPEC_FULL ('S', "signature",	     false,
 			   "Signature of routine (e.g. prototype or parameter list)",
-			   {[WRITER_CTAGS] = renderFieldSignature}, isSignatureFieldAvailable),
+			   isSignatureFieldAvailable,
+			   [WRITER_U_CTAGS] = renderFieldSignature),
 	DEFINE_FIELD_SPEC ('s', NULL,             true,
 			   "Scope of tag definition (`p' can be used for printing its kind)",
-			   {[WRITER_CTAGS] = renderFieldScope}),
+			   [WRITER_U_CTAGS] = renderFieldScope,
+			   [WRITER_E_CTAGS] = renderFieldScopeNoEscape),
 	DEFINE_FIELD_SPEC_FULL ('t', "typeref",        true,
 			   "Type and name of a variable or typedef",
-			   {[WRITER_CTAGS] = renderFieldTyperef}, isTyperefFieldAvailable),
+			   isTyperefFieldAvailable,
+			   [WRITER_U_CTAGS] = renderFieldTyperef),
 	DEFINE_FIELD_SPEC ('z', "kind",           false,
 			   "Include the \"kind:\" key in kind field (use k or K) in tags output, kind full name in xref output",
 			   /* Following renderer is for handling --_xformat=%{kind};
 			      and is not for tags output. */
-			   {[WRITER_CTAGS] = renderFieldKindName}),
+			   [WRITER_U_CTAGS] = renderFieldKindName),
 };
 
 static fieldSpec fieldSpecsUniversal [] = {
 	DEFINE_FIELD_SPEC_FULL ('r', "role",    false,
 			   "Role",
-			   {[WRITER_CTAGS] = renderFieldRole}, isRoleFieldAvailable),
+			   isRoleFieldAvailable,
+			   [WRITER_U_CTAGS] = renderFieldRole),
 	DEFINE_FIELD_SPEC ('R',  NULL,     false,
 			   "Marker (R or D) representing whether tag is definition or reference",
-			   {[WRITER_CTAGS] = renderFieldRefMarker}),
+			   [WRITER_U_CTAGS] = renderFieldRefMarker),
 	DEFINE_FIELD_SPEC ('Z', "scope",   false,
 			  "Include the \"scope:\" key in scope field (use s) in tags output, scope name in xref output",
 			   /* Following renderer is for handling --_xformat=%{scope};
 			      and is not for tags output. */
-			   {[WRITER_CTAGS] = renderFieldScope}),
+			   [WRITER_U_CTAGS] = renderFieldScope,
+			   [WRITER_E_CTAGS] = renderFieldScopeNoEscape),
 	DEFINE_FIELD_SPEC_FULL ('E', "extra",   false,
 			   "Extra tag type information",
-			   {[WRITER_CTAGS] = renderFieldExtra}, isExtraFieldAvailable),
+			   isExtraFieldAvailable,
+			   [WRITER_U_CTAGS] = renderFieldExtra),
 	DEFINE_FIELD_SPEC_FULL ('x', "xpath",   false,
 			   "xpath for the tag",
-			   {[WRITER_CTAGS] = renderFieldXpath}, isXpathFieldAvailable),
+			   isXpathFieldAvailable,
+			   [WRITER_U_CTAGS] = renderFieldXpath),
 	DEFINE_FIELD_SPEC ('p', "scopeKind", false,
 			   "Kind of scope as full name",
-			   {[WRITER_CTAGS] = renderFieldScopeKindName}),
+			   [WRITER_U_CTAGS] = renderFieldScopeKindName),
 	DEFINE_FIELD_SPEC_FULL ('e', "end", false,
 			   "end lines of various items",
-			   {[WRITER_CTAGS] = renderFieldEnd}, isEndFieldAvailable),
+			   isEndFieldAvailable,
+			   [WRITER_U_CTAGS] = renderFieldEnd),
 };
 
 
@@ -421,12 +442,25 @@ static const char *renderEscapedName (const char* s,
 	return renderEscapedString (s, tag, b);
 }
 
-static const char *renderFieldName (const tagEntryInfo *const tag, const char *value CTAGS_ATTR_UNUSED, vString* b)
+static const char *renderFieldName (const tagEntryInfo *const tag, const char *value CTAGS_ATTR_UNUSED, vString* b,
+									bool *rejected)
 {
 	return renderEscapedName (tag->name, tag, b);
 }
 
-static const char *renderFieldInput (const tagEntryInfo *const tag, const char *value CTAGS_ATTR_UNUSED, vString* b)
+static const char *renderFieldNameNoEscape (const tagEntryInfo *const tag, const char *value CTAGS_ATTR_UNUSED, vString* b,
+											bool *rejected)
+{
+	if (strpbrk (tag->name, " \t"))
+	{
+		*rejected = true;
+		return NULL;
+	}
+	return renderAsIs (b, tag->name);
+}
+
+static const char *renderFieldInput (const tagEntryInfo *const tag, const char *value CTAGS_ATTR_UNUSED, vString* b,
+									 bool *rejected)
 {
 	const char *f = tag->inputFileName;
 
@@ -435,13 +469,32 @@ static const char *renderFieldInput (const tagEntryInfo *const tag, const char *
 	return renderEscapedString (f, tag, b);
 }
 
-static const char *renderFieldSignature (const tagEntryInfo *const tag, const char *value CTAGS_ATTR_UNUSED, vString* b)
+static const char *renderFieldInputNoEscape (const tagEntryInfo *const tag, const char *value, vString* b,
+											 bool *rejected)
+{
+	const char *f = tag->inputFileName;
+
+	if (Option.lineDirectives && tag->sourceFileName)
+		f = tag->sourceFileName;
+
+	if (strpbrk (f, " \t"))
+	{
+		*rejected = true;
+		return NULL;
+	}
+
+	return renderAsIs (b, f);
+}
+
+static const char *renderFieldSignature (const tagEntryInfo *const tag, const char *value CTAGS_ATTR_UNUSED, vString* b,
+										 bool *rejected)
 {
 	return renderEscapedString (WITH_DEFUALT_VALUE (tag->extensionFields.signature),
 				    tag, b);
 }
 
-static const char *renderFieldScope (const tagEntryInfo *const tag, const char *value CTAGS_ATTR_UNUSED, vString* b)
+static const char *renderFieldScope (const tagEntryInfo *const tag, const char *value CTAGS_ATTR_UNUSED, vString* b,
+									 bool *rejected)
 {
 	const char* scope;
 
@@ -449,13 +502,30 @@ static const char *renderFieldScope (const tagEntryInfo *const tag, const char *
 	return scope? renderEscapedName (scope, tag, b): NULL;
 }
 
-static const char *renderFieldInherits (const tagEntryInfo *const tag, const char *value CTAGS_ATTR_UNUSED, vString* b)
+static const char *renderFieldScopeNoEscape (const tagEntryInfo *const tag, const char *value CTAGS_ATTR_UNUSED, vString* b,
+											 bool *rejected)
+{
+	const char* scope;
+
+	getTagScopeInformation ((tagEntryInfo *const)tag, NULL, &scope);
+	if (scope && strpbrk (scope, " \t"))
+	{
+		*rejected = true;
+		return NULL;
+	}
+
+	return scope? renderAsIs (b, scope): NULL;
+}
+
+static const char *renderFieldInherits (const tagEntryInfo *const tag, const char *value CTAGS_ATTR_UNUSED, vString* b,
+										bool *rejected)
 {
 	return renderEscapedString (WITH_DEFUALT_VALUE (tag->extensionFields.inheritance),
 				    tag, b);
 }
 
-static const char *renderFieldTyperef (const tagEntryInfo *const tag, const char *value CTAGS_ATTR_UNUSED, vString* b)
+static const char *renderFieldTyperef (const tagEntryInfo *const tag, const char *value CTAGS_ATTR_UNUSED, vString* b,
+									   bool *rejected)
 {
 	return renderEscapedName (WITH_DEFUALT_VALUE (tag->extensionFields.typeRef [1]), tag, b);
 }
@@ -464,11 +534,13 @@ static const char *renderFieldTyperef (const tagEntryInfo *const tag, const char
 extern const char* renderFieldEscaped (writerType writer,
 				      fieldType type,
 				       const tagEntryInfo *tag,
-				       int index)
+				       int index,
+					   bool *rejected)
 {
 	fieldDesc *fdesc = fieldDescs + type;
 	const char *value;
 	renderEscaped rfn;
+	bool stub;
 
 	Assert (tag);
 	Assert (fdesc->spec->renderEscaped);
@@ -486,7 +558,10 @@ extern const char* renderFieldEscaped (writerType writer,
 	rfn = fdesc->spec->renderEscaped [writer];
 	if (rfn == NULL)
 		rfn = fdesc->spec->renderEscaped [WRITER_DEFAULT];
-	return rfn (tag, value, fdesc->buffer);
+
+	if (!rejected)
+		rejected = &stub;
+	return rfn (tag, value, fdesc->buffer, rejected);
 }
 
 /*  Writes "line", stripping leading and duplicate white space.
@@ -521,14 +596,16 @@ static const char* renderCompactInputLine (vString *b,  const char *const line)
 	return vStringValue (b);
 }
 
-static const char *renderFieldKindName (const tagEntryInfo *const tag, const char *value CTAGS_ATTR_UNUSED, vString* b)
+static const char *renderFieldKindName (const tagEntryInfo *const tag, const char *value CTAGS_ATTR_UNUSED, vString* b,
+										bool *rejected)
 {
 	return renderAsIs (b, tag->kind->name);
 }
 
 static const char *renderFieldCompactInputLine (const tagEntryInfo *const tag,
 						const char *value CTAGS_ATTR_UNUSED,
-						 vString* b)
+						 vString* b,
+						bool *rejected)
 {
 	const char *line;
 	static vString *tmp;
@@ -552,7 +629,8 @@ static const char *renderFieldCompactInputLine (const tagEntryInfo *const tag,
 
 static const char *renderFieldLineNumber (const tagEntryInfo *const tag,
 					  const char *value CTAGS_ATTR_UNUSED,
-					  vString* b)
+					  vString* b,
+					  bool *rejected)
 {
 	long ln = tag->lineNumber;
 	char buf[32] = {[0] = '\0'};
@@ -566,7 +644,8 @@ static const char *renderFieldLineNumber (const tagEntryInfo *const tag,
 
 static const char *renderFieldRole (const tagEntryInfo *const tag,
 				    const char *value CTAGS_ATTR_UNUSED,
-				    vString* b)
+				    vString* b,
+					bool *rejected)
 {
 	int rindex = tag->extensionFields.roleIndex;
 	const roleDesc * role;
@@ -585,7 +664,8 @@ static const char *renderFieldRole (const tagEntryInfo *const tag,
 
 static const char *renderFieldLanguage (const tagEntryInfo *const tag,
 					const char *value CTAGS_ATTR_UNUSED,
-					vString* b)
+					vString* b,
+					bool *rejected)
 {
 	const char *l = tag->language;
 
@@ -597,14 +677,16 @@ static const char *renderFieldLanguage (const tagEntryInfo *const tag,
 
 static const char *renderFieldAccess (const tagEntryInfo *const tag,
 				      const char *value,
-				      vString* b)
+				      vString* b,
+					  bool *rejected)
 {
 	return renderAsIs (b, WITH_DEFUALT_VALUE (tag->extensionFields.access));
 }
 
 static const char *renderFieldKindLetter (const tagEntryInfo *const tag,
 					  const char *value CTAGS_ATTR_UNUSED,
-					  vString* b)
+					  vString* b,
+					  bool *rejected)
 {
 	static char c[2] = { [1] = '\0' };
 
@@ -615,21 +697,24 @@ static const char *renderFieldKindLetter (const tagEntryInfo *const tag,
 
 static const char *renderFieldImplementation (const tagEntryInfo *const tag,
 					      const char *value CTAGS_ATTR_UNUSED,
-					      vString* b)
+					      vString* b,
+						  bool *rejected)
 {
 	return renderAsIs (b, WITH_DEFUALT_VALUE (tag->extensionFields.implementation));
 }
 
 static const char *renderFieldFile (const tagEntryInfo *const tag,
 				    const char *value CTAGS_ATTR_UNUSED,
-				    vString* b)
+				    vString* b,
+					bool *rejected)
 {
 	return renderAsIs (b, tag->isFileScope? "file": "-");
 }
 
 static const char *renderFieldPattern (const tagEntryInfo *const tag,
 				       const char *value CTAGS_ATTR_UNUSED,
-				       vString* b)
+				       vString* b,
+					   bool *rejected)
 {
 	char* tmp = makePatternString (tag);
 	vStringCatS (b, tmp);
@@ -639,7 +724,8 @@ static const char *renderFieldPattern (const tagEntryInfo *const tag,
 
 static const char *renderFieldRefMarker (const tagEntryInfo *const tag,
 					 const char *value CTAGS_ATTR_UNUSED,
-					 vString* b)
+					 vString* b,
+					 bool *rejected)
 {
 	static char c[2] = { [1] = '\0' };
 
@@ -650,7 +736,8 @@ static const char *renderFieldRefMarker (const tagEntryInfo *const tag,
 
 static const char *renderFieldExtra (const tagEntryInfo *const tag,
 				     const char *value CTAGS_ATTR_UNUSED,
-				     vString* b)
+				     vString* b,
+					 bool *rejected)
 {
 	int i;
 	bool hasExtra = false;
@@ -680,7 +767,8 @@ static const char *renderFieldExtra (const tagEntryInfo *const tag,
 
 static const char *renderFieldXpath (const tagEntryInfo *const tag,
 				     const char *value,
-				     vString* b)
+				     vString* b,
+					 bool *rejected)
 {
 #ifdef HAVE_LIBXML
 	if (tag->extensionFields.xpath)
@@ -692,7 +780,8 @@ static const char *renderFieldXpath (const tagEntryInfo *const tag,
 
 static const char *renderFieldScopeKindName(const tagEntryInfo *const tag,
 					    const char *value,
-					    vString* b)
+					    vString* b,
+						bool *rejected)
 {
 	const char* kind;
 
@@ -702,7 +791,8 @@ static const char *renderFieldScopeKindName(const tagEntryInfo *const tag,
 
 static const char *renderFieldEnd (const tagEntryInfo *const tag,
 				   const char *value,
-				   vString* b)
+				   vString* b,
+				   bool *rejected)
 {
 	static char buf[16];
 
@@ -877,7 +967,8 @@ static void updateSiblingField (fieldType type, const char* name)
 
 static const char* defaultRenderer (const tagEntryInfo *const tag,
 				    const char *value,
-				    vString * buffer)
+				    vString * buffer,
+					bool *rejected)
 {
 	return value;
 }