Skip to content

Commit 32745a0

Browse files
masatakemasatake
authored
Merge pull request #3567 from masatake/incompatible-unknown-letters
[SELF-INCOMPATIBLE] EmacsLisp,Go,Julia,Lisp,Lua,Python: change the kind letter for "unknown" to 'Y'
2 parents 3725078 + 933cf68 commit 32745a0

File tree

14 files changed

+56
-30
lines changed

14 files changed

+56
-30
lines changed

‎Tmain/json-output-format.d/stdout-expected.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@
6060
{"_type": "ptag", "name": "TAG_KIND_DESCRIPTION", "parserName": "C", "path": "v,variable", "pattern": "variable definitions"}
6161
{"_type": "ptag", "name": "TAG_KIND_DESCRIPTION", "parserName": "Go", "path": "M,anonMember", "pattern": "struct anonymous members"}
6262
{"_type": "ptag", "name": "TAG_KIND_DESCRIPTION", "parserName": "Go", "path": "P,packageName", "pattern": "name for specifying imported package"}
63+
{"_type": "ptag", "name": "TAG_KIND_DESCRIPTION", "parserName": "Go", "path": "Y,unknown", "pattern": "unknown"}
6364
{"_type": "ptag", "name": "TAG_KIND_DESCRIPTION", "parserName": "Go", "path": "a,talias", "pattern": "type aliases"}
6465
{"_type": "ptag", "name": "TAG_KIND_DESCRIPTION", "parserName": "Go", "path": "c,const", "pattern": "constants"}
6566
{"_type": "ptag", "name": "TAG_KIND_DESCRIPTION", "parserName": "Go", "path": "f,func", "pattern": "functions"}
@@ -69,18 +70,17 @@
6970
{"_type": "ptag", "name": "TAG_KIND_DESCRIPTION", "parserName": "Go", "path": "p,package", "pattern": "packages"}
7071
{"_type": "ptag", "name": "TAG_KIND_DESCRIPTION", "parserName": "Go", "path": "s,struct", "pattern": "structs"}
7172
{"_type": "ptag", "name": "TAG_KIND_DESCRIPTION", "parserName": "Go", "path": "t,type", "pattern": "types"}
72-
{"_type": "ptag", "name": "TAG_KIND_DESCRIPTION", "parserName": "Go", "path": "u,unknown", "pattern": "unknown"}
7373
{"_type": "ptag", "name": "TAG_KIND_DESCRIPTION", "parserName": "Go", "path": "v,var", "pattern": "variables"}
7474
{"_type": "ptag", "name": "TAG_KIND_DESCRIPTION", "parserName": "Man", "path": "S,subsection", "pattern": "sub sections"}
7575
{"_type": "ptag", "name": "TAG_KIND_DESCRIPTION", "parserName": "Man", "path": "s,section", "pattern": "sections"}
7676
{"_type": "ptag", "name": "TAG_KIND_DESCRIPTION", "parserName": "Man", "path": "t,title", "pattern": "titles"}
7777
{"_type": "ptag", "name": "TAG_KIND_DESCRIPTION", "parserName": "Python", "path": "I,namespace", "pattern": "name referring a module defined in other file"}
78+
{"_type": "ptag", "name": "TAG_KIND_DESCRIPTION", "parserName": "Python", "path": "Y,unknown", "pattern": "name referring a class\\/variable\\/function\\/module defined in other module"}
7879
{"_type": "ptag", "name": "TAG_KIND_DESCRIPTION", "parserName": "Python", "path": "c,class", "pattern": "classes"}
7980
{"_type": "ptag", "name": "TAG_KIND_DESCRIPTION", "parserName": "Python", "path": "f,function", "pattern": "functions"}
8081
{"_type": "ptag", "name": "TAG_KIND_DESCRIPTION", "parserName": "Python", "path": "i,module", "pattern": "modules"}
8182
{"_type": "ptag", "name": "TAG_KIND_DESCRIPTION", "parserName": "Python", "path": "m,member", "pattern": "class members"}
8283
{"_type": "ptag", "name": "TAG_KIND_DESCRIPTION", "parserName": "Python", "path": "v,variable", "pattern": "variables"}
83-
{"_type": "ptag", "name": "TAG_KIND_DESCRIPTION", "parserName": "Python", "path": "x,unknown", "pattern": "name referring a class\\/variable\\/function\\/module defined in other module"}
8484
{"_type": "ptag", "name": "TAG_OUTPUT_EXCMD", "path": "mixed", "pattern": "number, pattern, mixed, or combineV2"}
8585
{"_type": "ptag", "name": "TAG_PATTERN_LENGTH_LIMIT", "path": "96", "pattern": "0 for no limit"}
8686
{"_type": "ptag", "name": "TAG_PROGRAM_AUTHOR", "path": "Universal Ctags Team", "pattern": ""}

