Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 01a69bf

Browse files
author
Paolo Tranquilli
committed
Merge branch 'main' into redsun82/codegen-rename-dbscheme
2 parents cf63dae + 96f7dc7 commit 01a69bf

202 files changed

Lines changed: 7716 additions & 5409 deletions

File tree

Some content is hidden

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

‎Cargo.lock‎

Lines changed: 321 additions & 134 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎MODULE.bazel‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -71,13 +71,13 @@ use_repo(
7171
tree_sitter_extractors_deps = use_extension("//misc/bazel/3rdparty:tree_sitter_extractors_extension.bzl", "r")
7272
use_repo(
7373
tree_sitter_extractors_deps,
74-
"vendor_ts__anyhow-1.0.96",
74+
"vendor_ts__anyhow-1.0.97",
7575
"vendor_ts__argfile-0.2.1",
76-
"vendor_ts__chalk-ir-0.99.0",
77-
"vendor_ts__chrono-0.4.39",
78-
"vendor_ts__clap-4.5.31",
76+
"vendor_ts__chalk-ir-0.100.0",
77+
"vendor_ts__chrono-0.4.40",
78+
"vendor_ts__clap-4.5.32",
7979
"vendor_ts__dunce-1.0.5",
80-
"vendor_ts__either-1.14.0",
80+
"vendor_ts__either-1.15.0",
8181
"vendor_ts__encoding-0.2.33",
8282
"vendor_ts__figment-0.10.19",
8383
"vendor_ts__flate2-1.1.0",
@@ -88,31 +88,31 @@ use_repo(
8888
"vendor_ts__mustache-0.9.0",
8989
"vendor_ts__num-traits-0.2.19",
9090
"vendor_ts__num_cpus-1.16.0",
91-
"vendor_ts__proc-macro2-1.0.93",
92-
"vendor_ts__quote-1.0.38",
93-
"vendor_ts__ra_ap_base_db-0.0.266",
94-
"vendor_ts__ra_ap_cfg-0.0.266",
95-
"vendor_ts__ra_ap_hir-0.0.266",
96-
"vendor_ts__ra_ap_hir_def-0.0.266",
97-
"vendor_ts__ra_ap_hir_expand-0.0.266",
98-
"vendor_ts__ra_ap_hir_ty-0.0.266",
99-
"vendor_ts__ra_ap_ide_db-0.0.266",
100-
"vendor_ts__ra_ap_intern-0.0.266",
101-
"vendor_ts__ra_ap_load-cargo-0.0.266",
102-
"vendor_ts__ra_ap_parser-0.0.266",
103-
"vendor_ts__ra_ap_paths-0.0.266",
104-
"vendor_ts__ra_ap_project_model-0.0.266",
105-
"vendor_ts__ra_ap_span-0.0.266",
106-
"vendor_ts__ra_ap_stdx-0.0.266",
107-
"vendor_ts__ra_ap_syntax-0.0.266",
108-
"vendor_ts__ra_ap_vfs-0.0.266",
91+
"vendor_ts__proc-macro2-1.0.94",
92+
"vendor_ts__quote-1.0.40",
93+
"vendor_ts__ra_ap_base_db-0.0.270",
94+
"vendor_ts__ra_ap_cfg-0.0.270",
95+
"vendor_ts__ra_ap_hir-0.0.270",
96+
"vendor_ts__ra_ap_hir_def-0.0.270",
97+
"vendor_ts__ra_ap_hir_expand-0.0.270",
98+
"vendor_ts__ra_ap_hir_ty-0.0.270",
99+
"vendor_ts__ra_ap_ide_db-0.0.270",
100+
"vendor_ts__ra_ap_intern-0.0.270",
101+
"vendor_ts__ra_ap_load-cargo-0.0.270",
102+
"vendor_ts__ra_ap_parser-0.0.270",
103+
"vendor_ts__ra_ap_paths-0.0.270",
104+
"vendor_ts__ra_ap_project_model-0.0.270",
105+
"vendor_ts__ra_ap_span-0.0.270",
106+
"vendor_ts__ra_ap_stdx-0.0.270",
107+
"vendor_ts__ra_ap_syntax-0.0.270",
108+
"vendor_ts__ra_ap_vfs-0.0.270",
109109
"vendor_ts__rand-0.9.0",
110110
"vendor_ts__rayon-1.10.0",
111111
"vendor_ts__regex-1.11.1",
112-
"vendor_ts__serde-1.0.218",
113-
"vendor_ts__serde_json-1.0.139",
112+
"vendor_ts__serde-1.0.219",
113+
"vendor_ts__serde_json-1.0.140",
114114
"vendor_ts__serde_with-3.12.0",
115-
"vendor_ts__syn-2.0.98",
115+
"vendor_ts__syn-2.0.100",
116116
"vendor_ts__toml-0.8.20",
117117
"vendor_ts__tracing-0.1.41",
118118
"vendor_ts__tracing-flame-0.2.0",

‎cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/SsaInternals.qll‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1007,9 +1007,11 @@ private module DataFlowIntegrationInput implements SsaImpl::DataFlowIntegrationI
10071007
}
10081008
}
10091009

1010-
predicate guardControlsBlock(Guard guard, SsaInput::BasicBlock bb, boolean branch) {
1010+
predicate guardDirectlyControlsBlock(Guard guard, SsaInput::BasicBlock bb, boolean branch) {
10111011
guard.(IRGuards::IRGuardCondition).controls(bb, branch)
10121012
}
1013+
1014+
predicate keepAllPhiInputBackEdges() { any() }
10131015
}
10141016

10151017
private module DataFlowIntegrationImpl = SsaImpl::DataFlowIntegration<DataFlowIntegrationInput>;

‎cpp/ql/src/Diagnostics/ExtractionWarnings.ql‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,5 @@ where
1414
or
1515
warning instanceof ExtractionUnknownProblem
1616
select warning,
17-
"Extraction failed in " + warning.getFile() + " with warning " + warning.getProblemMessage(),
18-
warning.getSeverity()
17+
"Extraction failed in " + warning.getFile() + " with warning " +
18+
warning.getProblemMessage().replaceAll("$", "$$"), warning.getSeverity()

‎cpp/ql/src/Diagnostics/Internal/ExtractionErrors.ql‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,6 @@ from ExtractionError error
1717
where
1818
error instanceof ExtractionUnknownError or
1919
exists(error.getFile().getRelativePath())
20-
select error, "Extraction failed in " + error.getFile() + " with error " + error.getErrorMessage(),
21-
error.getSeverity()
20+
select error,
21+
"Extraction failed in " + error.getFile() + " with error " +
22+
error.getErrorMessage().replaceAll("$", "$$"), error.getSeverity()

‎cpp/ql/test/library-tests/dataflow/dataflow-tests/localFlow-ir.expected‎

Lines changed: 7 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -68,31 +68,23 @@
6868
| test.cpp:10:8:10:9 | t2 | test.cpp:11:7:11:8 | [input] SSA phi read(t2) |
6969
| test.cpp:10:8:10:9 | t2 | test.cpp:11:7:11:8 | [input] SSA phi(*t2) |
7070
| test.cpp:10:8:10:9 | t2 | test.cpp:13:10:13:11 | t2 |
71-
| test.cpp:11:7:11:8 | [input] SSA phi read(t2) | test.cpp:15:3:15:6 | SSA phi read(t2) |
72-
| test.cpp:11:7:11:8 | [input] SSA phi(*t2) | test.cpp:15:3:15:6 | SSA phi(*t2) |
71+
| test.cpp:11:7:11:8 | [input] SSA phi read(t2) | test.cpp:15:8:15:9 | t2 |
72+
| test.cpp:11:7:11:8 | [input] SSA phi(*t2) | test.cpp:15:8:15:9 | t2 |
7373
| test.cpp:11:7:11:8 | t1 | test.cpp:21:8:21:9 | t1 |
7474
| test.cpp:12:5:12:10 | ... = ... | test.cpp:13:10:13:11 | t2 |
7575
| test.cpp:12:10:12:10 | 0 | test.cpp:12:5:12:10 | ... = ... |
76-
| test.cpp:13:5:13:8 | [input] SSA phi read(t2) | test.cpp:15:3:15:6 | SSA phi read(t2) |
77-
| test.cpp:13:5:13:8 | [input] SSA phi(*t2) | test.cpp:15:3:15:6 | SSA phi(*t2) |
78-
| test.cpp:13:10:13:11 | t2 | test.cpp:13:5:13:8 | [input] SSA phi read(t2) |
79-
| test.cpp:13:10:13:11 | t2 | test.cpp:13:5:13:8 | [input] SSA phi(*t2) |
80-
| test.cpp:15:3:15:6 | SSA phi read(t2) | test.cpp:15:8:15:9 | t2 |
81-
| test.cpp:15:3:15:6 | SSA phi(*t2) | test.cpp:15:8:15:9 | t2 |
76+
| test.cpp:13:10:13:11 | t2 | test.cpp:15:8:15:9 | t2 |
77+
| test.cpp:13:10:13:11 | t2 | test.cpp:15:8:15:9 | t2 |
8278
| test.cpp:15:8:15:9 | t2 | test.cpp:23:15:23:16 | [input] SSA phi read(*t2) |
8379
| test.cpp:15:8:15:9 | t2 | test.cpp:23:15:23:16 | [input] SSA phi read(t2) |
8480
| test.cpp:17:3:17:8 | ... = ... | test.cpp:21:8:21:9 | t1 |
8581
| test.cpp:17:8:17:8 | 0 | test.cpp:17:3:17:8 | ... = ... |
86-
| test.cpp:21:8:21:9 | t1 | test.cpp:23:15:23:16 | [input] SSA phi read(t1) |
87-
| test.cpp:21:8:21:9 | t1 | test.cpp:23:15:23:16 | [input] SSA phi(*t1) |
82+
| test.cpp:21:8:21:9 | t1 | test.cpp:23:19:23:19 | SSA phi read(t1) |
83+
| test.cpp:21:8:21:9 | t1 | test.cpp:23:19:23:19 | SSA phi(*t1) |
8884
| test.cpp:23:15:23:16 | 0 | test.cpp:23:15:23:16 | 0 |
89-
| test.cpp:23:15:23:16 | 0 | test.cpp:23:15:23:16 | [input] SSA phi(*i) |
85+
| test.cpp:23:15:23:16 | 0 | test.cpp:23:19:23:19 | SSA phi(*i) |
9086
| test.cpp:23:15:23:16 | [input] SSA phi read(*t2) | test.cpp:23:19:23:19 | SSA phi read(*t2) |
91-
| test.cpp:23:15:23:16 | [input] SSA phi read(i) | test.cpp:23:19:23:19 | SSA phi read(i) |
92-
| test.cpp:23:15:23:16 | [input] SSA phi read(t1) | test.cpp:23:19:23:19 | SSA phi read(t1) |
9387
| test.cpp:23:15:23:16 | [input] SSA phi read(t2) | test.cpp:23:19:23:19 | SSA phi read(t2) |
94-
| test.cpp:23:15:23:16 | [input] SSA phi(*i) | test.cpp:23:19:23:19 | SSA phi(*i) |
95-
| test.cpp:23:15:23:16 | [input] SSA phi(*t1) | test.cpp:23:19:23:19 | SSA phi(*t1) |
9688
| test.cpp:23:19:23:19 | SSA phi read(*t2) | test.cpp:24:10:24:11 | t2 |
9789
| test.cpp:23:19:23:19 | SSA phi read(i) | test.cpp:23:19:23:19 | i |
9890
| test.cpp:23:19:23:19 | SSA phi read(t1) | test.cpp:23:23:23:24 | t1 |

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

Lines changed: 124 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
// semmle-extractor-options: -I${testdir}/more_headers/ "-U SOME_SYM"
1111
#undef BAR
1212
#define SCARY(a,aa,aaah) /* we ignore a */ (aa /* but we take aa */) /* and we ignore aaa */
13-
#define LOG(fmt, ...) printf("Warning: %s", fmt, __VA__ARGS__)
13+
#define LOG(fmt, ...) printf("Warning: %s", fmt, __VA__ARGS__)
1414
#include "pp.h"
1515

1616
#if 0
@@ -59,7 +59,7 @@ class templateClassContext
5959
#else
6060
#define IN_TEMPLATE
6161
#endif
62-
62+
6363
static int val;
6464
};
6565

