Skip to content

Commit 5eda853

Browse files
IdrissRioIdrissRio
committed
C++: Accept changes after C++ extractor preprocessor fix
1 parent 99d9b87 commit 5eda853

File tree

2 files changed

+45
-10
lines changed

2 files changed

+45
-10
lines changed

‎cpp/ql/test/library-tests/preprocessor/preprocessor/pp.cpp

Lines changed: 27 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,32 @@ templateClassContext<int> tcci;
113113
#endif
114114

115115

116-
#if defined /* // test */ SIMPLE_COMMENT //this comment \
116+
#if defined /* //test */ SIMPLE_COMMENT //this comment \
117117
(defined(SIMPLE_COMMENT)) spans over multiple lines
118118
#endif
119+
120+
#warning foo \
121+
122+
#warning foo \
123+
\
124+
/* a comment */
125+
126+
#warning foo \
127+
\
128+
129+
#warning foo \
130+
\
131+
// a comment
132+
133+
134+
#define FOO 8
135+
#define BAR 2
136+
#define BAZ 4
137+
#if ((FOO / BAR) \
138+
== 4) && ((BAZ \
139+
/** comment */ \
140+
* QUX) \
141+
/** comment */ \
142+
> 10)
143+
#define CONDITIONAL_MACRO_3 3
144+
#endif

‎cpp/ql/test/library-tests/preprocessor/preprocessor/preproc.expected

