Skip to content

Commit 1d9e6fe

Browse files
authored
Merge pull request #3198 from masatake/elixir-minor-revise
Elixir minor revise (including SELF-INCOMPATIBLE change)
2 parents 37d9f8a + bd18636 commit 1d9e6fe

File tree

29 files changed

+196
-73
lines changed

29 files changed

+196
-73
lines changed

Tmain/list-fields-fixed-field-handling.d/stdout-expected.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ R NONE no NONE s-- no -- Marker (R or D)
1010
S signature no NONE s-- no rw Signature of routine (e.g. prototype or parameter list)
1111
T epoch no NONE -i- no -- the last modified time of the input file (only for F/file kind tag)
1212
Z scope no NONE s-- no rw [tags output] prepend "scope:" key to s/scope field output, [xref and json output] the same as s/ field
13-
a access no NONE s-- no -- Access (or export) of class members
13+
a access no NONE s-- no rw Access (or export) of class members
1414
e end no NONE -i- no rw end lines of various items
1515
f file no NONE --b no -- File-restricted scoping
1616
i inherits no NONE s-b no -w Inheritance information
@@ -37,7 +37,7 @@ R NONE no NONE s-- no -- Marker (R or D)
3737
S signature no NONE s-- no rw Signature of routine (e.g. prototype or parameter list)
3838
T epoch no NONE -i- no -- the last modified time of the input file (only for F/file kind tag)
3939
Z scope no NONE s-- no rw [tags output] prepend "scope:" key to s/scope field output, [xref and json output] the same as s/ field
40-
a access no NONE s-- no -- Access (or export) of class members
40+
a access no NONE s-- no rw Access (or export) of class members
4141
e end no NONE -i- no rw end lines of various items
4242
f file no NONE --b no -- File-restricted scoping
4343
i inherits no NONE s-b no -w Inheritance information
@@ -64,7 +64,7 @@ R NONE no NONE s-- no -- Marker (R or D)
6464
S signature no NONE s-- no rw Signature of routine (e.g. prototype or parameter list)
6565
T epoch no NONE -i- no -- the last modified time of the input file (only for F/file kind tag)
6666
Z scope no NONE s-- no rw [tags output] prepend "scope:" key to s/scope field output, [xref and json output] the same as s/ field
67-
a access no NONE s-- no -- Access (or export) of class members
67+
a access no NONE s-- no rw Access (or export) of class members
6868
e end no NONE -i- no rw end lines of various items
6969
f file no NONE --b no -- File-restricted scoping
7070
i inherits no NONE s-b no -w Inheritance information
@@ -91,7 +91,7 @@ R NONE no NONE s-- no -- Marker (R or D)
9191
S signature no NONE s-- no rw Signature of routine (e.g. prototype or parameter list)
9292
T epoch no NONE -i- no -- the last modified time of the input file (only for F/file kind tag)
9393
Z scope no NONE s-- no rw [tags output] prepend "scope:" key to s/scope field output, [xref and json output] the same as s/ field
94-
a access no NONE s-- no -- Access (or export) of class members
94+
a access no NONE s-- no rw Access (or export) of class members
9595
e end no NONE -i- no rw end lines of various items
9696
f file no NONE --b no -- File-restricted scoping
9797
i inherits no NONE s-b no -w Inheritance information

Tmain/list-fields-with-prefix.d/stdout-expected.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ x UCTAGSxpath no NONE s-- no -- xpath for
1818
- UCTAGSmacrodef no CPreProcessor s-- no -- macro definition
1919
- UCTAGSmacrodef no CUDA s-- no -- macro definition
2020
- UCTAGSproperties no CUDA s-- no -- properties (static, inline, mutable,...)
21-
- UCTAGSaccess yes Elixir s-- no -- access
2221
- UCTAGShowImported no Go s-- no -- how the package is imported ("inline" for `.' or "init" for `_')
2322
- UCTAGSpackage yes Go s-- no -- the real package specified by the package name
2423
- UCTAGSpackageName yes Go s-- no -- the name for referring the package

Tmain/list-fields.d/stdout-expected.txt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ R NONE no NONE s-- no -- Marker (R or D) representing whether tag is definition
99
S signature no NONE s-- no rw Signature of routine (e.g. prototype or parameter list)
1010
T epoch yes NONE -i- no -- the last modified time of the input file (only for F/file kind tag)
1111
Z scope no NONE s-- no rw [tags output] prepend "scope:" key to s/scope field output, [xref and json output] the same as s/ field
12-
a access no NONE s-- no -- Access (or export) of class members
12+
a access no NONE s-- no rw Access (or export) of class members
1313
e end no NONE -i- no rw end lines of various items
1414
f file yes NONE --b no -- File-restricted scoping
1515
i inherits no NONE s-b no -w Inheritance information
@@ -36,7 +36,6 @@ z kind no NONE s-- no r- [tags output] prepend "kind:" to k/ (or K/) field outpu
3636
- macrodef no CPreProcessor s-- no -- macro definition
3737
- macrodef no CUDA s-- no -- macro definition
3838
- properties no CUDA s-- no -- properties (static, inline, mutable,...)
39-
- access yes Elixir s-- no -- access
4039
- howImported no Go s-- no -- how the package is imported ("inline" for `.' or "init" for `_')
4140
- package yes Go s-- no -- the real package specified by the package name
4241
- packageName yes Go s-- no -- the name for referring the package

Tmain/optscript.d/error-undefined-if-if.expected

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@ top| |bottom
44
Execution stack:
55
top| a {a} --if-- {true {a} if} --if-- |bottom
66
Dictionary stack:
7-
top| -dict:1- -dict:87- |bottom
7+
top| -dict:1- -dict:88- |bottom

Tmain/optscript.d/error-undefined-if.expected

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@ top| |bottom
44
Execution stack:
55
top| a {a} --if-- |bottom
66
Dictionary stack:
7-
top| -dict:1- -dict:87- |bottom
7+
top| -dict:1- -dict:88- |bottom

Tmain/optscript.d/typeattrconv.expected

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,3 +21,13 @@ dicttype
2121
{add}
2222
arraytype
2323
/xyz
24+
(abc)
25+
(efg)
26+
(true)
27+
(false)
28+
(99)
29+
(-309)
30+
(--nulltype--)
31+
(--arraytype--)
32+
(--dicttype--)
33+
(--arraytype--)

Tmain/optscript.d/typeattrconv.ps

210 Bytes
Binary file not shown.
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
--sort=no
2+
--langdef=X
3+
--map-X=.unknown
4+
--kinddef-X=v,var,variables
5+
--fields=+{access}
6+
--regex-X=/^(pub|priv) +var +([a-z]+)$/\2/v/{{
7+
. \1 (pub) eq {(public)}{(private)} ifelse access:
8+
mark . :access {
9+
0 string cvs
10+
(-) \2 _buildstring
11+
/var _tag _commit pop
12+
} {
13+
cleartomark
14+
} ifelse
15+
}}
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
x input.unknown /^pub var x$/;" v access:public
2+
public-x input.unknown /^pub var x$/;" v
3+
y input.unknown /^priv var y$/;" v access:private
4+
private-y input.unknown /^priv var y$/;" v
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
pub var x
2+
priv var y

0 commit comments

Comments
 (0)