@@ -71,7 +71,128 @@ templateClassContext<int> tcci;
7171

7272
#define BAR
7373

74-
#if defined(BAR) && \
74+
#if defined(BAR) &&\
7575
defined(BAR)
7676
#warning BAR defined
7777
#endif
78+
79+
#if defined MACROTHREE/**hello*/ && /*world*/\
80+
/*hw*/ (defined(MACROONE)) /* macroone */
81+
#endif
82+
83+
#if defined SIMPLE_COMMENT //this comment \
84+
(defined(SIMPLE_COMMENT)) spans over multiple lines
85+
#endif
86+
87+
#if defined(FOO) &&\
88+
defined(BAR)
89+
#define CONDITIONAL_MACRO_1 1
90+
#endif
91+
92+
#if defined(FOO) && \
93+
defined(BAR) && \
94+
!defined(BAZ)
95+
#define CONDITIONAL_MACRO_2 2
96+
#endif
97+
98+
#define FOO 8
99+
#define BAR 2
100+
#define BAZ 4
101+
#if ((FOO / BAR) \
102+
== 4) && ((BAZ \
103+
* QUX) \
104+
> 10)
105+
#define CONDITIONAL_MACRO_3 3
106+
#endif
107+
108+
// Testing \t spaced PreprocessorIf
109+
#if defined(FOO) && \
110+
defined(BAR) && \
111+
defined(BAZ)
112+
#define CONDITIONAL_MACRO_4 4
113+
#endif
114+
115+
116+
#if defined /* //test */ SIMPLE_COMMENT //this comment \
117+
(defined(SIMPLE_COMMENT)) spans over multiple lines
118+
#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
145+
146+
#define X 1
147+
#define Y 2
148+
#if defined(X) && \
149+
/*this is a comment*/ defined(Y) \
150+
// another comment
151+
#endif
152+
153+
#warning FOO\
154+
\
155+
\
156+
\
157+
BAR
158+
159+
160+
#warning foo \
161+
\
162+
/* comment */ \
163+
\
164+
165+
166+
#if/** */A/* ... */&&B
167+
#endif
168+
169+
170+
#if/** */ /**/ A
171+
#endif
172+
173+
#if \
174+
\
175+
A && B
176+
#endif
177+
178+
179+
#ifdef /*
180+
181+
182+
183+
*/ FOOBAR
184+
#warning a
185+
#else
186+
#warning b
187+
#endif
188+
189+
190+
#if /*
191+
192+
//test
193+
194+
*/ FOOBAR
195+
#endif
196+
197+
#if/*...*//*...*/A
198+
#endif

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

