Merge pull request #1485 from masatake/improve-list-output

Improve list output
universal-ctags · Jun 27, 2017 · 69b2ad9 · 69b2ad9
2 parents a896f0f + f9f0372
commit 69b2ad9
Show file tree

Hide file tree

Showing 38 changed files with 544 additions and 308 deletions.
diff --git a/Tmain/dynamic-kinds.d/stdout-expected.txt b/Tmain/dynamic-kinds.d/stdout-expected.txt
@@ -1,3 +1,3 @@
 #LETTER NAME   ENABLED REFONLY NROLES MASTER DESCRIPTION
-a       anchor on      FALSE   0      NONE   anchors
-b       batch  on      FALSE   0      NONE   batches
+a       anchor yes     no      0      NONE   anchors
+b       batch  yes     no      0      NONE   batches
diff --git a/Tmain/extras-long.d/stdout-expected.txt b/Tmain/extras-long.d/stdout-expected.txt
@@ -1,55 +1,55 @@
 # resetting
--       subword           FALSE   NONE     Include tags for subwords generated by splitting the original tag (only for ctags development)
-F       fileScope         FALSE   NONE     Include tags of file scope
-f       inputFile         FALSE   NONE     Include an entry for the base file name of every input file
-g       guest             FALSE   NONE     Include tags generated by guest parsers
-p       pseudo            FALSE   NONE     Include pseudo tags
-q       qualified         FALSE   NONE     Include an extra class-qualified tag entry for each tag
-r       reference         FALSE   NONE     Include reference tags
-s       subparser         TRUE    NONE     Include tags generated by subparsers
--       funcmap           TRUE    QemuHX   mapping SQMP to C function name
--       whitespaceSwapped TRUE    Robot    Include tags swapping whitespace and underscore chars
+-       subword           no      NONE     Include tags for subwords generated by splitting the original tag (only for ctags development)
+F       fileScope         no      NONE     Include tags of file scope
+f       inputFile         no      NONE     Include an entry for the base file name of every input file
+g       guest             no      NONE     Include tags generated by guest parsers
+p       pseudo            no      NONE     Include pseudo tags
+q       qualified         no      NONE     Include an extra class-qualified tag entry for each tag
+r       reference         no      NONE     Include reference tags
+s       subparser         yes     NONE     Include tags generated by subparsers
+-       funcmap           yes     QemuHX   mapping SQMP to C function name
+-       whitespaceSwapped yes     Robot    Include tags swapping whitespace and underscore chars
 # enabling 1
--       subword           FALSE   NONE     Include tags for subwords generated by splitting the original tag (only for ctags development)
-F       fileScope         TRUE    NONE     Include tags of file scope
-f       inputFile         FALSE   NONE     Include an entry for the base file name of every input file
-g       guest             FALSE   NONE     Include tags generated by guest parsers
-p       pseudo            TRUE    NONE     Include pseudo tags
-q       qualified         FALSE   NONE     Include an extra class-qualified tag entry for each tag
-r       reference         FALSE   NONE     Include reference tags
-s       subparser         TRUE    NONE     Include tags generated by subparsers
--       funcmap           TRUE    QemuHX   mapping SQMP to C function name
--       whitespaceSwapped TRUE    Robot    Include tags swapping whitespace and underscore chars
+-       subword           no      NONE     Include tags for subwords generated by splitting the original tag (only for ctags development)
+F       fileScope         yes     NONE     Include tags of file scope
+f       inputFile         no      NONE     Include an entry for the base file name of every input file
+g       guest             no      NONE     Include tags generated by guest parsers
+p       pseudo            yes     NONE     Include pseudo tags
+q       qualified         no      NONE     Include an extra class-qualified tag entry for each tag
+r       reference         no      NONE     Include reference tags
+s       subparser         yes     NONE     Include tags generated by subparsers
+-       funcmap           yes     QemuHX   mapping SQMP to C function name
+-       whitespaceSwapped yes     Robot    Include tags swapping whitespace and underscore chars
 # disabling 1
