copilot feedback

Author: MichaelRFairhurst

cpp/common/src/codingstandards/cpp/Macro.qll

@@ -61,7 +61,7 @@ class FunctionLikeMacro extends Macro {
         noAfterParen = "(?!\\s*\\))" and
         // Parameter at word boundary in optional whitespace
         paramMatch = "\\s*\\b" + parameter + "\\b\\s*" and
-        // A parameter is ##'d if it is preceded or followed by the # operator.
+        // A parameter is #'d if it is preceded or followed by the # or ## operators.
         notHashed = "(?<!#)" + paramMatch and
         // Parameter is used without a leading or trailing parenthesis, and without #.
         getBody()

cpp/misra/src/rules/RULE-19-3-4/UnparenthesizedMacroArgument.ql

@@ -18,7 +18,6 @@ import cpp
 import codingstandards.cpp.misra
 import codingstandards.cpp.Macro
 import codingstandards.cpp.MatchingParenthesis
-import codeql.util.Boolean
 
 /**
  * This regex is used to find macro arguments that appear to have critical operators in them, before
@@ -129,8 +128,7 @@ class RiskyMacroInvocation extends MacroInvocation {
    * - the operator cannot be the first character in the string (i.e. it should not look like a
    *   unary - or +)
    * - the operator cannot exist inside a generated string literal
-   * - the operator existence of the operator should not be as a substring of "->", "++", or "--"
-   *   operators.
+   * - the operator should not be found inside a "->", "++", or "--" operator.
    *
    * The results of this predicate should be flagged by the query.
    */
@@ -141,7 +139,7 @@ class RiskyMacroInvocation extends MacroInvocation {
       int opIndex
     |
       parsedRoot.getInputString() = value and
-      (topLevelText.getParent() = parsedRoot or topLevelText = parsedRoot) and
+      parsedRoot = topLevelText.getParent() and
       text = topLevelText.getText().trim() and
       opExpr = getAGeneratedElement() and
       operator = opExpr.getOperator() and

cpp/misra/test/rules/RULE-19-3-4/test.cpp

@@ -241,7 +241,7 @@ void f6() {
           // compliant, though an argument could be made the other way.
           // Regardless, this case is difficult for us to detect.
 #define M14(X) M1(X *X)
-  M14(1); // NON-COMPLIANT[False negative] -- The definition of M13 is
+  M14(1); // NON-COMPLIANT[False negative] -- The definition of M14 is
           // non-compliant, but we don't detect the generated elements.
 
   // Trickier case of # operator to handle. In this case, we do not produce a
@@ -258,6 +258,6 @@ void f6() {
 #define M18(X) ( X )
   M18(1 * 1);     // COMPLIANT
 #define M19(X) M15(( X ), # X)
-  M16(1 * 1); // COMPLIANT -- all expansions of X are precedence protected.
+  M19(1 * 1); // COMPLIANT -- all expansions of X are precedence protected.
   /* clang-format on */
-}
+}