C++: Solve duplication in getParameterString().

Author: geoffw0

cpp/ql/src/semmle/code/cpp/Function.qll

@@ -191,10 +191,10 @@ class Function extends Declaration, ControlFlowNode, AccessHolder, @function {
     result = ""
     or
     index = getNumberOfParameters() - 1 and
-    result = getParameter(index).getTypedName()
+    result = min(getParameter(index).getTypedName())
     or
     index < getNumberOfParameters() - 1 and
-    result = getParameter(index).getTypedName() + ", " + getParameterStringFrom(index + 1)
+    result = min(getParameter(index).getTypedName()) + ", " + getParameterStringFrom(index + 1)
   }
 
   /** Gets a call to this function. */
@@ -623,11 +623,11 @@ class FunctionDeclarationEntry extends DeclarationEntry, @fun_decl {
     result = ""
     or
     index = getNumberOfParameters() - 1 and
-    result = getParameterDeclarationEntry(index).getTypedName()
+    result = min(getParameterDeclarationEntry(index).getTypedName())
     or
     index < getNumberOfParameters() - 1 and
     result =
-      getParameterDeclarationEntry(index).getTypedName() + ", " + getParameterStringFrom(index + 1)
+      min(getParameterDeclarationEntry(index).getTypedName()) + ", " + getParameterStringFrom(index + 1)
   }
 
   /**

cpp/ql/test/library-tests/functions/functions/Functions1.expected

@@ -28,6 +28,4 @@
 | functions.cpp:39:2:39:8 | MyClass | MyClass | MyClass && from | declaration:functions.cpp:39:2:39:8 |
 | functions.cpp:40:2:40:13 | operator int | operator int |  | declaration:functions.cpp:40:2:40:13 |
 | functions.cpp:43:6:43:6 | h | h | int x | TopLevelFunction, declaration:functions.cpp:43:6:43:6, declaration:functions.cpp:44:6:44:6, isTopLevel |
-| functions.cpp:43:6:43:6 | h | h | int y | TopLevelFunction, declaration:functions.cpp:43:6:43:6, declaration:functions.cpp:44:6:44:6, isTopLevel |
 | functions.cpp:44:6:44:6 | h | h | int x | TopLevelFunction, declaration:functions.cpp:43:6:43:6, declaration:functions.cpp:44:6:44:6, isTopLevel |
-| functions.cpp:44:6:44:6 | h | h | int y | TopLevelFunction, declaration:functions.cpp:43:6:43:6, declaration:functions.cpp:44:6:44:6, isTopLevel |