Declarations1: fix 21-2 and DCL37-C to only look at user files

knewbury01 · knewbury01 · commit 6a48f42b6021 · 2022-08-12T06:54:01.000-04:00
diff --git a/cpp/common/src/codingstandards/cpp/rules/declaredareservedidentifier/DeclaredAReservedIdentifier.qll b/cpp/common/src/codingstandards/cpp/rules/declaredareservedidentifier/DeclaredAReservedIdentifier.qll
@@ -14,6 +14,7 @@ Query getQuery() { result instanceof DeclaredAReservedIdentifierSharedQuery }
 
 query predicate problems(Element m, string message) {
   not isExcluded(m, getQuery()) and
+  exists(m.getFile().getRelativePath()) and
   exists(string name |
     (
       m.(Macro).hasName(name) or

Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,7 @@ Query getQuery() { result instanceof DeclaredAReservedIdentifierSharedQuery }`
`14`	`14`
`15`	`15`	`query predicate problems(Element m, string message) {`
`16`	`16`	`not isExcluded(m, getQuery()) and`
	`17`	`+ exists(m.getFile().getRelativePath()) and`
`17`	`18`	`exists(string name \|`
`18`	`19`	`(`
`19`	`20`	`m.(Macro).hasName(name) or`