Improved messaging

Author: MichaelRFairhurst

cpp/common/src/codingstandards/cpp/Extensions.qll

@@ -137,8 +137,8 @@ class CPPExtensionTypeUsage extends CPPCompilerExtension, DeclarationEntry {
 
   override string getMessage() {
     result =
-      "Declaration '" + getName() + "' uses type '" + extendedType.getName() +
-        "' which is a compiler extension and is not portable to other compilers."
+      "Declaration of variable '" + getName() + "' as type '" + extendedType.getName() +
+        "' requires a compiler extension and is not portable to other compilers."
   }
 }
 
@@ -158,8 +158,9 @@ class CPPZeroLengthArraysExtension extends CPPCompilerExtension, DeclarationEntr
 
   override string getMessage() {
     result =
-      "Variable '" + getName() + "' is declared with a zero-length array (of '" +
-        array.getBaseType() + "') is a compiler extension and are not portable to other compilers."
+      "Declaration of variable '" + getName() + "' as a zero-length array (of '" +
+        array.getBaseType() +
+        "') requires a compiler extension and is not portable to other compilers."
   }
 }
 

cpp/misra/test/rules/RULE-4-1-1/CompilerLanguageExtensionsUsed.expected

@@ -11,11 +11,11 @@
 | test.cpp:24:3:24:22 | __is_same | Use of built-in operation '__is_same' is a compiler extension. |
 | test.cpp:30:3:33:4 | (statement expression) | Statement expressions are a compiler extension and are not portable to other compilers. |
 | test.cpp:34:3:34:12 | ... ? ... : ... | Ternaries with omitted middle operands are a compiler extension and are not portable to other compilers. |
-| test.cpp:36:12:36:13 | definition of l0 | Declaration 'l0' uses type '__int128' which is a compiler extension and is not portable to other compilers. |
+| test.cpp:36:12:36:13 | definition of l0 | Declaration of variable 'l0' as type '__int128' requires a compiler extension and is not portable to other compilers. |
 | test.cpp:45:20:45:30 | fallthrough | Use of attribute 'fallthrough' is a compiler extension and is not portable to other compilers. |
 | test.cpp:47:7:47:22 | fallthrough | Use of attribute 'fallthrough' in namespace 'gnu' is a compiler extension and is not portable to other compilers. |
 | test.cpp:55:3:55:29 | __builtin_va_start | Use of built-in operation '__builtin_va_start' is a compiler extension. |
-| test.cpp:60:7:60:8 | definition of m1 | Variable 'm1' is declared with a zero-length array (of 'int') is a compiler extension and are not portable to other compilers. |
+| test.cpp:60:7:60:8 | definition of m1 | Declaration of variable 'm1' as a zero-length array (of 'int') requires a compiler extension and is not portable to other compilers. |
 | test.cpp:64:31:64:41 | vector_size | Use of attribute 'vector_size' is a compiler extension and is not portable to other compilers. |
 | test.cpp:66:1:66:20 | #ifdef __has_builtin | Call to builtin preprocessor feature '__has_builtin' is a compiler extension and is not portable to other compilers. |
 | test.cpp:72:1:72:12 | #pragma once | Use of non-standard preprocessor directive '#pragma once' is a compiler extension. |