Merge pull request #76 from jketema/nullmacro-deprecation-fix

jketema · web-flow · commit 0971b4c3bd6b · 2022-09-02T13:47:28.000+02:00
Replace `NULLMacro` by `NullMacro`
diff --git a/c/common/src/codingstandards/c/Pointers.qll b/c/common/src/codingstandards/c/Pointers.qll
@@ -9,7 +9,7 @@ import codingstandards.cpp.Type
  * A null pointer constant, which is either in the form `NULL` or `(void *)0`.
  */
 predicate isNullPointerConstant(Expr e) {
-  e.findRootCause() instanceof NULLMacro
+  e.findRootCause() instanceof NullMacro
   or
   exists(CStyleCast c |
     not c.isImplicit() and
diff --git a/cpp/common/src/codingstandards/cpp/enhancements/MacroEnhacements.qll b/cpp/common/src/codingstandards/cpp/enhancements/MacroEnhacements.qll
@@ -29,7 +29,7 @@ module MacroEnhancements {
   /** A use of the NULL macro. */
   class NULL extends StandardLibrary::Literal {
     NULL() {
-      exists(StandardLibrary::NULLMacro nm | this = nm.getAnInvocation().getAnExpandedElement())
+      exists(StandardLibrary::NullMacro nm | this = nm.getAnInvocation().getAnExpandedElement())
     }
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ module MacroEnhancements {`
`29`	`29`	`/** A use of the NULL macro. */`
`30`	`30`	`class NULL extends StandardLibrary::Literal {`
`31`	`31`	`NULL() {`
`32`		`- exists(StandardLibrary::NULLMacro nm \| this = nm.getAnInvocation().getAnExpandedElement())`
	`32`	`+ exists(StandardLibrary::NullMacro nm \| this = nm.getAnInvocation().getAnExpandedElement())`
`33`	`33`	`}`
`34`	`34`	`}`
`35`	`35`	`}`