Swift: fix getNumberOf predicate

Author: redsun82

swift/codegen/templates/ql_class.mustache

@@ -126,7 +126,7 @@ module Generated {
      * Gets the number of {{doc_plural}}.
      */
     final int getNumberOf{{plural}}() {
-      result = count({{indefinite_getter}}())
+      result = count(int i | exists({{getter}}(i)))
     }
     {{/is_optional}}
     {{/is_repeated}}

swift/ql/.generated.list

@@ -56,7 +56,7 @@ module Generated {
     /**
      * Gets the number of parameters of this callable.
      */
-    final int getNumberOfParams() { result = count(getAParam()) }
+    final int getNumberOfParams() { result = count(int i | exists(getParam(i))) }
 
     /**
      * Gets the body of this callable, if it exists.

swift/ql/lib/codeql/swift/generated/Callable.qll

@@ -34,6 +34,6 @@ module Generated {
     /**
      * Gets the number of accessor declarations of this abstract storage declaration.
      */
-    final int getNumberOfAccessorDecls() { result = count(getAnAccessorDecl()) }
+    final int getNumberOfAccessorDecls() { result = count(int i | exists(getAccessorDecl(i))) }
   }
 }

swift/ql/lib/codeql/swift/generated/decl/AbstractStorageDecl.qll

@@ -34,6 +34,6 @@ module Generated {
     /**
      * Gets the number of elements of this enum case declaration.
      */
-    final int getNumberOfElements() { result = count(getAnElement()) }
+    final int getNumberOfElements() { result = count(int i | exists(getElement(i))) }
   }
 }

swift/ql/lib/codeql/swift/generated/decl/EnumCaseDecl.qll

@@ -41,6 +41,6 @@ module Generated {
     /**
      * Gets the number of parameters of this enum element declaration.
      */
-    final int getNumberOfParams() { result = count(getAParam()) }
+    final int getNumberOfParams() { result = count(int i | exists(getParam(i))) }
   }
 }

swift/ql/lib/codeql/swift/generated/decl/EnumElementDecl.qll

@@ -34,6 +34,8 @@ module Generated {
     /**
      * Gets the number of generic type parameters of this generic context.
      */
-    final int getNumberOfGenericTypeParams() { result = count(getAGenericTypeParam()) }
+    final int getNumberOfGenericTypeParams() {
+      result = count(int i | exists(getGenericTypeParam(i)))
+    }
   }
 }

swift/ql/lib/codeql/swift/generated/decl/GenericContext.qll

@@ -36,6 +36,6 @@ module Generated {
     /**
      * Gets the number of active elements of this if config declaration.
      */
-    final int getNumberOfActiveElements() { result = count(getAnActiveElement()) }
+    final int getNumberOfActiveElements() { result = count(int i | exists(getActiveElement(i))) }
   }
 }

swift/ql/lib/codeql/swift/generated/decl/IfConfigDecl.qll

@@ -63,6 +63,6 @@ module Generated {
     /**
      * Gets the number of declarations of this import declaration.
      */
-    final int getNumberOfDeclarations() { result = count(getADeclaration()) }
+    final int getNumberOfDeclarations() { result = count(int i | exists(getDeclaration(i))) }
   }
 }

swift/ql/lib/codeql/swift/generated/decl/ImportDecl.qll

@@ -32,6 +32,6 @@ module Generated {
     /**
      * Gets the number of members of this iterable declaration context.
      */
-    final int getNumberOfMembers() { result = count(getAMember()) }
+    final int getNumberOfMembers() { result = count(int i | exists(getMember(i))) }
   }
 }