Preprocessor6: improve DIR-4-9

Author: knewbury01

c/misra/src/rules/DIR-4-9/FunctionOverFunctionLikeMacro.ql

@@ -15,14 +15,17 @@
 
 import cpp
 import codingstandards.c.misra
-import codingstandards.cpp.FunctionLikeMacro
 import codingstandards.cpp.Naming
+import codingstandards.cpp.Macro
 
 abstract class IrreplaceableFunctionLikeMacro extends FunctionLikeMacro { }
 
 /** A standard library function like macro that contains the use of a stringize or tokenize operator should not be replaced by a function. */
 private class StringizeOrTokenizeMacro extends IrreplaceableFunctionLikeMacro {
-  StringizeOrTokenizeMacro() { this.getBody().regexpMatch(".*\\#{1,2}?.*") }
+  StringizeOrTokenizeMacro() {
+    exists(TokenPastingOperator t | t.getMacro() = this) or
+    exists(StringizingOperator s | s.getMacro() = this)
+  }
 }
 
 /** A standard library function like macro that should not be replaced by a function. */
@@ -38,14 +41,14 @@ private class AsmArgumentInvoked extends IrreplaceableFunctionLikeMacro {
 }
 
 /** A macro that is only invoked with constant arguments is more likely to be compile-time evaluated than a function call so do not suggest replacement. */
-private class OnlyConstantNumericInvoked extends IrreplaceableFunctionLikeMacro {
-  OnlyConstantNumericInvoked() {
+private class OnlyConstantArgsInvoked extends IrreplaceableFunctionLikeMacro {
+  OnlyConstantArgsInvoked() {
     forex(MacroInvocation mi | mi = this.getAnInvocation() |
       //int/float literals
       mi.getUnexpandedArgument(_).regexpMatch("\\d+")
       or
-      //char/string literal
-      mi.getUnexpandedArgument(_).regexpMatch("(\\'|\")+.*")
+      //char literal or string literal, which is a literal surrounded by single quotes or double quotes
+      mi.getUnexpandedArgument(_).regexpMatch("('[^']*'|\"[^\"]*\")")
     )
   }
 }
@@ -79,6 +82,8 @@ from FunctionLikeMacro m
 where
   not isExcluded(m, Preprocessor6Package::functionOverFunctionLikeMacroQuery()) and
   not m instanceof IrreplaceableFunctionLikeMacro and
+  //macros can have empty body
+  not m.getBody().length() = 0 and
   //function call not allowed in a constant expression (where constant expr is parent)
   forall(MacroInvocation i | i = m.getAnInvocation() | not partOfConstantExpr(i))
-select m, "Macro used when function call would be preferred."
+select m, "Macro used when function call would be preferred.", m.getBody().length()

c/misra/test/rules/DIR-4-9/FunctionOverFunctionLikeMacro.expected

@@ -1 +1,2 @@
-| test.c:4:1:6:12 | #define MACRO4(L) (L" " "suffix") | Macro used when function call would be preferred. |
+| test.c:4:1:4:25 | #define MACRO4(x) (x + 1) | Macro used when function call would be preferred. | 7 |
+| test.c:9:1:9:48 | #define MACRO9() printf_custom("output = %d", 7) | Macro used when function call would be preferred. | 31 |

c/misra/test/rules/DIR-4-9/test.c

@@ -1,14 +1,17 @@
-#define MACRO(OP, L, R) ((L)OP(R))   // COMPLIANT
-#define MACRO2(L, R) (L + R)         // COMPLIANT
-#define MACRO3(L, R) (L " " R " " L) // COMPLIANT
-#define MACRO4(L)                                                              \
-  (L" "                                                                        \
-   "suffix")                   // NON_COMPLIANT
-#define MACRO5(L, LR) (LR + 1) // COMPLIANT
-#define MACRO6(X, LR) (LR + 1) // COMPLIANT
-#define MACRO7(x, y) x##y      // COMPLIANT
+#define MACRO(OP, L, R) ((L)OP(R))                      // COMPLIANT
+#define MACRO2(L, R) (L + R)                            // COMPLIANT
+#define MACRO3(L, R) (L " " R " " L)                    // COMPLIANT
+#define MACRO4(x) (x + 1)                               // NON_COMPLIANT
+#define MACRO5(L, LR) (LR + 1)                          // COMPLIANT
+#define MACRO6(x) printf_custom("output = %d", test##x) // COMPLIANT
+#define MACRO7(x) #x                                    // COMPLIANT
+#define MACRO8(x) "NOP"                                 // COMPLIANT
+#define MACRO9() printf_custom("output = %d", 7)        // NON_COMPLIANT
+#define MACRO10(x)                                      // COMPLIANT
 
 const char a1[MACRO2(1, 1) + 6];
+extern printf_custom();
+int test1;
 
 void f() {
   int i = MACRO(+, 1, 1);
@@ -18,13 +21,15 @@ void f() {
 
   char *i4 = MACRO3("prefix", "suffix");
 
-  char *i5 = MACRO4("prefix");
+  int i5 = MACRO4(1);
 
-  char *i6 = MACRO4(MACRO2(1, 1));
+  int i6 = MACRO4(MACRO2(1, 1));
 
   int i7 = MACRO5(1, 1);
 
-  int i8 = MACRO6(1, 1);
+  MACRO6(1);
 
-  char *i9 = MACRO7("prefix", "suffix");
+  char *i10 = MACRO7("prefix");
+
+  asm(MACRO8(1));
 }