--       subword           FALSE   NONE     Include tags for subwords generated by splitting the original tag (only for ctags development)
-F       fileScope         FALSE   NONE     Include tags of file scope
-f       inputFile         FALSE   NONE     Include an entry for the base file name of every input file
-g       guest             FALSE   NONE     Include tags generated by guest parsers
-p       pseudo            FALSE   NONE     Include pseudo tags
-q       qualified         FALSE   NONE     Include an extra class-qualified tag entry for each tag
-r       reference         FALSE   NONE     Include reference tags
-s       subparser         TRUE    NONE     Include tags generated by subparsers
--       funcmap           TRUE    QemuHX   mapping SQMP to C function name
--       whitespaceSwapped TRUE    Robot    Include tags swapping whitespace and underscore chars
+-       subword           no      NONE     Include tags for subwords generated by splitting the original tag (only for ctags development)
+F       fileScope         no      NONE     Include tags of file scope
+f       inputFile         no      NONE     Include an entry for the base file name of every input file
+g       guest             no      NONE     Include tags generated by guest parsers
+p       pseudo            no      NONE     Include pseudo tags
+q       qualified         no      NONE     Include an extra class-qualified tag entry for each tag
+r       reference         no      NONE     Include reference tags
+s       subparser         yes     NONE     Include tags generated by subparsers
+-       funcmap           yes     QemuHX   mapping SQMP to C function name
+-       whitespaceSwapped yes     Robot    Include tags swapping whitespace and underscore chars
 # combination
--       subword           FALSE   NONE     Include tags for subwords generated by splitting the original tag (only for ctags development)
-F       fileScope         FALSE   NONE     Include tags of file scope
-f       inputFile         TRUE    NONE     Include an entry for the base file name of every input file
-g       guest             FALSE   NONE     Include tags generated by guest parsers
-p       pseudo            FALSE   NONE     Include pseudo tags
-q       qualified         FALSE   NONE     Include an extra class-qualified tag entry for each tag
-r       reference         TRUE    NONE     Include reference tags
-s       subparser         TRUE    NONE     Include tags generated by subparsers
--       funcmap           TRUE    QemuHX   mapping SQMP to C function name
--       whitespaceSwapped TRUE    Robot    Include tags swapping whitespace and underscore chars
+-       subword           no      NONE     Include tags for subwords generated by splitting the original tag (only for ctags development)
+F       fileScope         no      NONE     Include tags of file scope
+f       inputFile         yes     NONE     Include an entry for the base file name of every input file
+g       guest             no      NONE     Include tags generated by guest parsers
+p       pseudo            no      NONE     Include pseudo tags
+q       qualified         no      NONE     Include an extra class-qualified tag entry for each tag
+r       reference         yes     NONE     Include reference tags
+s       subparser         yes     NONE     Include tags generated by subparsers
+-       funcmap           yes     QemuHX   mapping SQMP to C function name
+-       whitespaceSwapped yes     Robot    Include tags swapping whitespace and underscore chars
 # combination with letters
--       subword           FALSE   NONE     Include tags for subwords generated by splitting the original tag (only for ctags development)
-F       fileScope         FALSE   NONE     Include tags of file scope
-f       inputFile         FALSE   NONE     Include an entry for the base file name of every input file
-g       guest             FALSE   NONE     Include tags generated by guest parsers
-p       pseudo            TRUE    NONE     Include pseudo tags
-q       qualified         TRUE    NONE     Include an extra class-qualified tag entry for each tag
-r       reference         TRUE    NONE     Include reference tags
-s       subparser         TRUE    NONE     Include tags generated by subparsers
--       funcmap           TRUE    QemuHX   mapping SQMP to C function name
--       whitespaceSwapped TRUE    Robot    Include tags swapping whitespace and underscore chars
+-       subword           no      NONE     Include tags for subwords generated by splitting the original tag (only for ctags development)
+F       fileScope         no      NONE     Include tags of file scope
+f       inputFile         no      NONE     Include an entry for the base file name of every input file
+g       guest             no      NONE     Include tags generated by guest parsers
+p       pseudo            yes     NONE     Include pseudo tags
+q       qualified         yes     NONE     Include an extra class-qualified tag entry for each tag
+r       reference         yes     NONE     Include reference tags
+s       subparser         yes     NONE     Include tags generated by subparsers
+-       funcmap           yes     QemuHX   mapping SQMP to C function name
+-       whitespaceSwapped yes     Robot    Include tags swapping whitespace and underscore chars
diff --git a/Tmain/kind-abnormal-spec.d/stdout-expected.txt b/Tmain/kind-abnormal-spec.d/stdout-expected.txt
@@ -8,12 +8,12 @@ E  end of an area for a guest
 
 # list kinds-full
 #LETTER NAME                                      ENABLED REFONLY NROLES MASTER DESCRIPTION