‎Tmain/list-roles.d/stdout-expected.txt‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -49,24 +49,24 @@ Flex I/import import on imports
4949
GDScript c/class extended on used as a base class for extending
5050
GemSpec g/gem develDep on specifying development dependency
5151
GemSpec g/gem runtimeDep on specifying runtime dependency
52+
Go Y/unknown receiverType on receiver type
5253
Go p/package imported on imported package
53-
Go u/unknown receiverType on receiver type
5454
HTML C/stylesheet extFile on referenced as external files
5555
HTML J/script extFile on referenced as external files
5656
HTML c/class attribute on assigned as attributes
5757
Java p/package imported on imported package
5858
JavaScript c/class chainElt off (EXPERIMENTAL)used as an element in a name chain like a.b.c
5959
JavaScript v/variable chainElt off (EXPERIMENTAL)used as an element in a name chain like a.b.c
60+
Julia Y/unknown imported on loaded by "import"
61+
Julia Y/unknown used on loaded by "using"
6062
Julia n/module imported on loaded by "import"
6163
Julia n/module namespace on only some symbols in it are imported
6264
Julia n/module used on loaded by "using"
63-
Julia x/unknown imported on loaded by "import"
64-
Julia x/unknown used on loaded by "using"
6565
Kconfig k/kconfig source on kconfig file loaded with source directive
6666
LdScript i/inputSection discarded on discarded when linking
6767
LdScript i/inputSection mapped on mapped to output section
6868
LdScript s/symbol entrypoint on entry points
69-
Lua X/unknown referenced off referenced somehow
69+
Lua Y/unknown referenced off referenced somehow
7070
M4 I/macrofile included on included macro
7171
M4 I/macrofile sincluded on silently included macro
7272
M4 d/macro undef on undefined
@@ -79,11 +79,11 @@ Perl M/module used on specified in `use' b
7979
Perl h/heredoc endmarker on end marker
8080
Protobuf D/protodef imported on imported
8181
Protobuf m/message extension on extending the message
82+
Python Y/unknown imported on imported from the other module
83+
Python Y/unknown indirectlyImported on classes/variables/functions/modules imported in alternative name
8284
Python i/module imported on imported modules
8385
Python i/module indirectlyImported on module imported in alternative name
8486
Python i/module namespace on namespace from where classes/variables/functions are imported
85-
Python x/unknown imported on imported from the other module
86-
Python x/unknown indirectlyImported on classes/variables/functions/modules imported in alternative name
8787
R l/library library on library attached by library function
8888
R l/library require on library attached by require function
8989
R s/source source on source loaded by source fucntion
@@ -167,24 +167,24 @@ Flex I/import import on imports
167167
GDScript c/class extended on used as a base class for extending
168168
GemSpec g/gem develDep on specifying development dependency
169169
GemSpec g/gem runtimeDep on specifying runtime dependency
170+
Go Y/unknown receiverType on receiver type
170171
Go p/package imported on imported package
171-
Go u/unknown receiverType on receiver type
172172
HTML C/stylesheet extFile on referenced as external files
173173
HTML J/script extFile on referenced as external files
174174
HTML c/class attribute on assigned as attributes
175175
Java p/package imported on imported package
176176
JavaScript c/class chainElt off (EXPERIMENTAL)used as an element in a name chain like a.b.c
177177
JavaScript v/variable chainElt off (EXPERIMENTAL)used as an element in a name chain like a.b.c
178+
Julia Y/unknown imported on loaded by "import"
179+
Julia Y/unknown used on loaded by "using"
178180
Julia n/module imported on loaded by "import"
179181
Julia n/module namespace on only some symbols in it are imported
180182
Julia n/module used on loaded by "using"
181-
Julia x/unknown imported on loaded by "import"
182-
Julia x/unknown used on loaded by "using"
183183
Kconfig k/kconfig source on kconfig file loaded with source directive
184184
LdScript i/inputSection discarded on discarded when linking
185185
LdScript i/inputSection mapped on mapped to output section
186186
LdScript s/symbol entrypoint on entry points
187-
Lua X/unknown referenced off referenced somehow
187+
Lua Y/unknown referenced off referenced somehow
188188
M4 I/macrofile included on included macro
189189
M4 I/macrofile sincluded on silently included macro
190190
M4 d/macro undef on undefined
@@ -197,11 +197,11 @@ Perl M/module used on specified in `use' b
197197
Perl h/heredoc endmarker on end marker
198198
Protobuf D/protodef imported on imported
199199
Protobuf m/message extension on extending the message
200+
Python Y/unknown imported on imported from the other module
201+
Python Y/unknown indirectlyImported on classes/variables/functions/modules imported in alternative name
200202
Python i/module imported on imported modules
201203
Python i/module indirectlyImported on module imported in alternative name
202204
Python i/module namespace on namespace from where classes/variables/functions are imported
203-
Python x/unknown imported on imported from the other module
204-
Python x/unknown indirectlyImported on classes/variables/functions/modules imported in alternative name
205205
R l/library library on library attached by library function
206206
R l/library require on library attached by require function
207207
R s/source source on source loaded by source fucntion

