Address feedback

Author: MichaelRFairhurst

cpp/common/src/codingstandards/cpp/Function.qll

@@ -47,7 +47,7 @@ class FunctionAccessExpr extends FunctionAccess, FunctionAccessLikeExpr {
 }
 
 /**
- * Taking an address of a function access in effectively a function access.
+ * Taking the address of a function access in effectively a function access.
  */
 class FunctionAddressExpr extends AddressOfExpr, FunctionAccessLikeExpr {
   Function func;

cpp/common/src/codingstandards/cpp/exceptions/SpecialFunctionExceptions.qll

@@ -92,7 +92,7 @@ class FunctionGivenToStdExitHandler extends FunctionAccess, SpecialUseOfFunction
   override string getSpecialDescription(Locatable extra, string extraString) {
     result = "$@" and
     extra = exitHandlerCall and
-    extraString = "passed exit handler std::" + exitHandler.getName()
+    extraString = "passed to the exit handler std::" + exitHandler.getName()
   }
 }
 

cpp/misra/src/rules/RULE-18-3-1/MissingCatchAllExceptionHandlerInMain.ql

@@ -15,6 +15,7 @@
 
 import cpp
 import codingstandards.cpp.misra
+import codingstandards.cpp.EncapsulatingFunctions
 import codingstandards.cpp.exceptions.ExceptionFlow
 import codingstandards.cpp.exceptions.ExceptionSpecifications
 
@@ -24,7 +25,7 @@ import codingstandards.cpp.exceptions.ExceptionSpecifications
  */
 class UncaughtFunctionCallInMain extends FunctionCall {
   UncaughtFunctionCallInMain() {
-    getEnclosingFunction().hasName("main") and
+    getEnclosingFunction() instanceof MainFunction and
     not isNoExceptTrue(getTarget()) and
     not exists(TryStmt try |
       try = getATryStmt(this.getEnclosingStmt()) and
@@ -46,10 +47,9 @@ class UncaughtFunctionCallInMain extends FunctionCall {
   }
 }
 
-from Function f, UncaughtFunctionCallInMain fc
+from MainFunction f, UncaughtFunctionCallInMain fc
 where
   not isExcluded(f, Exceptions3Package::missingCatchAllExceptionHandlerInMainQuery()) and
-  f.getName() = "main" and
   fc.isFirst()
 select f,
   "Main function has a $@ which is not within a try block with a catch-all ('catch(...)') handler.",

cpp/misra/src/rules/RULE-18-4-1/ExceptionUnfriendlyFunctionMustBeNoexcept.ql

@@ -1,7 +1,7 @@
 /**
  * @id cpp/misra/exception-unfriendly-function-must-be-noexcept
  * @name RULE-18-4-1: Exception-unfriendly functions shall be noexcept
- * @description Throwing exceptions in constructors, descructors, copy-constructors, move
+ * @description Throwing exceptions in constructors, destructors, copy-constructors, move
  *              constructors, assignments, and functions named swap, may result in
  *              implementation-defined behavior.
  * @kind problem

rule_packages/cpp/Exceptions3.json

@@ -50,7 +50,7 @@
       },
       "queries": [
         {
-          "description": "Throwing exceptions in constructors, descructors, copy-constructors, move constructors, assignments, and functions named swap, may result in implementation-defined behavior.",
+          "description": "Throwing exceptions in constructors, destructors, copy-constructors, move constructors, assignments, and functions named swap, may result in implementation-defined behavior.",
           "kind": "problem",
           "name": "Exception-unfriendly functions shall be noexcept",
           "precision": "very-high",