Skip to content

Commit e9c5b48

Browse files
masatakemasatake
authored
Merge pull request #4271 from masatake/main--show-version-in-list
main: enhance parser versioning
2 parents e6a4947 + e112546 commit e9c5b48

File tree

103 files changed

+1961
-1375
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

103 files changed

+1961
-1375
lines changed

‎Tmain/broken-extradef.d/stdout-expected.txt‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -12,31 +12,31 @@
1212
# no input file
1313

1414
# inject a flag separator
15-
#LETTER NAME ENABLED LANGUAGE FIXED DESCRIPTION
16-
- extra no IMAGINARY no desc
15+
#LETTER NAME ENABLED LANGUAGE FIXED VER DESCRIPTION
16+
- extra no IMAGINARY no 0 desc
1717

1818
# inject a broken flag separator(1)
19-
#LETTER NAME ENABLED LANGUAGE FIXED DESCRIPTION
20-
- extra no IMAGINARY no desc
19+
#LETTER NAME ENABLED LANGUAGE FIXED VER DESCRIPTION
20+
- extra no IMAGINARY no 0 desc
2121

2222
# inject a broken flag separator(2)
23-
#LETTER NAME ENABLED LANGUAGE FIXED DESCRIPTION
24-
- extra no IMAGINARY no desc
23+
#LETTER NAME ENABLED LANGUAGE FIXED VER DESCRIPTION
24+
- extra no IMAGINARY no 0 desc
2525

