Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Improve list output #1485

Merged
merged 9 commits into from
Jun 27, 2017
4 changes: 2 additions & 2 deletions Tmain/dynamic-kinds.d/stdout-expected.txt
Original file line number Diff line number Diff line change
@@ -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
100 changes: 50 additions & 50 deletions Tmain/extras-long.d/stdout-expected.txt
Original file line number Diff line number Diff line change
@@ -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
12 changes: 6 additions & 6 deletions Tmain/kind-abnormal-spec.d/stdout-expected.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions Tmain/kind-long-lregex.d/stdout-expected.txt
Original file line number Diff line number Diff line change
@@ -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
4 changes: 2 additions & 2 deletions Tmain/kind-long.d/stdout-expected.txt
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion Tmain/kinddef.d/stdout-expected.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 5 additions & 5 deletions Tmain/langmap-option-including-patterns.d/stdout-expected.txt
Original file line number Diff line number Diff line change
@@ -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
7 changes: 7 additions & 0 deletions Tmain/list-aliases.d/run.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# Copyright: 2017 Masatake YAMATO
# License: GPL-2

CTAGS="$1"

${CTAGS} --quiet --options=NONE \
--list-aliases=sh
7 changes: 7 additions & 0 deletions Tmain/list-aliases.d/stdout-expected.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
#ALIAS
sh
bash
ksh
zsh
ash
shell-script
40 changes: 20 additions & 20 deletions Tmain/list-extras.d/stdout-expected.txt
Original file line number Diff line number Diff line change
@@ -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
34 changes: 17 additions & 17 deletions Tmain/list-fields-with-prefix.d/stdout-expected.txt
Original file line number Diff line number Diff line change
@@ -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
Loading