Merge branch 'main' into a5-2-2/issue-32/c-style-casts-from-macros

lcartey · web-flow · commit a0c061511a75 · 2022-11-04T09:24:44.000Z
diff --git a/.github/workflows/bump-version.yml b/.github/workflows/bump-version.yml
@@ -10,7 +10,7 @@ on:
 jobs:
 
   apply-version-bump:
-    runs-on: ubuntu-latest 
+    runs-on: ubuntu-22.04
     name: Apply Version Bump
     steps:
         - name: Checkout 
diff --git a/.github/workflows/code-scanning-pack-gen.yml b/.github/workflows/code-scanning-pack-gen.yml
@@ -19,7 +19,7 @@ env:
 jobs:
   prepare-code-scanning-pack-matrix:
     name: Prepare CodeQL Code Scanning pack matrix
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     outputs:
       matrix: ${{ steps.export-code-scanning-pack-matrix.outputs.matrix }}
     steps:
diff --git a/.github/workflows/codeql_unit_tests.yml b/.github/workflows/codeql_unit_tests.yml
@@ -14,7 +14,7 @@ on:
 jobs:
   prepare-unit-test-matrix:
     name: Prepare CodeQL unit test matrix
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     outputs:
       matrix: ${{ steps.export-unit-test-matrix.outputs.matrix }}
     steps:
@@ -157,7 +157,7 @@ jobs:
   validate-test-results:
     name: Validate test results
     needs: [run-test-suites]
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
       - name: Collect test results
         uses: actions/download-artifact@v2
diff --git a/.github/workflows/create-draft-release.yml b/.github/workflows/create-draft-release.yml
@@ -21,7 +21,7 @@ on:
 jobs:
   create-draft-release:
     name: Create draft release
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     env:      
       # AWS CONFIGURATION
       AWS_EC2_INSTANCE_TYPE: ${{ github.event.inputs.aws_ec2_instance_type }}
diff --git a/.github/workflows/generate-html-docs.yml b/.github/workflows/generate-html-docs.yml
@@ -15,7 +15,7 @@ on:
 jobs:
   generate-html-doc:
     name: Generate HTML documentation
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
       - name: Checkout
         uses: actions/checkout@v2
diff --git a/.github/workflows/standard_library_upgrade_tests.yml b/.github/workflows/standard_library_upgrade_tests.yml
@@ -14,7 +14,7 @@ on:
 jobs:
   prepare-unit-test-matrix:
     name: Prepare CodeQL unit test matrix
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     outputs:
       matrix: ${{ steps.export-unit-test-matrix.outputs.matrix }}
     steps:
@@ -154,7 +154,7 @@ jobs:
   validate-test-results:
     name: Validate test results
     needs: [run-test-suites]
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
       - name: Install Python
         uses: actions/setup-python@v4
diff --git a/.github/workflows/upgrade_codeql_dependencies.yml b/.github/workflows/upgrade_codeql_dependencies.yml
@@ -20,7 +20,7 @@ jobs:
     env:
       CODEQL_CLI_VERSION: ${{ github.event.inputs.codeql_cli_version }}
       CODEQL_LIB_COMMIT: ${{ github.event.inputs.codeql_standard_library_commit }}
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
       - name: Checkout
         uses: actions/checkout@v2
diff --git a/.github/workflows/validate-coding-standards.yml b/.github/workflows/validate-coding-standards.yml
@@ -18,7 +18,7 @@ env:
 jobs:
   validate-package-files:
     name: Validate Package Files
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
       - name: Checkout
         uses: actions/checkout@v2
@@ -63,7 +63,7 @@ jobs:
 
   validate-codeql-format:
     name: "Validate CodeQL Format"
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
       - name: Checkout
         uses: actions/checkout@v2
@@ -94,7 +94,7 @@ jobs:
 
   validate-query-help-files:
     name: Validate Query Help Files
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
       - name: Checkout
         uses: actions/checkout@v2
@@ -129,7 +129,7 @@ jobs:
 
   validate-cpp-test-files:
     name: Validate C++ Test Files
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
       - name: Checkout
         uses: actions/checkout@v2
