Python: Fix all metrics-related compilation failures

In hindsight, having a `.getMetrics()` method that just returns `this`
is somewhat weird. It's possible that it predates the existence of the
inline cast, however.

python/ql/src/Functions/OverlyComplexDelMethod.ql

@@ -18,6 +18,6 @@ from FunctionValue method
 where
   exists(ClassValue c |
     c.declaredAttribute("__del__") = method and
-    method.getScope().getMetrics().getCyclomaticComplexity() > 3
+    method.getScope().(FunctionMetrics).getCyclomaticComplexity() > 3
   )
 select method, "Overly complex '__del__' method."

python/ql/src/Metrics/CLinesOfCode.ql

@@ -10,6 +10,7 @@
  */
 
 import python
+private import LegacyPointsTo
 
-from Function f
+from FunctionMetrics f
-select f, f.getMetrics().getNumberOfLinesOfCode() as n order by n desc
+select f, f.getNumberOfLinesOfCode() as n order by n desc

python/ql/src/Metrics/ClassAfferentCoupling.ql

@@ -11,6 +11,7 @@
  */
 
 import python
+private import LegacyPointsTo
 
 from ClassMetrics cls
 select cls, cls.getAfferentCoupling() as n order by n desc

python/ql/src/Metrics/ClassEfferentCoupling.ql

@@ -11,6 +11,7 @@
  */
 
 import python
+private import LegacyPointsTo
 
 from ClassMetrics cls
 select cls, cls.getEfferentCoupling() as n order by n desc

python/ql/src/Metrics/CommentRatio.ql

@@ -12,8 +12,10 @@
  */
 
 import python
+private import LegacyPointsTo
 
-from Module m, ModuleMetrics mm
+from ModuleMetrics mm
-where mm = m.getMetrics() and mm.getNumberOfLines() > 0
+where mm.getNumberOfLines() > 0
-select m, 100.0 * (mm.getNumberOfLinesOfComments().(float) / mm.getNumberOfLines().(float)) as ratio
+select mm,
+  100.0 * (mm.getNumberOfLinesOfComments().(float) / mm.getNumberOfLines().(float)) as ratio
   order by ratio desc

python/ql/src/Metrics/CyclomaticComplexity.ql

@@ -13,7 +13,8 @@
  */
 
 import python
+private import LegacyPointsTo
 
-from Function func, int complexity
+from FunctionMetrics func, int complexity
-where complexity = func.getMetrics().getCyclomaticComplexity()
+where complexity = func.getCyclomaticComplexity()
 select func, complexity order by complexity desc

python/ql/src/Metrics/DocStringRatio.ql

@@ -11,9 +11,10 @@
  */
 
 import python
+private import LegacyPointsTo
 
-from Module m, ModuleMetrics mm
+from ModuleMetrics mm
-where mm = m.getMetrics() and mm.getNumberOfLines() > 0
+where mm.getNumberOfLines() > 0
-select m,
+select mm,
   100.0 * (mm.getNumberOfLinesOfDocStrings().(float) / mm.getNumberOfLines().(float)) as ratio
   order by ratio desc

python/ql/src/Metrics/FLines.ql

@@ -9,7 +9,8 @@
  */
 
 import python
+private import LegacyPointsTo
 
-from Module m, int n
+from ModuleMetrics m, int n
-where n = m.getMetrics().getNumberOfLines()
+where n = m.getNumberOfLines()
 select m, n order by n desc

python/ql/src/Metrics/FLinesOfCode.ql

@@ -11,7 +11,8 @@
  */
 
 import python
+private import LegacyPointsTo
 
-from Module m, int n
+from ModuleMetrics m, int n
-where n = m.getMetrics().getNumberOfLinesOfCode()
+where n = m.getNumberOfLinesOfCode()
 select m, n order by n desc

python/ql/src/Metrics/FLinesOfComments.ql

@@ -10,8 +10,8 @@
  */
 
 import python
+private import LegacyPointsTo
 
-from Module m, int n
+from ModuleMetrics m, int n
-where
+where n = m.getNumberOfLinesOfComments() + m.getNumberOfLinesOfDocStrings()
-  n = m.getMetrics().getNumberOfLinesOfComments() + m.getMetrics().getNumberOfLinesOfDocStrings()
 select m, n order by n desc

python/ql/src/Metrics/FunctionNumberOfCalls.ql

@@ -9,6 +9,7 @@
  */
 
 import python
+private import LegacyPointsTo
 
 from FunctionMetrics func
 select func, func.getNumberOfCalls() as n order by n desc

python/ql/src/Metrics/FunctionStatementNestingDepth.ql

@@ -11,6 +11,7 @@
  */
 
 import python
+private import LegacyPointsTo
 
 from FunctionMetrics func
 select func, func.getStatementNestingDepth() as n order by n desc

python/ql/src/Metrics/History/HChurn.ql

@@ -10,8 +10,9 @@
 
 import python
 import external.VCS
+private import LegacyPointsTo
 
