Skip to content

Commit 3af4135

Browse files
masatakemasatake
authored
Merge pull request #3574 from masatake/ctags6
Universal Ctags 6.0.0, slightly safer ctags
2 parents 2fd9b0c + 373863f commit 3af4135

28 files changed

+41
-44
lines changed

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

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
{"_type": "tag", "name": "main", "path": "input.go", "pattern": "/^func main() {$/", "language": "Go", "line": 3, "kind": "func", "signature": "()", "scope": "main", "scopeKind": "package", "roles": "def", "end": 4}
1616
{"_type": "tag", "name": "main", "path": "input.go", "pattern": "/^package main$/", "language": "Go", "line": 1, "kind": "package", "roles": "def"}
1717
# json --languages=+man --fields=*-T --extras=*
18-
{"_type": "ptag", "name": "JSON_OUTPUT_VERSION", "path": "0.0", "pattern": "in development"}
18+
{"_type": "ptag", "name": "JSON_OUTPUT_VERSION", "path": "1.0", "pattern": "in development"}
1919
{"_type": "ptag", "name": "TAG_EXTRA_DESCRIPTION", "path": "anonymous", "pattern": "Include tags for non-named objects like lambda"}
2020
{"_type": "ptag", "name": "TAG_EXTRA_DESCRIPTION", "path": "fileScope", "pattern": "Include tags of file scope"}
2121
{"_type": "ptag", "name": "TAG_EXTRA_DESCRIPTION", "path": "guest", "pattern": "Include tags generated by guest parsers"}
@@ -90,16 +90,16 @@
9090
{"_type": "ptag", "name": "TAG_PROGRAM_AUTHOR", "path": "Universal Ctags Team", "pattern": ""}
9191
{"_type": "ptag", "name": "TAG_PROGRAM_NAME", "path": "Universal Ctags", "pattern": "Derived from Exuberant Ctags"}
9292
{"_type": "ptag", "name": "TAG_PROGRAM_URL", "path": "https://ctags.io/", "pattern": "official site"}
93-
{"_type": "ptag", "name": "TAG_ROLE_DESCRIPTION", "parserName": "C!header", "path": "local", "pattern": "local header"}
94-
{"_type": "ptag", "name": "TAG_ROLE_DESCRIPTION", "parserName": "C!header", "path": "system", "pattern": "system header"}
95-
{"_type": "ptag", "name": "TAG_ROLE_DESCRIPTION", "parserName": "C!macro", "path": "undef", "pattern": "undefined"}
96-
{"_type": "ptag", "name": "TAG_ROLE_DESCRIPTION", "parserName": "Go!package", "path": "imported", "pattern": "imported package"}
97-
{"_type": "ptag", "name": "TAG_ROLE_DESCRIPTION", "parserName": "Go!unknown", "path": "receiverType", "pattern": "receiver type"}
98-
{"_type": "ptag", "name": "TAG_ROLE_DESCRIPTION", "parserName": "Python!module", "path": "imported", "pattern": "imported modules"}
99-
{"_type": "ptag", "name": "TAG_ROLE_DESCRIPTION", "parserName": "Python!module", "path": "indirectlyImported", "pattern": "module imported in alternative name"}
100-
{"_type": "ptag", "name": "TAG_ROLE_DESCRIPTION", "parserName": "Python!module", "path": "namespace", "pattern": "namespace from where classes\\/variables\\/functions are imported"}
101-
{"_type": "ptag", "name": "TAG_ROLE_DESCRIPTION", "parserName": "Python!unknown", "path": "imported", "pattern": "imported from the other module"}
102-
{"_type": "ptag", "name": "TAG_ROLE_DESCRIPTION", "parserName": "Python!unknown", "path": "indirectlyImported", "pattern": "classes\\/variables\\/functions\\/modules imported in alternative name"}
93+
{"_type": "ptag", "name": "TAG_ROLE_DESCRIPTION", "parserName": "C", "kindName": "header", "path": "local", "pattern": "local header"}
94+
{"_type": "ptag", "name": "TAG_ROLE_DESCRIPTION", "parserName": "C", "kindName": "header", "path": "system", "pattern": "system header"}
95+
{"_type": "ptag", "name": "TAG_ROLE_DESCRIPTION", "parserName": "C", "kindName": "macro", "path": "undef", "pattern": "undefined"}
96+
{"_type": "ptag", "name": "TAG_ROLE_DESCRIPTION", "parserName": "Go", "kindName": "package", "path": "imported", "pattern": "imported package"}
97+
{"_type": "ptag", "name": "TAG_ROLE_DESCRIPTION", "parserName": "Go", "kindName": "unknown", "path": "receiverType", "pattern": "receiver type"}
98+
{"_type": "ptag", "name": "TAG_ROLE_DESCRIPTION", "parserName": "Python", "kindName": "module", "path": "imported", "pattern": "imported modules"}
99+
{"_type": "ptag", "name": "TAG_ROLE_DESCRIPTION", "parserName": "Python", "kindName": "module", "path": "indirectlyImported", "pattern": "module imported in alternative name"}
100+
{"_type": "ptag", "name": "TAG_ROLE_DESCRIPTION", "parserName": "Python", "kindName": "module", "path": "namespace", "pattern": "namespace from where classes\\/variables\\/functions are imported"}
101+
{"_type": "ptag", "name": "TAG_ROLE_DESCRIPTION", "parserName": "Python", "kindName": "unknown", "path": "imported", "pattern": "imported from the other module"}
102+
{"_type": "ptag", "name": "TAG_ROLE_DESCRIPTION", "parserName": "Python", "kindName": "unknown", "path": "indirectlyImported", "pattern": "classes\\/variables\\/functions\\/modules imported in alternative name"}
103103
{"_type": "tag", "name": "Foo", "path": "input.py", "pattern": "/^class Foo:$/", "language": "Python", "line": 1, "kind": "class", "inherits": false, "access": "public", "roles": "def", "end": 3}
104104
{"_type": "tag", "name": "Foo.doIt", "path": "input.py", "pattern": "/^ def doIt():$/", "language": "Python", "line": 2, "kind": "member", "access": "public", "signature": "()", "scope": "Foo", "scopeKind": "class", "roles": "def", "extras": "qualified", "end": 3}
105105
{"_type": "tag", "name": "N\tA\tM\tE", "path": "input.1", "pattern": "/^.SH \"\tN\tA\tM\tE\t\"$/", "language": "Man", "line": 1, "kind": "section", "roles": "def", "end": 1}