2626
# use a { in description (1)
27-
#LETTER NAME ENABLED LANGUAGE FIXED DESCRIPTION
28-
- extra no IMAGINARY no desc{
27+
#LETTER NAME ENABLED LANGUAGE FIXED VER DESCRIPTION
28+
- extra no IMAGINARY no 0 desc{
2929

3030
# use a { in description (2)
31-
#LETTER NAME ENABLED LANGUAGE FIXED DESCRIPTION
32-
- extra no IMAGINARY no desc{}
31+
#LETTER NAME ENABLED LANGUAGE FIXED VER DESCRIPTION
32+
- extra no IMAGINARY no 0 desc{}
3333

3434
# use a \ in description
35-
#LETTER NAME ENABLED LANGUAGE FIXED DESCRIPTION
36-
- extra no IMAGINARY no desc\backslash
35+
#LETTER NAME ENABLED LANGUAGE FIXED VER DESCRIPTION
36+
- extra no IMAGINARY no 0 desc\backslash
3737

3838
# description started from {
3939

4040
# description started from \{
41-
#LETTER NAME ENABLED LANGUAGE FIXED DESCRIPTION
42-
- extra no IMAGINARY no {
41+
#LETTER NAME ENABLED LANGUAGE FIXED VER DESCRIPTION
42+
- extra no IMAGINARY no 0 {

‎Tmain/broken-fielddef.d/stdout-expected.txt‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -12,31 +12,31 @@
1212
# no input file
1313

1414
# inject a flag separator
15-
#LETTER NAME ENABLED LANGUAGE JSTYPE FIXED OP DESCRIPTION
16-
- field no IMAGINARY s-- no -- desc
15+
#LETTER NAME ENABLED LANGUAGE JSTYPE FIXED OP VER DESCRIPTION
16+
- field no IMAGINARY s-- no -- 0 desc
1717

1818
# inject a broken flag separator(1)
19-
#LETTER NAME ENABLED LANGUAGE JSTYPE FIXED OP DESCRIPTION
20-
- field no IMAGINARY s-- no -- desc
19+
#LETTER NAME ENABLED LANGUAGE JSTYPE FIXED OP VER DESCRIPTION
20+
- field no IMAGINARY s-- no -- 0 desc
2121

2222
# inject a broken flag separator(2)
23-
#LETTER NAME ENABLED LANGUAGE JSTYPE FIXED OP DESCRIPTION
24-
- field no IMAGINARY s-- no -- desc
23+
#LETTER NAME ENABLED LANGUAGE JSTYPE FIXED OP VER DESCRIPTION
24+
- field no IMAGINARY s-- no -- 0 desc
2525

2626
# use a { in description (1)
27-
#LETTER NAME ENABLED LANGUAGE JSTYPE FIXED OP DESCRIPTION
28-
- field no IMAGINARY s-- no -- desc{
27+
#LETTER NAME ENABLED LANGUAGE JSTYPE FIXED OP VER DESCRIPTION
28+
- field no IMAGINARY s-- no -- 0 desc{
2929

3030
# use a { in description (2)
31-
#LETTER NAME ENABLED LANGUAGE JSTYPE FIXED OP DESCRIPTION
32-
- field no IMAGINARY s-- no -- desc{}
31+
#LETTER NAME ENABLED LANGUAGE JSTYPE FIXED OP VER DESCRIPTION
32+
- field no IMAGINARY s-- no -- 0 desc{}
3333

3434
# use a \ in description
35-
#LETTER NAME ENABLED LANGUAGE JSTYPE FIXED OP DESCRIPTION
36-
- field no IMAGINARY s-- no -- desc\backslash
35+
#LETTER NAME ENABLED LANGUAGE JSTYPE FIXED OP VER DESCRIPTION
36+
- field no IMAGINARY s-- no -- 0 desc\backslash
3737

3838
# description started from {
3939

4040
# description started from \{
41-
#LETTER NAME ENABLED LANGUAGE JSTYPE FIXED OP DESCRIPTION
42-
- field no IMAGINARY s-- no -- {
41+
#LETTER NAME ENABLED LANGUAGE JSTYPE FIXED OP VER DESCRIPTION
42+
- field no IMAGINARY s-- no -- 0 {

‎Tmain/dynamic-kinds.d/stdout-expected.txt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
#LETTER NAME ENABLED REFONLY NROLES MASTER DESCRIPTION
2-
a anchor yes no 0 NONE anchors
3-
b batch yes no 0 NONE batches
1+
#LETTER NAME ENABLED REFONLY NROLES MASTER VER DESCRIPTION
2+
a anchor yes no 0 NONE 0 anchors
3+
b batch yes no 0 NONE 0 batches

‎Tmain/extras-long.d/stdout-expected.txt‎

Lines changed: 90 additions & 90 deletions
Large diffs are not rendered by default.

‎Tmain/fixed-field-handling.d/stdout-expected.txt‎

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,51 +1,51 @@
11
# writer=default
2-
N name yes NONE s-- yes rw tag name
3-
F input yes NONE s-- yes r- input file
4-
P pattern yes NONE s-b yes -- pattern
2+
N name yes NONE s-- yes rw 0 tag name
3+
F input yes NONE s-- yes r- 0 input file
4+
P pattern yes NONE s-b yes -- 0 pattern
55
# writer=u-ctags
6-
N name yes NONE s-- yes rw tag name
7-
F input yes NONE s-- yes r- input file
8-
P pattern yes NONE s-b yes -- pattern
6+
N name yes NONE s-- yes rw 0 tag name
7+
F input yes NONE s-- yes r- 0 input file
8+
P pattern yes NONE s-b yes -- 0 pattern
99
# writer=e-ctags
10-
N name yes NONE s-- yes rw tag name
11-
F input yes NONE s-- yes r- input file
12-
P pattern yes NONE s-b yes -- pattern
10+
N name yes NONE s-- yes rw 0 tag name
11+
F input yes NONE s-- yes r- 0 input file
12+
P pattern yes NONE s-b yes -- 0 pattern
1313
# writer=etags
14-
F input yes NONE s-- no r- input file
15-
N name yes NONE s-- no rw tag name
16-
P pattern yes NONE s-b no -- pattern
14+
F input yes NONE s-- no r- 0 input file
15+
N name yes NONE s-- no rw 0 tag name
16+
P pattern yes NONE s-b no -- 0 pattern
1717
# writer=xref
18-
F input yes NONE s-- no r- input file
19-
N name yes NONE s-- no rw tag name
20-
P pattern yes NONE s-b no -- pattern
18+
F input yes NONE s-- no r- 0 input file
19+
N name yes NONE s-- no rw 0 tag name
20+
P pattern yes NONE s-b no -- 0 pattern
2121
# writer=json
22-
F input yes NONE s-- no r- input file
23-
N name yes NONE s-- no rw tag name
24-
P pattern yes NONE s-b no -- pattern
22+
F input yes NONE s-- no r- 0 input file
23+
N name yes NONE s-- no rw 0 tag name
24+
P pattern yes NONE s-b no -- 0 pattern
2525
# writer=xref N
26-
F input yes NONE s-- no r- input file
27-
N name no NONE s-- no rw tag name
28-
P pattern yes NONE s-b no -- pattern
26+
F input yes NONE s-- no r- 0 input file
27+
N name no NONE s-- no rw 0 tag name
28+
P pattern yes NONE s-b no -- 0 pattern
2929
# writer=xref F
30-
F input no NONE s-- no r- input file
31-
N name yes NONE s-- no rw tag name
32-
P pattern yes NONE s-b no -- pattern
30+
F input no NONE s-- no r- 0 input file
31+
N name yes NONE s-- no rw 0 tag name
32+
P pattern yes NONE s-b no -- 0 pattern
3333
# writer=xref P
34-
F input yes NONE s-- no r- input file
35-
N name yes NONE s-- no rw tag name
36-
P pattern no NONE s-b no -- pattern
34+
F input yes NONE s-- no r- 0 input file
35+
N name yes NONE s-- no rw 0 tag name
36+
P pattern no NONE s-b no -- 0 pattern
3737
# writer=json N
38-
F input yes NONE s-- no r- input file
39-
N name no NONE s-- no rw tag name
40-
P pattern yes NONE s-b no -- pattern
38+
F input yes NONE s-- no r- 0 input file
39+
N name no NONE s-- no rw 0 tag name
40+
P pattern yes NONE s-b no -- 0 pattern
4141
# writer=json F
42-
F input no NONE s-- no r- input file
43-
N name yes NONE s-- no rw tag name
44-
P pattern yes NONE s-b no -- pattern
42+
F input no NONE s-- no r- 0 input file
43+
N name yes NONE s-- no rw 0 tag name
44+
P pattern yes NONE s-b no -- 0 pattern
4545
# writer=json P
46-
F input yes NONE s-- no r- input file
47-
N name yes NONE s-- no rw tag name
48-
P pattern no NONE s-b no -- pattern
46+
F input yes NONE s-- no r- 0 input file
47+
N name yes NONE s-- no rw 0 tag name
48+
P pattern no NONE s-b no -- 0 pattern
4949
# writer=json --fields=-N
5050
{"_type": "tag", "path": "input.c", "pattern": "/^void main(void) {}$/", "typeref": "typename:void", "kind": "function"}
5151
# writer=json --fields=N

‎Tmain/flags-fielddef-datatype.d/stdout-expected.txt‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#LETTER NAME ENABLED LANGUAGE JSTYPE FIXED OP DESCRIPTION
2-
- boolfield no FIELDTEST --b no rw a field having boolean value
3-
- deffield no FIELDTEST s-- no -- a field that type is not specified
4-
- intfield no FIELDTEST -i- no rw a field having integer value
5-
- strboolfield no FIELDTEST s-b no rw a field having string value or false
6-
- strfield no FIELDTEST s-- no rw a field having string value
1+
#LETTER NAME ENABLED LANGUAGE JSTYPE FIXED OP VER DESCRIPTION
2+
- boolfield no FIELDTEST --b no rw 0 a field having boolean value
3+
- deffield no FIELDTEST s-- no -- 0 a field that type is not specified
4+
- intfield no FIELDTEST -i- no rw 0 a field having integer value
5+
- strboolfield no FIELDTEST s-b no rw 0 a field having string value or false
6+
- strfield no FIELDTEST s-- no rw 0 a field having string value

‎Tmain/flags-langdef-version.d/run.sh‎

Lines changed: 0 additions & 7 deletions
This file was deleted.

‎Tmain/flags-langdef-version.d/stdout-expected.txt‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎Tmain/json-output-ptag-in-list-extras.d/stdout-expected.txt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# json regular file
2-
p pseudo yes NONE no Include pseudo tags
2+
p pseudo yes NONE no 0 Include pseudo tags
33
# json -
4-
p pseudo no NONE no Include pseudo tags
4+
p pseudo no NONE no 0 Include pseudo tags
55
# json NOTHING
6-
p pseudo no NONE no Include pseudo tags
6+
p pseudo no NONE no 0 Include pseudo tags

‎Tmain/kind-abnormal-spec.d/stdout-expected.txt‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -16,22 +16,22 @@ z emit a tag having an empty string
1616
Z don't emit a tag having an empty string
1717

1818
# list kinds-full
19-
#LETTER NAME ENABLED REFONLY NROLES MASTER DESCRIPTION
20-
no letter yes no 0 NONE kind with no letter
21-
B ThisShouldNotBePrintedKindNameMustBeGiven yes no 0 NONE beginning of an area for a guest
22-
E ThisShouldNotBePrintedKindNameMustBeGiven yes no 0 NONE end of an area for a guest
23-
L ThisShouldNotBePrintedKindNameMustBeGiven yes no 0 NONE kind with no long name
24-
N nothingSpecial yes no 0 NONE emit a normal tag
25-
Q quit yes no 0 NONE stop the parsing
26-
R rolesDisabled no yes 2 NONE emit a tag with multi roles(disabled by default)
27-
Z dontEmitNullTag yes no 0 NONE don't emit a tag having an empty string
28-
b broken tag yes no 1 NONE name with unwanted characters
29-
d disabled no no 2 NONE a kind disabled by default
30-
e enabled yes no 2 NONE a kind enabled by default
31-
f fieldMaker yes no 0 NONE tag for testing field:
32-
n triggerNotice yes no 0 NONE trigger notice output
33-
r roles yes yes 4 NONE emit a tag with multi roles
34-
z emitNullTag yes no 0 NONE emit a tag having an empty string
19+
#LETTER NAME ENABLED REFONLY NROLES MASTER VER DESCRIPTION
20+
no letter yes no 0 NONE 0 kind with no letter
21+
B ThisShouldNotBePrintedKindNameMustBeGiven yes no 0 NONE 0 beginning of an area for a guest
22+
E ThisShouldNotBePrintedKindNameMustBeGiven yes no 0 NONE 0 end of an area for a guest
23+
L ThisShouldNotBePrintedKindNameMustBeGiven yes no 0 NONE 0 kind with no long name
24+
N nothingSpecial yes no 0 NONE 0 emit a normal tag
25+
Q quit yes no 0 NONE 0 stop the parsing
26+
R rolesDisabled no yes 2 NONE 0 emit a tag with multi roles(disabled by default)
27+
Z dontEmitNullTag yes no 0 NONE 0 don't emit a tag having an empty string
28+
b broken tag yes no 1 NONE 0 name with unwanted characters
29+
d disabled no no 2 NONE 0 a kind disabled by default
30+
e enabled yes no 2 NONE 0 a kind enabled by default
31+
f fieldMaker yes no 0 NONE 0 tag for testing field:
32+
n triggerNotice yes no 0 NONE 0 trigger notice output
33+
r roles yes yes 4 NONE 0 emit a tag with multi roles
34+
z emitNullTag yes no 0 NONE 0 emit a tag having an empty string
3535

3636
# +K
3737
abnormal kindDefinition testing (no letter) input.x /^@$/;" no letter

0 commit comments

Comments
 (0)