Swift: Take out common code for lines of code.

Author: geoffw0

swift/ql/lib/codeql/swift/elements/File.qll

@@ -1,4 +1,6 @@
 private import codeql.swift.generated.File
+private import codeql.swift.elements.Location
+private import codeql.swift.elements.UnknownLocation
 
 class File extends Generated::File {
   /** toString */
@@ -17,4 +19,17 @@ class File extends Generated::File {
   string getBaseName() {
     result = this.getAbsolutePath().regexpCapture(".*/(([^/]*?)(?:\\.([^.]*))?)", 1)
   }
+
+  /**
+   * Gets the number of lines containing code in this file. This value
+   * is approximate.
+   */
+  int getNumberOfLinesOfCode() {
+    result =
+      count(int line |
+        exists(Location loc |
+          not loc instanceof UnknownLocation and loc.getFile() = this and loc.getStartLine() = line
+        )
+      )
+  }
 }

swift/ql/src/diagnostics/SuccessfullyExtractedLines.ql

@@ -8,8 +8,4 @@
 
 import swift
 
-select count(File f, int line |
-    exists(Location loc |
-      not loc instanceof UnknownLocation and loc.getFile() = f and loc.getStartLine() = line
-    )
-  )
+select sum(File f | | f.getNumberOfLinesOfCode())

swift/ql/src/queries/Summary/SummaryStats.ql

@@ -12,15 +12,6 @@ import codeql.swift.security.SensitiveExprs
 import codeql.swift.dataflow.DataFlow
 import codeql.swift.dataflow.TaintTracking
 
-int linesOfCode() {
-  // approximate number of lines of code in the database
-  result = count(File f, int line |
-    exists(Location loc |
-      not loc instanceof UnknownLocation and loc.getFile() = f and loc.getStartLine() = line
-    )
-  )
-}
-
 /**
  * A taint configuration for tainted data reaching any node.
  */
@@ -46,7 +37,7 @@ float taintReach() { result = (taintedNodesCount() * 1000000.0) / count(DataFlow
 predicate statistic(string what, string value) {
   what = "Files" and value = count(File f).toString()
   or
-  what = "Lines of code" and value = linesOfCode().toString()
+  what = "Lines of code" and value = sum(File f | | f.getNumberOfLinesOfCode()).toString()
   or
   what = "Compiler errors" and value = count(CompilerError d).toString()
   or