‎Tmain/utils.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,5 +146,5 @@ check_encoding()
146146

147147
jdropver()
148148
{
149-
sed -e 's/, "version": "5.9.0"//'
149+
sed -e 's/, "version": "[0-9.]*"//'
150150
}

‎configure.ac‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
# Process this file with autoconf to produce a configure script.
88

99
AC_PREREQ([2.64])
10-
AC_INIT([universal-ctags],[5.9.0])
10+
AC_INIT([universal-ctags],[6.0.0])
1111

1212
if ! test -e "${srcdir}/config.h.in"; then
1313
echo "---"

‎docs/man/ctags-client-tools.7.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ ctags-client-tools
66

77
Hints for developing a tool using ctags command and tags output
88

9-
:Version: 5.9.0
9+
:Version: 6.0.0
1010
:Manual group: Universal Ctags
1111
:Manual section: 7
1212

‎docs/man/ctags-faq.7.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ ctags-faq
66

77
Universal Ctags FAQ
88

9-
:Version: 5.9.0
9+
:Version: 6.0.0
1010
:Manual group: Universal Ctags
1111
:Manual section: 7
1212

‎docs/man/ctags-incompatibilities.7.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ ctags-incompatibilities
66

77
Incompatibilities between Universal Ctags and Exuberant Ctags
88

9-
:Version: 5.9.0
9+
:Version: 6.0.0
1010
:Manual group: Universal Ctags
1111
:Manual section: 7
1212

‎docs/man/ctags-lang-asm.7.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ ctags-lang-asm
66

77
Random notes about tagging Assembly language source code with Universal Ctags
88

9-
:Version: 5.9.0
9+
:Version: 6.0.0
1010
:Manual group: Universal Ctags
1111
:Manual section: 7
1212

‎docs/man/ctags-lang-elm.7.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ ctags-lang-elm
66

77
Random notes about tagging Elm source code with Universal Ctags
88

9-
:Version: 5.9.0
9+
:Version: 6.0.0
1010
:Manual group: Universal Ctags
1111
:Manual section: 7
1212

‎docs/man/ctags-lang-gdscript.7.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ ctags-lang-gdscript
66

77
Random notes about tagging GDScript source code with Universal Ctags
88

9-
:Version: 5.9.0
9+
:Version: 6.0.0
1010
:Manual group: Universal Ctags
1111
:Manual section: 7
1212

‎docs/man/ctags-lang-iPythonCell.7.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ ctags-lang-iPythonCell
66

77
The man page of the iPythonCell parser for Universal Ctags
88

9-
:Version: 5.9.0
9+
:Version: 6.0.0
1010
:Manual group: Universal Ctags
1111
:Manual section: 7
1212

0 commit comments

Comments
 (0)