Lines changed: 51 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,17 +33,64 @@
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 | 74 | 21 | PreprocessorIf | 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 | 26 | PreprocessorIf | defined MACROTHREE && (defined(MACROONE)) | N/A |
45+
| pp.cpp:0:0:0:0 | pp.cpp | 81 | 1 | 81 | 6 | PreprocessorEndif | N/A | N/A |
46+
| pp.cpp:0:0:0:0 | pp.cpp | 83 | 1 | 83 | 26 | PreprocessorIf | defined SIMPLE_COMMENT | N/A |
47+
| 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 | 16 | PreprocessorIf | defined(FOO) && defined(BAR) | N/A |
49+
| 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 | 17 | PreprocessorIf | defined(FOO) && defined(BAR) && !defined(BAZ) | N/A |
51+
| pp.cpp:0:0:0:0 | pp.cpp | 96 | 1 | 96 | 6 | PreprocessorEndif | N/A | N/A |
52+
| pp.cpp:0:0:0:0 | pp.cpp | 98 | 1 | 98 | 13 | Macro | FOO | 8 |
53+
| pp.cpp:0:0:0:0 | pp.cpp | 99 | 1 | 99 | 13 | Macro | BAR | 2 |
54+
| 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 | 8 | PreprocessorIf | ((FOO / BAR) == 4) && ((BAZ * QUX) > 10) | N/A |
56+
| 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 | 13 | PreprocessorIf | defined(FOO) && defined(BAR) && defined(BAZ) | N/A |
58+
| pp.cpp:0:0:0:0 | pp.cpp | 112 | 1 | 112 | 29 | Macro | CONDITIONAL_MACRO_4 | 4 |
59+
| 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 | 39 | PreprocessorIf | defined SIMPLE_COMMENT | N/A |
61+
| 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 | 12 | PreprocessorWarning | foo | N/A |
63+
| pp.cpp:0:0:0:0 | pp.cpp | 122 | 1 | 122 | 12 | PreprocessorWarning | foo | N/A |
64+
| pp.cpp:0:0:0:0 | pp.cpp | 126 | 1 | 126 | 12 | PreprocessorWarning | foo | N/A |
65+
| pp.cpp:0:0:0:0 | pp.cpp | 129 | 1 | 129 | 12 | 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 |
71+
| pp.cpp:0:0:0:0 | pp.cpp | 146 | 1 | 146 | 11 | Macro | X | 1 |
72+
| pp.cpp:0:0:0:0 | pp.cpp | 147 | 1 | 147 | 11 | Macro | Y | 2 |
73+
| pp.cpp:0:0:0:0 | pp.cpp | 148 | 1 | 149 | 36 | PreprocessorIf | defined(X) && defined(Y) | N/A |
74+
| pp.cpp:0:0:0:0 | pp.cpp | 151 | 1 | 151 | 6 | PreprocessorEndif | N/A | N/A |
75+
| pp.cpp:0:0:0:0 | pp.cpp | 153 | 1 | 157 | 3 | PreprocessorWarning | FOO BAR | N/A |
76+
| pp.cpp:0:0:0:0 | pp.cpp | 160 | 1 | 160 | 12 | PreprocessorWarning | foo | N/A |
77+
| pp.cpp:0:0:0:0 | pp.cpp | 166 | 1 | 166 | 22 | PreprocessorIf | A &&B | N/A |
78+
| pp.cpp:0:0:0:0 | pp.cpp | 167 | 1 | 167 | 6 | PreprocessorEndif | N/A | N/A |
79+
| pp.cpp:0:0:0:0 | pp.cpp | 170 | 1 | 170 | 20 | PreprocessorIf | A | N/A |
80+
| pp.cpp:0:0:0:0 | pp.cpp | 171 | 1 | 171 | 6 | PreprocessorEndif | N/A | N/A |
81+
| pp.cpp:0:0:0:0 | pp.cpp | 173 | 1 | 175 | 6 | PreprocessorIf | A && B | N/A |
82+
| pp.cpp:0:0:0:0 | pp.cpp | 176 | 1 | 176 | 6 | PreprocessorEndif | N/A | N/A |
83+
| pp.cpp:0:0:0:0 | pp.cpp | 179 | 1 | 183 | 9 | PreprocessorIfdef | FOOBAR | N/A |
84+
| pp.cpp:0:0:0:0 | pp.cpp | 185 | 1 | 185 | 5 | PreprocessorElse | N/A | N/A |
85+
| pp.cpp:0:0:0:0 | pp.cpp | 186 | 1 | 186 | 10 | PreprocessorWarning | b | N/A |
86+
| pp.cpp:0:0:0:0 | pp.cpp | 187 | 1 | 187 | 6 | PreprocessorEndif | N/A | N/A |
87+
| pp.cpp:0:0:0:0 | pp.cpp | 190 | 1 | 194 | 9 | PreprocessorIf | FOOBAR | N/A |
88+
| pp.cpp:0:0:0:0 | pp.cpp | 195 | 1 | 195 | 6 | PreprocessorEndif | N/A | N/A |
89+
| pp.cpp:0:0:0:0 | pp.cpp | 197 | 1 | 197 | 18 | PreprocessorIf | A | N/A |
90+
| pp.cpp:0:0:0:0 | pp.cpp | 198 | 1 | 198 | 6 | PreprocessorEndif | N/A | N/A |
4491
| pp.h:0:0:0:0 | pp.h | 1 | 1 | 1 | 12 | PreprocessorPragma | once | N/A |
4592
| pp.h:0:0:0:0 | pp.h | 2 | 1 | 2 | 29 | PreprocessorWarning | "This should happen" | N/A |
46-
| pp.h:0:0:0:0 | pp.h | 3 | 1 | 3 | 27 | PreprocessorLine | 33 "emerald_city.h" | N/A |
93+
| pp.h:0:0:0:0 | pp.h | 3 | 1 | 3 | 27 | PreprocessorLine | 33 "emerald_city.h" | N/A |
4794
| pp.h:0:0:0:0 | pp.h | 4 | 1 | 4 | 30 | PreprocessorPragma | byte_order(big_endian) | N/A |
4895
| pp.h:0:0:0:0 | pp.h | 5 | 1 | 5 | 33 | PreprocessorWarning | "Not in Kansas any more" | N/A |
4996
| pp.h:0:0:0:0 | pp.h | 7 | 1 | 11 | 8 | Macro | MULTILINE | world a long |