-        no letter                                 on      FALSE   0      NONE   kind with no letter
-B       ThisShouldNotBePrintedKindNameMustBeGiven on      FALSE   0      NONE   beginning of an area for a guest
-E       ThisShouldNotBePrintedKindNameMustBeGiven on      FALSE   0      NONE   end of an area for a guest
-L       ThisShouldNotBePrintedKindNameMustBeGiven on      FALSE   0      NONE   kind with no long name
-N       nothingSpecial                            on      FALSE   0      NONE   emit a normal tag
-b       broken tag                                on      FALSE   1      NONE   name with unwanted characters
+        no letter                                 yes     no      0      NONE   kind with no letter
+B       ThisShouldNotBePrintedKindNameMustBeGiven yes     no      0      NONE   beginning of an area for a guest
+E       ThisShouldNotBePrintedKindNameMustBeGiven yes     no      0      NONE   end of an area for a guest
+L       ThisShouldNotBePrintedKindNameMustBeGiven yes     no      0      NONE   kind with no long name
+N       nothingSpecial                            yes     no      0      NONE   emit a normal tag
+b       broken tag                                yes     no      1      NONE   name with unwanted characters
 
 # +K
 abnormal kindDefinition testing (no letter)	input.x	/^@$/;"	no letter

diff --git a/Tmain/kind-long-lregex.d/stdout-expected.txt b/Tmain/kind-long-lregex.d/stdout-expected.txt
@@ -1,6 +1,6 @@
 # definition
-d       definition on      FALSE   0      NONE   definitions
+d       definition yes     no      0      NONE   definitions
 # disabling
-d       definition off     FALSE   0      NONE   definitions
+d       definition no      no      0      NONE   definitions
 # enabling again
-d       definition on      FALSE   0      NONE   definitions
+d       definition yes     no      0      NONE   definitions
diff --git a/Tmain/kind-long.d/stdout-expected.txt b/Tmain/kind-long.d/stdout-expected.txt
@@ -1,2 +1,2 @@
-L       label      on      FALSE   0      C      goto labels
-d       macro      off     FALSE   1      C      macro definitions
+L       label      yes     no      0      C      goto labels
+d       macro      no      no      1      C      macro definitions
diff --git a/Tmain/kinddef.d/stdout-expected.txt b/Tmain/kinddef.d/stdout-expected.txt
@@ -2,7 +2,7 @@
 ctags: Unknown language "NOSUCHLANG" in "kinddef-NOSUCHLANG" option
 # define "a"
 #LETTER NAME ENABLED REFONLY NROLES MASTER DESCRIPTION
-a       aa   on      FALSE   0      NONE   aaa
+a       aa   yes     no      0      NONE   aaa
 # no description 1
 ctags: found an empty kind description in "--kinddef-MYTEST" option
 # no description 2

diff --git a/Tmain/langmap-option-including-patterns.d/stdout-expected.txt b/Tmain/langmap-option-including-patterns.d/stdout-expected.txt
@@ -1,12 +1,12 @@
 1.