‎Tmain/pretend-option.d/stdout-expected.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
u unknown type of definitions
1+
Y unknown type of definitions
22
f functions
33
v variables
44
m macros

‎Units/parser-iPythonCell.r/default-formats.d/expected.tags‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
np input.py /^import numpy as np$/;" I language:Python nameref:module:numpy
2-
plt input.py /^from matplotlib import pyplot as plt$/;" x language:Python nameref:unknown:pyplot
2+
plt input.py /^from matplotlib import pyplot as plt$/;" Y language:Python nameref:unknown:pyplot
33
generate sound input.py /^# %% generate sound$/;" c language:IPythonCell
44
f input.py /^f = 12000$/;" v language:Python
55
fs input.py /^fs = 44100$/;" v language:Python

‎Units/parser-iPythonCell.r/double-sharps.d/expected.tags‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
np input.py /^import numpy as np$/;" I language:Python nameref:module:numpy
2-
plt input.py /^from matplotlib import pyplot as plt$/;" x language:Python nameref:unknown:pyplot
2+
plt input.py /^from matplotlib import pyplot as plt$/;" Y language:Python nameref:unknown:pyplot
33
generate sound input.py /^## generate sound$/;" c language:IPythonCell extras:subparser,doubleSharps
44
f input.py /^f = 12000$/;" v language:Python
55
fs input.py /^fs = 44100$/;" v language:Python