‎cpp/ql/test/query-tests/Diagnostics/ExtractionErrors.expected‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
1+
| containserror.cpp:9:14:9:14 | Recoverable extraction error: 'x' has already been declared in the current scope | Extraction failed in containserror.cpp with error "containserror.cpp", line 9: error: "x" has already been declared in the current scope\n \tconst char *x = "Foo2 $$@ bar2 $$@ baz2";\n \t ^\n\n | 2 |
12
| doesnotcompile.cpp:4:2:4:2 | Recoverable extraction error: identifier 'This' is undefined | Extraction failed in doesnotcompile.cpp with error "doesnotcompile.cpp", line 4: error: identifier "This" is undefined\n \tThis is not correct C/C++ code.\n \t^\n\n | 2 |
23
| doesnotcompile.cpp:4:10:4:10 | Recoverable extraction error: expected a ';' | Extraction failed in doesnotcompile.cpp with error "doesnotcompile.cpp", line 4: error: expected a ";"\n \tThis is not correct C/C++ code.\n \t ^\n\n | 2 |

‎cpp/ql/test/query-tests/Diagnostics/ExtractionWarnings.expected‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
1+
| containserror.cpp:9:14:9:14 | Recoverable extraction error: 'x' has already been declared in the current scope | Extraction failed in containserror.cpp with warning "containserror.cpp", line 9: error: "x" has already been declared in the current scope\n \tconst char *x = "Foo2 $$@ bar2 $$@ baz2";\n \t ^\n\n | 1 |
12
| doesnotcompile.cpp:4:2:4:2 | Recoverable extraction error: identifier 'This' is undefined | Extraction failed in doesnotcompile.cpp with warning "doesnotcompile.cpp", line 4: error: identifier "This" is undefined\n \tThis is not correct C/C++ code.\n \t^\n\n | 1 |
23
| doesnotcompile.cpp:4:10:4:10 | Recoverable extraction error: expected a ';' | Extraction failed in doesnotcompile.cpp with warning "doesnotcompile.cpp", line 4: error: expected a ";"\n \tThis is not correct C/C++ code.\n \t ^\n\n | 1 |

0 commit comments

Comments
 (0)