@@ -152,7 +152,7 @@ jobs:
 
   validate-c-test-files:
     name: Validate C Test Files
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
       - name: Checkout
         uses: actions/checkout@v2
diff --git a/cpp/autosar/test/rules/A5-1-9/test.cpp b/cpp/autosar/test/rules/A5-1-9/test.cpp
@@ -86,16 +86,16 @@ void test_noncompliant() {
 #include <string>
 class Test_issue468 {
 public:
-  template <typename... As> static void LogInfo(const As &... rest) {
+  template <typename... As> static void LogInfo(const As &...rest) {
     [](const std::string &s) -> void { LogInfo(s); }; // COMPLIANT
   }
-  template <typename... As> static void LogWarn(const As &... rest) {
+  template <typename... As> static void LogWarn(const As &...rest) {
     [](const std::string &s) -> void { LogWarn(s); }; // COMPLIANT
   }
-  template <typename... As> static void LogError(const As &... rest) {
+  template <typename... As> static void LogError(const As &...rest) {
     [](const std::string &s) -> void { LogError(s); }; // NON_COMPLIANT
   }
-  template <typename... As> static void LogFatal(const As &... rest) {
+  template <typename... As> static void LogFatal(const As &...rest) {
     [](const std::string &s) -> void { LogError(s); }; // NON_COMPLIANT
   }
   void instantiate() {
diff --git a/cpp/autosar/test/rules/A5-2-2/test.cpp b/cpp/autosar/test/rules/A5-2-2/test.cpp
@@ -45,12 +45,12 @@ void test_cpp_style_cast() {
 class A5_2_2a {
 public:
   template <typename... As>
-  static void Foo(const std::string &name, As &&... rest) {
+  static void Foo(const std::string &name, As &&...rest) {
     Fun(Log(
         std::forward<As>(rest)...)); // COMPLIANT - reported as a false positive
   }
 
-  template <typename... As> static std::string Log(As &&... tail) {
+  template <typename... As> static std::string Log(As &&...tail) {
     return std::string();
   }
 
diff --git a/cpp/autosar/test/rules/A7-2-2/EnumerationUnderlyingBaseTypeNotExplicitlyDefined.expected b/cpp/autosar/test/rules/A7-2-2/EnumerationUnderlyingBaseTypeNotExplicitlyDefined.expected
@@ -1,2 +1,2 @@
 | test.cpp:1:6:1:6 | C | Base type of enumeration is not explicitly specified. |
-| test.cpp:3:12:3:12 | A | Base type of enumeration is not explicitly specified. |
+| test.cpp:5:12:5:12 | A | Base type of enumeration is not explicitly specified. |
diff --git a/cpp/autosar/test/rules/A7-2-2/test.cpp b/cpp/autosar/test/rules/A7-2-2/test.cpp
@@ -1,8 +1,16 @@
 enum C // NON_COMPLIANT
-{ c1 };
+{
+  c1
+};
 enum class A // NON_COMPLIANT
-{ a1 };
+{
+  a1
+};
 enum class B : int // COMPLIANT
-{ b1 };
+{
+  b1
+};
 enum D : int // COMPLIANT
-{ d1 };
+{
+  d1
+};
diff --git a/cpp/autosar/test/rules/A7-2-3/EnumerationsNotDeclaredAsScopedEnumClasses.expected b/cpp/autosar/test/rules/A7-2-3/EnumerationsNotDeclaredAsScopedEnumClasses.expected
@@ -1,2 +1,2 @@
 | test.cpp:1:6:1:6 | C | Enum C is not a scoped enum. |
-| test.cpp:11:6:11:6 | D | Enum D is not a scoped enum. |
+| test.cpp:21:6:21:6 | D | Enum D is not a scoped enum. |
diff --git a/cpp/autosar/test/rules/A7-2-3/test.cpp b/cpp/autosar/test/rules/A7-2-3/test.cpp
@@ -1,12 +1,24 @@
 enum C // NON_COMPLIANT
-{ c1 };
+{
+  c1
+};
 enum class A // COMPLIANT - Violates a different rule (A7-2-2)
-{ a1 };
+{
+  a1
+};
 enum struct A1 // COMPLIANT - Violates a different rule (A7-2-2)
-{ a12 };
+{
+  a12
+};
 enum class B : int // COMPLIANT
-{ b1 };
+{
+  b1
+};
 enum struct B1 : int // COMPLIANT
-{ b12 };
+{
+  b12
+};
 enum D : int // NON_COMPLIANT
-{ d1 };
+{
+  d1
+};
diff --git a/cpp/autosar/test/rules/A7-2-4/NoneFirstOrAllEnumeratorsNotInitialized.expected b/cpp/autosar/test/rules/A7-2-4/NoneFirstOrAllEnumeratorsNotInitialized.expected
@@ -1,4 +1,4 @@
-| test.cpp:9:12:9:13 | A2 | Neither none, the first, or all enumerated constants are initialized in this enumeration. |
-| test.cpp:33:14:33:15 | B3 | Neither none, the first, or all enumerated constants are initialized in this enumeration. |
-| test.cpp:45:6:45:6 | D | Neither none, the first, or all enumerated constants are initialized in this enumeration. |
-| test.cpp:53:6:53:7 | E1 | Neither none, the first, or all enumerated constants are initialized in this enumeration. |
+| test.cpp:13:12:13:13 | A2 | Neither none, the first, or all enumerated constants are initialized in this enumeration. |
+| test.cpp:47:14:47:15 | B3 | Neither none, the first, or all enumerated constants are initialized in this enumeration. |
+| test.cpp:63:6:63:6 | D | Neither none, the first, or all enumerated constants are initialized in this enumeration. |
+| test.cpp:75:6:75:7 | E1 | Neither none, the first, or all enumerated constants are initialized in this enumeration. |
diff --git a/cpp/autosar/test/rules/A7-2-4/test.cpp b/cpp/autosar/test/rules/A7-2-4/test.cpp
@@ -1,55 +1,79 @@
 enum class A // COMPLIANT
-{ a1 };
+{
+  a1
+};
 
 enum class A1 // COMPLIANT
-{ a1 = 0,
+{
+  a1 = 0,
   a2 = 1,
-  a3 = 2 };
+  a3 = 2
+};
 
 enum class A2 // NON_COMPLIANT
-{ a1,
+{
+  a1,
   a2 = 0,
-  a3 };
+  a3
+};
 
 enum class A3 // COMPLIANT
-{ a1 = 0,
+{
+  a1 = 0,
   a2,
-  a3 };
+  a3
+};
 
 enum class B : int // COMPLIANT
-{ b1 };
+{
+  b1
+};
 
 enum class B1 : int // COMPLIANT
-{ b1,
+{
+  b1,
   b2,
-  b3 };
+  b3
+};
 
 enum class B2 : int // COMPLIANT
-{ b1 = 0,
+{
+  b1 = 0,
   b2,
-  b3 };
+  b3
+};
 
 int f() {
   enum class B3 : int // NON_COMPLIANT
-  { b1,
+  {
+    b1,
     b2 = 0,
-    b3 = 0 };
+    b3 = 0
+  };
 
   return 0;
 }
 
 enum C // COMPLIANT
-{ c1,
-  c2 };
+{
+  c1,
+  c2
+};
 
 enum D // NON_COMPLIANT
-{ d1,
-  d2 = 0 };
+{
+  d1,
+  d2 = 0
+};
 
 enum E : int // COMPLIANT
-{ e1,
-  e2 };
+{
+  e1,
+  e2
+};
 
 enum E1 : int // NON_COMPLIANT
-{ e11,
-  e22 = 0 };
+{
+  e11,
+  e22 = 0
+};
diff --git a/cpp/autosar/test/rules/A8-4-5/test.cpp b/cpp/autosar/test/rules/A8-4-5/test.cpp
@@ -48,7 +48,7 @@ class TestClass4 {
 
 // template type
 template <typename T, typename... X>
-T test_forward(X &&... f) {        // forward parameter
+T test_forward(X &&...f) {         // forward parameter
   return T{std::forward<X>(f)...}; // COMPLIANT
 }
 
diff --git a/cpp/autosar/test/rules/A8-4-6/test.cpp b/cpp/autosar/test/rules/A8-4-6/test.cpp
@@ -10,8 +10,8 @@ class TestClass2 {
   explicit TestClass2(const std::vector<int> &v);
 };
 // template type
-template <typename T, typename... X> T make(X &&... x) { // forward param
-  return T{std::forward<X>(x)...};                       // COMPLIANT
+template <typename T, typename... X> T make(X &&...x) { // forward param
+  return T{std::forward<X>(x)...};                      // COMPLIANT
 }
 // template type
 template <typename T, typename U> T make2(U &&x) { // forward param
diff --git a/cpp/autosar/test/rules/M6-4-5/test.cpp b/cpp/autosar/test/rules/M6-4-5/test.cpp
@@ -40,6 +40,6 @@ void test_switchclause_termination2(int expression) {
       k = i;
     }
   default: // NON_COMPLIANT
-           ;
+      ;
   }
 }
diff --git a/cpp/autosar/test/rules/M8-4-4/test.cpp b/cpp/autosar/test/rules/M8-4-4/test.cpp
@@ -25,7 +25,7 @@ void test_function_identifier_f2() {
 
 template <typename F> static void Log(const F kF) {}
 
-template <typename... As> static void LogFatal(const As &... rest) {
+template <typename... As> static void LogFatal(const As &...rest) {
   Log([](const std::string &s) -> void {}); // COMPLIANT
 }
 

Original file line number	Diff line number	Diff line change
`@@ -86,16 +86,16 @@ void test_noncompliant() {`
`86`	`86`	`#include <string>`
`87`	`87`	`class Test_issue468 {`
`88`	`88`	`public:`
`89`		`- template <typename... As> static void LogInfo(const As &... rest) {`
	`89`	`+ template <typename... As> static void LogInfo(const As &...rest) {`
`90`	`90`	`[](const std::string &s) -> void { LogInfo(s); }; // COMPLIANT`
`91`	`91`	`}`
`92`		`- template <typename... As> static void LogWarn(const As &... rest) {`
	`92`	`+ template <typename... As> static void LogWarn(const As &...rest) {`
`93`	`93`	`[](const std::string &s) -> void { LogWarn(s); }; // COMPLIANT`
`94`	`94`	`}`
`95`		`- template <typename... As> static void LogError(const As &... rest) {`
	`95`	`+ template <typename... As> static void LogError(const As &...rest) {`
`96`	`96`	`[](const std::string &s) -> void { LogError(s); }; // NON_COMPLIANT`
`97`	`97`	`}`
`98`		`- template <typename... As> static void LogFatal(const As &... rest) {`
	`98`	`+ template <typename... As> static void LogFatal(const As &...rest) {`
`99`	`99`	`[](const std::string &s) -> void { LogError(s); }; // NON_COMPLIANT`
`100`	`100`	`}`
`101`	`101`	`void instantiate() {`
Original file line number	Diff line number	Diff line change
`@@ -45,12 +45,12 @@ void test_cpp_style_cast() {`
`45`	`45`	`class A5_2_2a {`
`46`	`46`	`public:`
`47`	`47`	`template <typename... As>`
`48`		`- static void Foo(const std::string &name, As &&... rest) {`
	`48`	`+ static void Foo(const std::string &name, As &&...rest) {`
`49`	`49`	`Fun(Log(`
`50`	`50`	`std::forward<As>(rest)...)); // COMPLIANT - reported as a false positive`
`51`	`51`	`}`
`52`	`52`
`53`		`- template <typename... As> static std::string Log(As &&... tail) {`
	`53`	`+ template <typename... As> static std::string Log(As &&...tail) {`
`54`	`54`	`return std::string();`
`55`	`55`	`}`
`56`	`56`