M14-6-1: Rename predicates for clarity

Author: lcartey

cpp/autosar/src/rules/M14-6-1/NameInDependentBase.qll

@@ -37,7 +37,7 @@ private FunctionCall helper_functioncall(
  * Gets a function call in `TemplateClass` `t` where the target function name exists in a dependent
  * base type and the call is to a function that is not declared in the dependent base type.
  */
-FunctionCall parentMemberFunctionCall(TemplateClass t) {
+FunctionCall getConfusingFunctionCall(TemplateClass t) {
   exists(
     string name, TemplateClass dependentBaseType, MemberFunction dependentTypeFunction,
     Function target
@@ -70,7 +70,7 @@ private FunctionAccess helper_functionaccess(
  * Gets a function access in `TemplateClass` `t` where the target function name exists in a dependent
  * base type and the access is to a function declared outside the dependent base type.
  */
-FunctionAccess parentMemberFunctionAccess(TemplateClass t) {
+FunctionAccess getConfusingFunctionAccess(TemplateClass t) {
   exists(
     string name, TemplateClass dependentBaseType, MemberFunction dependentTypeFunction,
     Function target
@@ -101,7 +101,7 @@ private VariableAccess helper_memberaccess(
  * Gets a memmber access in `TemplateClass` `t` where the target member name exists in a dependent
  * base type and the access is to a variable declared outside the dependent base type.
  */
-VariableAccess parentMemberAccess(TemplateClass t) {
+VariableAccess getConfusingMemberVariableAccess(TemplateClass t) {
   exists(
     string name, TemplateClass dependentBaseType, MemberVariable dependentTypeMemberVariable,
     Variable target

cpp/autosar/src/rules/M14-6-1/NameNotReferredUsingAQualifiedIdOrThis.ql

@@ -24,16 +24,13 @@ where
   not isCustomExcluded(fn) and
   missingNameQualifier(fn) and
   (
-    fn instanceof FunctionAccess and
-    fn = parentMemberFunctionAccess(c)
+    fn = getConfusingFunctionAccess(c)
     or
-    fn instanceof FunctionCall and
-    fn = parentMemberFunctionCall(c) and
+    fn = getConfusingFunctionCall(c) and
     not exists(Expr e | e = fn.(FunctionCall).getQualifier())
     or
-    fn instanceof VariableAccess and
     not fn.(VariableAccess).getTarget() instanceof Parameter and
-    fn = parentMemberAccess(c) and
+    fn = getConfusingMemberVariableAccess(c) and
     not exists(Expr e | e = fn.(VariableAccess).getQualifier())
   ) and
   not fn.isAffectedByMacro()

cpp/autosar/src/rules/M14-6-1/NameNotReferredUsingAQualifiedIdOrThisAudit.ql

@@ -24,16 +24,13 @@ where
   not isCustomExcluded(fn) and
   missingNameQualifier(fn) and
   (
-    fn instanceof FunctionAccess and
-    fn = parentMemberFunctionAccess(c)
+    fn = getConfusingFunctionAccess(c)
     or
-    fn instanceof FunctionCall and
-    fn = parentMemberFunctionCall(c) and
+    fn = getConfusingFunctionCall(c) and
     not exists(Expr e | e = fn.(FunctionCall).getQualifier())
     or
-    fn instanceof VariableAccess and
     not fn.(VariableAccess).getTarget() instanceof Parameter and
-    fn = parentMemberAccess(c) and
+    fn = getConfusingMemberVariableAccess(c) and
     not exists(Expr e | e = fn.(VariableAccess).getQualifier())
   )
 select fn, "Use of identifier that also exists in a base class that is not fully qualified."