-Automake *.am Makefile.am
+Automake Makefile.am *.am
 foo      [Mm]akefile GNUmakefile
 2.
-Ruby     *.rb *.ruby *.html [Mm]akefile GNUmakefile
+Ruby     [Mm]akefile GNUmakefile *.rb *.ruby *.html
 3.
-Automake *.am Makefile.am
-Ruby     *.rb *.ruby *.html [Mm]akefile GNUmakefile
+Automake Makefile.am *.am
+Ruby     [Mm]akefile GNUmakefile *.rb *.ruby *.html
 4.
-Ruby     *.rb *.ruby *.html [Mm]akefile GNUmakefile
+Ruby     [Mm]akefile GNUmakefile *.rb *.ruby *.html
 5.
 HTML     *.htm *.html
diff --git a/Tmain/list-aliases.d/run.sh b/Tmain/list-aliases.d/run.sh
@@ -0,0 +1,7 @@
+# Copyright: 2017 Masatake YAMATO
+# License: GPL-2
+
+CTAGS="$1"
+
+${CTAGS} --quiet --options=NONE \
+		 --list-aliases=sh
diff --git a/Tmain/list-aliases.d/stdout-expected.txt b/Tmain/list-aliases.d/stdout-expected.txt
@@ -0,0 +1,7 @@
+#ALIAS
+sh
+bash
+ksh
+zsh
+ash
+shell-script
diff --git a/Tmain/list-extras.d/stdout-expected.txt b/Tmain/list-extras.d/stdout-expected.txt
@@ -1,22 +1,22 @@
 #LETTER NAME              ENABLED LANGUAGE DESCRIPTION
--       subword           TRUE    NONE     Include tags for subwords generated by splitting the original tag (only for ctags development)
-F       fileScope         TRUE    NONE     Include tags of file scope
-f       inputFile         TRUE    NONE     Include an entry for the base file name of every input file
-g       guest             TRUE    NONE     Include tags generated by guest parsers
-p       pseudo            TRUE    NONE     Include pseudo tags
-q       qualified         TRUE    NONE     Include an extra class-qualified tag entry for each tag
-r       reference         TRUE    NONE     Include reference tags
-s       subparser         TRUE    NONE     Include tags generated by subparsers
--       funcmap           TRUE    QemuHX   mapping SQMP to C function name
--       whitespaceSwapped TRUE    Robot    Include tags swapping whitespace and underscore chars
+-       subword           yes     NONE     Include tags for subwords generated by splitting the original tag (only for ctags development)
+F       fileScope         yes     NONE     Include tags of file scope
+f       inputFile         yes     NONE     Include an entry for the base file name of every input file
+g       guest             yes     NONE     Include tags generated by guest parsers
+p       pseudo            yes     NONE     Include pseudo tags
+q       qualified         yes     NONE     Include an extra class-qualified tag entry for each tag
+r       reference         yes     NONE     Include reference tags
+s       subparser         yes     NONE     Include tags generated by subparsers
+-       funcmap           yes     QemuHX   mapping SQMP to C function name
+-       whitespaceSwapped yes     Robot    Include tags swapping whitespace and underscore chars
 #LETTER	NAME	ENABLED	LANGUAGE	DESCRIPTION
