refactor

Author: jsinglet

cpp/autosar/test/rules/M7-4-1/UsageOfAssemblerNotDocumented.expected

@@ -0,0 +1 @@
+| test.cpp:8:42:8:58 | asm statement | Use of assembler is not documented. |

cpp/autosar/test/rules/M7-4-1/test.cpp

@@ -0,0 +1,12 @@
+// COMPLIANT
+void test_assembly_is_documented() {
+  // This comment serves as documentation
+  __asm__("ret\n");
+}
+
+// NON_COMPLIANT
+void test_assembly_is_not_documented() { __asm__("ret\n"); }
+
+// COMPLIANT
+#define RETURN __asm__("ret\n")
+void test_undocumented_assembly_from_macro() { RETURN; }

cpp/common/src/codingstandards/cpp/exclusions/c/Language2.qll

@@ -3,23 +3,72 @@ import cpp
 import RuleMetadata
 import codingstandards.cpp.exclusions.RuleMetadata
 
-newtype Language2Query = TLanguageExtensionsShouldNotBeUsedQuery()
+newtype Language2Query =
+  TUsageOfAssemblyLanguageShouldBeDocumentedQuery() or
+  TLanguageExtensionsShouldNotBeUsedQuery() or
+  TCriticalUnspecifiedBehaviourQuery() or
+  TEmergentLanguageFeaturesUsedQuery()
 
 predicate isLanguage2QueryMetadata(Query query, string queryId, string ruleId) {
+  query =
+    // `Query` instance for the `usageOfAssemblyLanguageShouldBeDocumented` query
+    Language2Package::usageOfAssemblyLanguageShouldBeDocumentedQuery() and
+  queryId =
+    // `@id` for the `usageOfAssemblyLanguageShouldBeDocumented` query
+    "c/misra/usage-of-assembly-language-should-be-documented" and
+  ruleId = "DIR-4-2"
+  or
   query =
     // `Query` instance for the `languageExtensionsShouldNotBeUsed` query
     Language2Package::languageExtensionsShouldNotBeUsedQuery() and
   queryId =
     // `@id` for the `languageExtensionsShouldNotBeUsed` query
     "c/misra/language-extensions-should-not-be-used" and
   ruleId = "RULE-1-2"
+  or
+  query =
+    // `Query` instance for the `criticalUnspecifiedBehaviour` query
+    Language2Package::criticalUnspecifiedBehaviourQuery() and
+  queryId =
+    // `@id` for the `criticalUnspecifiedBehaviour` query
+    "c/misra/critical-unspecified-behaviour" and
+  ruleId = "RULE-1-3"
+  or
+  query =
+    // `Query` instance for the `emergentLanguageFeaturesUsed` query
+    Language2Package::emergentLanguageFeaturesUsedQuery() and
+  queryId =
+    // `@id` for the `emergentLanguageFeaturesUsed` query
+    "c/misra/emergent-language-features-used" and
+  ruleId = "RULE-1-4"
 }
 
 module Language2Package {
+  Query usageOfAssemblyLanguageShouldBeDocumentedQuery() {
+    //autogenerate `Query` type
+    result =
+      // `Query` type for `usageOfAssemblyLanguageShouldBeDocumented` query
+      TQueryC(TLanguage2PackageQuery(TUsageOfAssemblyLanguageShouldBeDocumentedQuery()))
+  }
+
   Query languageExtensionsShouldNotBeUsedQuery() {
     //autogenerate `Query` type
     result =
       // `Query` type for `languageExtensionsShouldNotBeUsed` query
       TQueryC(TLanguage2PackageQuery(TLanguageExtensionsShouldNotBeUsedQuery()))
   }
+
+  Query criticalUnspecifiedBehaviourQuery() {
+    //autogenerate `Query` type
+    result =
+      // `Query` type for `criticalUnspecifiedBehaviour` query
+      TQueryC(TLanguage2PackageQuery(TCriticalUnspecifiedBehaviourQuery()))
+  }
+
+  Query emergentLanguageFeaturesUsedQuery() {
+    //autogenerate `Query` type
+    result =
+      // `Query` type for `emergentLanguageFeaturesUsed` query
+      TQueryC(TLanguage2PackageQuery(TEmergentLanguageFeaturesUsedQuery()))
+  }
 }