-from Module m, int n
+from ModuleMetrics m, int n
 where
   n =
     sum(Commit entry, int churn |
@@ -19,5 +20,5 @@ where
     |
       churn
     ) and
-  exists(m.getMetrics().getNumberOfLinesOfCode())
+  exists(m.getNumberOfLinesOfCode())
 select m, n order by n desc

python/ql/src/Metrics/History/HLinesAdded.ql

@@ -10,8 +10,9 @@
 
 import python
 import external.VCS
+private import LegacyPointsTo
 
-from Module m, int n
+from ModuleMetrics m, int n
 where
   n =
     sum(Commit entry, int churn |
@@ -19,5 +20,5 @@ where
     |
       churn
     ) and
-  exists(m.getMetrics().getNumberOfLinesOfCode())
+  exists(m.getNumberOfLinesOfCode())
 select m, n order by n desc

python/ql/src/Metrics/History/HLinesDeleted.ql

@@ -10,8 +10,9 @@
 
 import python
 import external.VCS
+private import LegacyPointsTo
 
-from Module m, int n
+from ModuleMetrics m, int n
 where
   n =
     sum(Commit entry, int churn |
@@ -19,5 +20,5 @@ where
     |
       churn
     ) and
-  exists(m.getMetrics().getNumberOfLinesOfCode())
+  exists(m.getNumberOfLinesOfCode())
 select m, n order by n desc

python/ql/src/Metrics/History/HNumberOfAuthors.ql

@@ -10,7 +10,8 @@
 
 import python
 import external.VCS
+private import LegacyPointsTo
 
-from Module m
+from ModuleMetrics m
-where exists(m.getMetrics().getNumberOfLinesOfCode())
+where exists(m.getNumberOfLinesOfCode())
 select m, count(Author author | author.getAnEditedFile() = m.getFile())

python/ql/src/Metrics/History/HNumberOfCoCommits.ql

@@ -10,11 +10,12 @@
 
 import python
 import external.VCS
+private import LegacyPointsTo
 
 int committedFiles(Commit commit) { result = count(commit.getAnAffectedFile()) }
 