--	subword	TRUE	NONE	Include tags for subwords generated by splitting the original tag (only for ctags development)
-F	fileScope	TRUE	NONE	Include tags of file scope
-f	inputFile	TRUE	NONE	Include an entry for the base file name of every input file
-g	guest	TRUE	NONE	Include tags generated by guest parsers
-p	pseudo	TRUE	NONE	Include pseudo tags
-q	qualified	TRUE	NONE	Include an extra class-qualified tag entry for each tag
-r	reference	TRUE	NONE	Include reference tags
-s	subparser	TRUE	NONE	Include tags generated by subparsers
--	funcmap	TRUE	QemuHX	mapping SQMP to C function name
--	whitespaceSwapped	TRUE	Robot	Include tags swapping whitespace and underscore chars
+-	subword	yes	NONE	Include tags for subwords generated by splitting the original tag (only for ctags development)
+F	fileScope	yes	NONE	Include tags of file scope
+f	inputFile	yes	NONE	Include an entry for the base file name of every input file
+g	guest	yes	NONE	Include tags generated by guest parsers
+p	pseudo	yes	NONE	Include pseudo tags
+q	qualified	yes	NONE	Include an extra class-qualified tag entry for each tag
+r	reference	yes	NONE	Include reference tags
+s	subparser	yes	NONE	Include tags generated by subparsers
+-	funcmap	yes	QemuHX	mapping SQMP to C function name
+-	whitespaceSwapped	yes	Robot	Include tags swapping whitespace and underscore chars
diff --git a/Tmain/list-fields-with-prefix.d/stdout-expected.txt b/Tmain/list-fields-with-prefix.d/stdout-expected.txt
@@ -1,17 +1,17 @@
-E       UCTAGSextras        off     NONE             TRUE s--    Extra tag type information
-Z       UCTAGSscope         off     NONE             TRUE s--    Include the "scope:" key in scope field (use s) in tags output, scope name in xref output
-e       UCTAGSend           off     NONE             TRUE -i-    end lines of various items
-p       UCTAGSscopeKind     off     NONE             TRUE s--    Kind of scope as full name
-r       UCTAGSrole          off     NONE             TRUE s--    Role
-x       UCTAGSxpath         off     NONE             TRUE s--    xpath for the tag
--       UCTAGSproperties    off     C                TRUE s--    properties (static, inline, mutable,...)
--       UCTAGScaptures      off     C++              TRUE s--    lambda capture list
--       UCTAGSname          on      C++              TRUE s--    aliased names
--       UCTAGSproperties    off     C++              TRUE s--    properties (static, inline, mutable,...)
--       UCTAGStemplate      off     C++              TRUE s--    template parameters
--       UCTAGSproperties    off     CUDA             TRUE s--    properties (static, inline, mutable,...)
--       UCTAGSassignment    on      LdScript         TRUE s--    how a value is assigned to the symbol
--       UCTAGSdecorators    off     Python           TRUE s--    decorators on functions and classes
--       UCTAGShome          on      passwd           TRUE s--    home directory
--       UCTAGSshell         on      passwd           TRUE s--    login shell
--       UCTAGSsectionMarker off     reStructuredText TRUE s--    character used for declaring section
+E       UCTAGSextras        no      NONE             yes  s--    no    Extra tag type information
+Z       UCTAGSscope         no      NONE             yes  s--    no    Include the "scope:" key in scope field (use s) in tags output, scope name in xref output
+e       UCTAGSend           no      NONE             yes  -i-    no    end lines of various items
+p       UCTAGSscopeKind     no      NONE             yes  s--    no    Kind of scope as full name
+r       UCTAGSrole          no      NONE             yes  s--    no    Role
+x       UCTAGSxpath         no      NONE             yes  s--    no    xpath for the tag
+-       UCTAGSproperties    no      C                yes  s--    no    properties (static, inline, mutable,...)
+-       UCTAGScaptures      no      C++              yes  s--    no    lambda capture list
+-       UCTAGSname          yes     C++              yes  s--    no    aliased names
+-       UCTAGSproperties    no      C++              yes  s--    no    properties (static, inline, mutable,...)
+-       UCTAGStemplate      no      C++              yes  s--    no    template parameters
+-       UCTAGSproperties    no      CUDA             yes  s--    no    properties (static, inline, mutable,...)
+-       UCTAGSassignment    yes     LdScript         yes  s--    no    how a value is assigned to the symbol
+-       UCTAGSdecorators    no      Python           yes  s--    no    decorators on functions and classes
+-       UCTAGShome          yes     passwd           yes  s--    no    home directory
+-       UCTAGSshell         yes     passwd           yes  s--    no    login shell
+-       UCTAGSsectionMarker no      reStructuredText yes  s--    no    character used for declaring section