Lines changed: 18 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -33,32 +33,41 @@
3333
| pp.cpp:0:0:0:0 | pp.cpp | 50 | 2 | 50 | 48 | Macro | MACRO_TEMPLATECLASSCONTEXT_REFERENCED | 5 |
3434
| pp.cpp:0:0:0:0 | pp.cpp | 54 | 3 | 54 | 39 | Macro | MACRO_TEMPLATEMETHODCONTEXT | 6 |
3535
| pp.cpp:0:0:0:0 | pp.cpp | 57 | 1 | 57 | 21 | PreprocessorIfdef | INSTANTIATION | N/A |
36-
| pp.cpp:0:0:0:0 | pp.cpp | 59 | 1 | 59 | 6 | PreprocessorElse | N/A | N/A |
36+
| pp.cpp:0:0:0:0 | pp.cpp | 59 | 1 | 59 | 6 | PreprocessorElse | | N/A |
3737
| pp.cpp:0:0:0:0 | pp.cpp | 60 | 3 | 60 | 21 | Macro | IN_TEMPLATE | |
38-
| pp.cpp:0:0:0:0 | pp.cpp | 61 | 1 | 61 | 7 | PreprocessorEndif | N/A | N/A |
38+
| pp.cpp:0:0:0:0 | pp.cpp | 61 | 1 | 61 | 7 | PreprocessorEndif | | N/A |
3939
| pp.cpp:0:0:0:0 | pp.cpp | 69 | 1 | 69 | 21 | Macro | INSTANTIATION | |
4040
| pp.cpp:0:0:0:0 | pp.cpp | 72 | 1 | 72 | 11 | Macro | BAR | |
41-
| pp.cpp:0:0:0:0 | pp.cpp | 74 | 1 | 75 | 15 | PreprocessorIf | defined(BAR) && defined(BAR) | N/A |
41+
| pp.cpp:0:0:0:0 | pp.cpp | 74 | 1 | 75 | 14 | PreprocessorIf | defined(BAR) && defined(BAR) | N/A |
4242
| pp.cpp:0:0:0:0 | pp.cpp | 76 | 1 | 76 | 20 | PreprocessorWarning | BAR defined | N/A |
4343
| pp.cpp:0:0:0:0 | pp.cpp | 77 | 1 | 77 | 6 | PreprocessorEndif | N/A | N/A |
44-
| pp.cpp:0:0:0:0 | pp.cpp | 79 | 1 | 80 | 45 | PreprocessorIf | defined MACROTHREE && (defined(MACROONE)) | N/A |
44+
| pp.cpp:0:0:0:0 | pp.cpp | 79 | 1 | 80 | 25 | PreprocessorIf | defined MACROTHREE && (defined(MACROONE)) | N/A |
4545
| pp.cpp:0:0:0:0 | pp.cpp | 81 | 1 | 81 | 6 | PreprocessorEndif | N/A | N/A |
4646
| pp.cpp:0:0:0:0 | pp.cpp | 83 | 1 | 83 | 26 | PreprocessorIf | defined SIMPLE_COMMENT | N/A |
4747
| pp.cpp:0:0:0:0 | pp.cpp | 85 | 1 | 85 | 6 | PreprocessorEndif | N/A | N/A |
48-
| pp.cpp:0:0:0:0 | pp.cpp | 87 | 1 | 88 | 17 | PreprocessorIf | defined(FOO) && defined(BAR) | N/A |
48+
| pp.cpp:0:0:0:0 | pp.cpp | 87 | 1 | 88 | 16 | PreprocessorIf | defined(FOO) && defined(BAR) | N/A |
4949
| pp.cpp:0:0:0:0 | pp.cpp | 90 | 1 | 90 | 6 | PreprocessorEndif | N/A | N/A |
50-
| pp.cpp:0:0:0:0 | pp.cpp | 92 | 1 | 94 | 19 | PreprocessorIf | defined(FOO) && defined(BAR) && !defined(BAZ) | N/A |
50+
| pp.cpp:0:0:0:0 | pp.cpp | 92 | 1 | 94 | 17 | PreprocessorIf | defined(FOO) && defined(BAR) && !defined(BAZ) | N/A |
5151
| pp.cpp:0:0:0:0 | pp.cpp | 96 | 1 | 96 | 6 | PreprocessorEndif | N/A | N/A |
5252
| pp.cpp:0:0:0:0 | pp.cpp | 98 | 1 | 98 | 13 | Macro | FOO | 8 |
5353
| pp.cpp:0:0:0:0 | pp.cpp | 99 | 1 | 99 | 13 | Macro | BAR | 2 |
5454
| pp.cpp:0:0:0:0 | pp.cpp | 100 | 1 | 100 | 13 | Macro | BAZ | 4 |
55-
| pp.cpp:0:0:0:0 | pp.cpp | 101 | 1 | 104 | 11 | PreprocessorIf | ((FOO / BAR) == 4) && ((BAZ * QUX) > 10) | N/A |
55+
| pp.cpp:0:0:0:0 | pp.cpp | 101 | 1 | 104 | 8 | PreprocessorIf | ((FOO / BAR) == 4) && ((BAZ * QUX) > 10) | N/A |
5656
| pp.cpp:0:0:0:0 | pp.cpp | 106 | 1 | 106 | 6 | PreprocessorEndif | N/A | N/A |
57-
| pp.cpp:0:0:0:0 | pp.cpp | 109 | 1 | 111 | 15 | PreprocessorIf | defined(FOO) && defined(BAR) && defined(BAZ) | N/A |
57+
| pp.cpp:0:0:0:0 | pp.cpp | 109 | 1 | 111 | 13 | PreprocessorIf | defined(FOO) && defined(BAR) && defined(BAZ) | N/A |
5858
| pp.cpp:0:0:0:0 | pp.cpp | 112 | 1 | 112 | 29 | Macro | CONDITIONAL_MACRO_4 | 4 |
5959
| pp.cpp:0:0:0:0 | pp.cpp | 113 | 1 | 113 | 6 | PreprocessorEndif | N/A | N/A |
60-
| pp.cpp:0:0:0:0 | pp.cpp | 116 | 1 | 116 | 40 | PreprocessorIf | defined SIMPLE_COMMENT | N/A |
60+
| pp.cpp:0:0:0:0 | pp.cpp | 116 | 1 | 116 | 39 | PreprocessorIf | defined SIMPLE_COMMENT | N/A |
6161
| pp.cpp:0:0:0:0 | pp.cpp | 118 | 1 | 118 | 6 | PreprocessorEndif | N/A | N/A |
62+
| pp.cpp:0:0:0:0 | pp.cpp | 120 | 1 | 120 | 14 | PreprocessorWarning | foo | N/A |
63+
| pp.cpp:0:0:0:0 | pp.cpp | 122 | 1 | 122 | 14 | PreprocessorWarning | foo | N/A |
64+
| pp.cpp:0:0:0:0 | pp.cpp | 126 | 1 | 126 | 14 | PreprocessorWarning | foo | N/A |
65+
| pp.cpp:0:0:0:0 | pp.cpp | 129 | 1 | 129 | 14 | PreprocessorWarning | foo | N/A |
66+
| pp.cpp:0:0:0:0 | pp.cpp | 134 | 1 | 134 | 13 | Macro | FOO | 8 |
67+
| pp.cpp:0:0:0:0 | pp.cpp | 135 | 1 | 135 | 13 | Macro | BAR | 2 |
68+
| pp.cpp:0:0:0:0 | pp.cpp | 136 | 1 | 136 | 13 | Macro | BAZ | 4 |
69+
| pp.cpp:0:0:0:0 | pp.cpp | 137 | 1 | 142 | 8 | PreprocessorIf | ((FOO / BAR) == 4) && ((BAZ * QUX) > 10) | N/A |
70+
| pp.cpp:0:0:0:0 | pp.cpp | 144 | 1 | 144 | 6 | PreprocessorEndif | N/A | N/A |
6271
| pp.h:0:0:0:0 | pp.h | 1 | 1 | 1 | 12 | PreprocessorPragma | once | N/A |
6372
| pp.h:0:0:0:0 | pp.h | 2 | 1 | 2 | 29 | PreprocessorWarning | "This should happen" | N/A |
6473
| pp.h:0:0:0:0 | pp.h | 3 | 1 | 3 | 27 | PreprocessorLine | 33 "emerald_city.h" | N/A |

0 commit comments

Comments
 (0)