-from Module m
+from ModuleMetrics m
-where exists(m.getMetrics().getNumberOfLinesOfCode())
+where exists(m.getNumberOfLinesOfCode())
 select m,
   avg(Commit commit, int toAvg |
     commit.getAnAffectedFile() = m.getFile() and toAvg = committedFiles(commit) - 1

python/ql/src/Metrics/History/HNumberOfReCommits.ql

@@ -10,6 +10,7 @@
 
 import python
 import external.VCS
+private import LegacyPointsTo
 
 predicate inRange(Commit first, Commit second) {
   first.getAnAffectedFile() = second.getAnAffectedFile() and
@@ -29,6 +30,6 @@ int recommitsForFile(File f) {
     )
 }
 
-from Module m
+from ModuleMetrics m
-where exists(m.getMetrics().getNumberOfLinesOfCode())
+where exists(m.getNumberOfLinesOfCode())
 select m, recommitsForFile(m.getFile())

python/ql/src/Metrics/History/HNumberOfRecentAuthors.ql

@@ -10,9 +10,10 @@
 
 import python
 import external.VCS
+private import LegacyPointsTo
 
-from Module m
+from ModuleMetrics m
-where exists(m.getMetrics().getNumberOfLinesOfCode())
+where exists(m.getNumberOfLinesOfCode())
 select m,
   count(Author author |
     exists(Commit e |

python/ql/src/Metrics/History/HNumberOfRecentChangedFiles.ql

@@ -10,11 +10,12 @@
 
 import python
 import external.VCS
+private import LegacyPointsTo
 
-from Module m
+from ModuleMetrics m
 where
   exists(Commit e |
     e.getAnAffectedFile() = m.getFile() and e.daysToNow() <= 180 and not artificialChange(e)
   ) and
-  exists(m.getMetrics().getNumberOfLinesOfCode())
+  exists(m.getNumberOfLinesOfCode())
 select m, 1

python/ql/src/Metrics/LackofCohesionInMethodsCK.ql

@@ -9,6 +9,7 @@
  */
 
 import python
+private import LegacyPointsTo
 
 from ClassMetrics cls
 select cls, cls.getLackOfCohesionCK() as n order by n desc

python/ql/src/Metrics/LackofCohesionInMethodsHM.ql

@@ -9,6 +9,7 @@
  */
 
 import python
+private import LegacyPointsTo
 
 from ClassMetrics cls
 select cls, cls.getLackOfCohesionHM() as n order by n desc

python/ql/src/Metrics/ModuleAfferentCoupling.ql

@@ -11,6 +11,7 @@
  */
 
 import python
+private import LegacyPointsTo
 
 from ModuleMetrics m
 select m, m.getAfferentCoupling() as n order by n desc

python/ql/src/Metrics/ModuleEfferentCoupling.ql

@@ -11,6 +11,7 @@
  */
 
 import python
+private import LegacyPointsTo
 
 from ModuleMetrics m
 select m, m.getEfferentCoupling() as n order by n desc

python/ql/src/Metrics/NumberOfParametersWithoutDefault.ql

@@ -11,6 +11,7 @@
  */
 
 import python
+private import LegacyPointsTo
 
 from FunctionMetrics func
 select func, func.getNumberOfParametersWithoutDefault() as n order by n desc

python/ql/src/Statements/DocStrings.ql

@@ -28,12 +28,12 @@ predicate needs_docstring(Scope s) {
   )
 }
 
-predicate function_needs_docstring(Function f) {
+predicate function_needs_docstring(FunctionMetrics f) {
   not exists(FunctionValue fo, FunctionValue base | fo.overrides(base) and fo.getScope() = f |
     not function_needs_docstring(base.getScope())
   ) and
   f.getName() != "lambda" and
-  (f.getMetrics().getNumberOfLinesOfCode() - count(f.getADecorator())) > 2 and
+  (f.getNumberOfLinesOfCode() - count(f.getADecorator())) > 2 and
   not exists(PythonPropertyObject p |
     p.getGetter().getFunction() = f or
     p.getSetter().getFunction() = f

python/ql/src/Summary/LinesOfCode.ql

@@ -10,5 +10,6 @@
  */
 
 import python
+private import LegacyPointsTo
 
-select sum(Module m | | m.getMetrics().getNumberOfLinesOfCode())
+select sum(ModuleMetrics m | | m.getNumberOfLinesOfCode())

python/ql/src/Summary/LinesOfUserCode.ql

@@ -14,10 +14,11 @@
 
 import python
 import semmle.python.filters.GeneratedCode
+private import LegacyPointsTo
 
-select sum(Module m |
+select sum(ModuleMetrics m |
     exists(m.getFile().getRelativePath()) and
     not m.getFile() instanceof GeneratedFile
   |
-    m.getMetrics().getNumberOfLinesOfCode()
+    m.getNumberOfLinesOfCode()
   )

python/ql/src/analysis/Summary.ql

@@ -3,6 +3,7 @@
  */
 
 import python
+private import LegacyPointsTo
 
 from string key, string value
 where

python/ql/src/meta/debug/DebugStats.ql

@@ -1,15 +1,15 @@
 import python
+private import LegacyPointsTo
 
 from string msg, int cnt, int sort
 where
   sort = 0 and
   msg = "Lines of code in DB" and
-  cnt = sum(Module m | | m.getMetrics().getNumberOfLinesOfCode())
+  cnt = sum(ModuleMetrics m | | m.getNumberOfLinesOfCode())
   or
   sort = 1 and
   msg = "Lines of code in repo" and
-  cnt =
+  cnt = sum(ModuleMetrics m | exists(m.getFile().getRelativePath()) | m.getNumberOfLinesOfCode())
-    sum(Module m | exists(m.getFile().getRelativePath()) | m.getMetrics().getNumberOfLinesOfCode())
   or
   sort = 2 and
   msg = "Files" and

python/ql/test/library-tests/ControlFlow/general/Comments.ql

@@ -1,5 +1,6 @@
 import python
+private import LegacyPointsTo
 
-from Module m, int n
+from ModuleMetrics m, int n
-where n = m.getMetrics().getNumberOfLinesOfComments()
+where n = m.getNumberOfLinesOfComments()
 select m.toString(), n

python/ql/test/library-tests/ControlFlow/general/Cyclo.ql

@@ -1,4 +1,5 @@
 import python
+private import LegacyPointsTo
 
-from Function func
+from FunctionMetrics func
-select func.toString(), func.getMetrics().getCyclomaticComplexity()
+select func.toString(), func.getCyclomaticComplexity()

python/ql/test/library-tests/ControlFlow/general/Lines.ql

@@ -1,8 +1,9 @@
 import python
+private import LegacyPointsTo
 
 from Scope s, int n
 where
-  exists(Function f | f = s | n = f.getMetrics().getNumberOfLines())
+  exists(FunctionMetrics f | f = s | n = f.getNumberOfLines())
   or
-  exists(Module m | m = s | n = m.getMetrics().getNumberOfLines())
+  exists(ModuleMetrics m | m = s | n = m.getNumberOfLines())
 select s.toString(), n

python/ql/test/query-tests/Metrics/ratios/CodeRatio.ql

@@ -1,6 +1,7 @@
 import python
+private import LegacyPointsTo
 
-from Module m, ModuleMetrics mm
+from ModuleMetrics mm
-where mm = m.getMetrics() and mm.getNumberOfLines() > 0
+where mm.getNumberOfLines() > 0
-select m, 100.0 * (mm.getNumberOfLinesOfCode().(float) / mm.getNumberOfLines().(float)) as ratio
+select mm, 100.0 * (mm.getNumberOfLinesOfCode().(float) / mm.getNumberOfLines().(float)) as ratio
   order by ratio desc