‎Units/parser-lisp.r/simple-lisp.d/expected.tags‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@ c0 input.l /^(defconstant c0 5)$/;" c
66
C1 input.l /^(DEFCONSTANT C1 6)$/;" c
77
defunknown0 input.l /^(defmacro defunknown0 (s)$/;" m
88
DEFUNKNOWN1 input.l /^(DEFMACRO DEFUNKNOWN1 (s)$/;" m
9-
unknown input.l /^(defunknown1 unknown)$/;" u
9+
unknown input.l /^(defunknown1 unknown)$/;" Y

‎Units/parser-python.r/python-dot-in-import.d/expected.tags‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
A.B input.py /^from A.B import C as D$/;" i roles:namespace
2-
C input.py /^from A.B import C as D$/;" x module:A.B roles:indirectlyImported
3-
D input.py /^from A.B import C as D$/;" x roles:def nameref:unknown:C
2+
C input.py /^from A.B import C as D$/;" Y module:A.B roles:indirectlyImported
3+
D input.py /^from A.B import C as D$/;" Y roles:def nameref:unknown:C
44
. input.py /^from . import E$/;" i roles:namespace
5-
E input.py /^from . import E$/;" x module:. roles:imported
5+
E input.py /^from . import E$/;" Y module:. roles:imported
66
.F input.py /^from .F import G$/;" i roles:namespace
7-
G input.py /^from .F import G$/;" x module:.F roles:imported
7+
G input.py /^from .F import G$/;" Y module:.F roles:imported
88
H.I input.py /^import H.I$/;" i roles:imported
99
.J.K input.py /^from .J.K import L$/;" i roles:namespace
10-
L input.py /^from .J.K import L$/;" x module:.J.K roles:imported
10+
L input.py /^from .J.K import L$/;" Y module:.J.K roles:imported
1111
..M.N input.py /^from ..M.N import O$/;" i roles:namespace
12-
O input.py /^from ..M.N import O$/;" x module:..M.N roles:imported
12+
O input.py /^from ..M.N import O$/;" Y module:..M.N roles:imported

‎docs/man/ctags.1.rst‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2092,6 +2092,19 @@ identical.
20922092

20932093
This can be avoided by use of the ``--excmd=n`` option.
20942094

2095+
INCOMPATIBLE CHANGES
2096+
--------------------
2097+
See :ref:`ctags-incompatibilities(7) <ctags-incompatibilities(7)>` about incompatibilities between Universal
2098+
Ctags and Exuberant Ctags.
2099+
2100+
This section describes major incompatibilities within versions of Universal
2101+
Ctags.
2102+
2103+
Unifying the kind Letter for ``unknown`` kinds
2104+
Some parsers used different kind letters for ``unknown`` kinds.
2105+
EmacsLisp used ``u``. Go used ``u``. Julian used ``x``. Lisp used ``u``.
2106+
Lua used ``X``. and Python used ``x``. They were unified to ``Y`` in
2107+
the during development of version 5.9.x.
20952108

20962109
BUGS
20972110
----

‎man/ctags.1.rst.in‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2092,6 +2092,19 @@ identical.
20922092

20932093
This can be avoided by use of the ``--excmd=n`` option.
20942094

2095+
INCOMPATIBLE CHANGES
2096+
--------------------
2097+
See ctags-incompatibilities(7) about incompatibilities between Universal
2098+
Ctags and Exuberant Ctags.
2099+
2100+
This section describes major incompatibilities within versions of Universal
2101+
Ctags.
2102+
2103+
Unifying the kind Letter for ``unknown`` kinds
2104+
Some parsers used different kind letters for ``unknown`` kinds.
2105+
EmacsLisp used ``u``. Go used ``u``. Julian used ``x``. Lisp used ``u``.
2106+
Lua used ``X``. and Python used ``x``. They were unified to ``Y`` in
2107+
the during development of version 5.9.x.
20952108

20962109
BUGS
20972110
----

‎parsers/go.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ static kindDefinition GoKinds[] = {
146146
{true, 'm', "member", "struct members"},
147147
{true, 'M', "anonMember", "struct anonymous members"},
148148
{true, 'n', "methodSpec", "interface method specification"},
149-
{true, 'u', "unknown", "unknown",
149+
{true, 'Y', "unknown", "unknown",
150150
.referenceOnly = true, ATTACH_ROLES (GoUnknownRoles)},
151151
{true, 'P', "packageName", "name for specifying imported package"},
152152
{true, 'a', "talias", "type aliases"},

0 commit comments

Comments
 (0)