Skip to content

Commit f978721

Browse files
authored
Merge pull request #3192 from masatake/cpp-cond-role
CPreProcessor: extract macro names used in #if/#ifdef/#elif conditions as reference tags
2 parents f9c2d52 + d00bddf commit f978721

File tree

18 files changed

+311
-117
lines changed

18 files changed

+311
-117
lines changed
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
L label yes no 0 C goto labels
22
D macroparam no no 0 C parameters inside macro definitions
3-
d macro no no 1 C macro definitions
3+
d macro no no 2 C macro definitions

Tmain/list-kinds-full.d/stdout-expected.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#LETTER NAME ENABLED REFONLY NROLES MASTER DESCRIPTION
22
D macroparam no no 0 C parameters inside macro definitions
33
L label no no 0 C goto labels
4-
d macro yes no 1 C macro definitions
4+
d macro yes no 2 C macro definitions
55
e enumerator yes no 0 C enumerators (values inside an enumeration)
66
f function yes no 0 C function definitions
77
g enum yes no 0 C enumeration names
@@ -23,7 +23,7 @@ N name no no 0 NONE names imported via using scope::symbol
2323
U using no yes 0 NONE using namespace statements
2424
Z tparam no no 0 NONE template parameters
2525
c class yes no 0 NONE classes
26-
d macro yes no 1 C macro definitions
26+
d macro yes no 2 C macro definitions
2727
e enumerator yes no 0 C enumerators (values inside an enumeration)
2828
f function yes no 0 C function definitions
2929
g enum yes no 0 C enumeration names

Tmain/list-roles-with-kind-names.d/stdout-expected.txt

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,25 +43,32 @@ Automake d/directory ltlibrary on directory for LTLIBRARIES primary
4343
Automake d/directory man on directory for MANS primary
4444
Automake d/directory program on directory for PROGRAMS primary
4545
Automake d/directory script on directory for SCRIPTS primary
46+
C d/macro condition off used in part of #if/#ifdef/#elif conditions
4647
C d/macro undef on undefined
4748
C h/header local on local header
4849
C h/header system on system header
50+
C++ d/macro condition off used in part of #if/#ifdef/#elif conditions
4951
C++ d/macro undef on undefined
5052
C++ h/header local on local header
5153
C++ h/header system on system header
54+
CPreProcessor d/macro condition off used in part of #if/#ifdef/#elif conditions
5255
CPreProcessor d/macro undef on undefined
5356
CPreProcessor h/header local on local header
5457
CPreProcessor h/header system on system header
58+
CUDA d/macro condition off used in part of #if/#ifdef/#elif conditions
5559
CUDA d/macro undef on undefined
5660
CUDA h/header local on local header
5761
CUDA h/header system on system header
5862
M4 d/macro undef on undefined
63+
OldC d/macro condition off used in part of #if/#ifdef/#elif conditions
5964
OldC d/macro undef on undefined
6065
OldC h/header local on local header
6166
OldC h/header system on system header
67+
OldC++ d/macro condition off used in part of #if/#ifdef/#elif conditions
6268
OldC++ d/macro undef on undefined
6369
OldC++ h/header local on local header
6470
OldC++ h/header system on system header
71+
Vera d/macro condition off used in part of #if/#ifdef/#elif conditions
6572
Vera d/macro undef on undefined
6673
Vera h/header local on local header
6774
Vera h/header system on system header

0 commit comments

Comments
 (0)