Shared/Java/C#/Rust/C++: Rename 'captureHeuristicFlow' to 'captureFlow'.

Author: MathiasVP

cpp/ql/test/library-tests/dataflow/modelgenerator/dataflow/CaptureHeuristicSummaryModels.ql

@@ -4,7 +4,7 @@ import SummaryModels
 import InlineModelsAsDataTest
 
 module InlineMadTestConfig implements InlineMadTestConfigSig {
-  string getCapturedModel(MadRelevantFunction c) { result = Heuristic::captureHeuristicFlow(c, _) }
+  string getCapturedModel(MadRelevantFunction c) { result = Heuristic::captureFlow(c, _) }
 
   string getKind() { result = "heuristic-summary" }
 }

csharp/ql/src/utils/modelgenerator/debug/CaptureSummaryModelsPath.ql

@@ -11,16 +11,15 @@
 import csharp
 import utils.modelgenerator.internal.CaptureModels
 import SummaryModels
-import Heuristic
-import PropagateTaintFlow::PathGraph
+import Heuristic::PropagateTaintFlow::PathGraph
 
 from
-  PropagateTaintFlow::PathNode source, PropagateTaintFlow::PathNode sink,
+  Heuristic::PropagateTaintFlow::PathNode source, Heuristic::PropagateTaintFlow::PathNode sink,
   DataFlowSummaryTargetApi api, DataFlow::Node p, DataFlow::Node returnNodeExt
 where
-  PropagateTaintFlow::flowPath(source, sink) and
+  Heuristic::PropagateTaintFlow::flowPath(source, sink) and
   p = source.getNode() and
   returnNodeExt = sink.getNode() and
-  captureThroughFlow0(api, p, returnNodeExt)
+  Heuristic::captureThroughFlow0(api, p, returnNodeExt)
 select sink.getNode(), source, sink, "There is flow from $@ to the $@.", source.getNode(),
   "parameter", sink.getNode(), "return value"

csharp/ql/test/utils/modelgenerator/dataflow/CaptureHeuristicSummaryModels.ql

@@ -4,7 +4,7 @@ import SummaryModels
 import utils.test.InlineMadTest
 
 module InlineMadTestConfig implements InlineMadTestConfigSig {
-  string getCapturedModel(Callable c) { result = Heuristic::captureHeuristicFlow(c, _) }
+  string getCapturedModel(Callable c) { result = Heuristic::captureFlow(c, _) }
 
   string getKind() { result = "heuristic-summary" }
 }

java/ql/src/utils/modelgenerator/debug/CaptureSummaryModelsPath.ql

@@ -12,16 +12,15 @@ import java
 import semmle.code.java.dataflow.DataFlow
 import utils.modelgenerator.internal.CaptureModels
 import SummaryModels
-import Heuristic
-import PropagateTaintFlow::PathGraph
+import Heuristic::PropagateTaintFlow::PathGraph
 
 from
-  PropagateTaintFlow::PathNode source, PropagateTaintFlow::PathNode sink,
+  Heuristic::PropagateTaintFlow::PathNode source, Heuristic::PropagateTaintFlow::PathNode sink,
   DataFlowSummaryTargetApi api, DataFlow::Node p, DataFlow::Node returnNodeExt
 where
-  PropagateTaintFlow::flowPath(source, sink) and
+  Heuristic::PropagateTaintFlow::flowPath(source, sink) and
   p = source.getNode() and
   returnNodeExt = sink.getNode() and
-  captureThroughFlow0(api, p, returnNodeExt)
+  Heuristic::captureThroughFlow0(api, p, returnNodeExt)
 select sink.getNode(), source, sink, "There is flow from $@ to the $@.", source.getNode(),
   "parameter", sink.getNode(), "return value"

java/ql/test/utils/modelgenerator/dataflow/CaptureHeuristicSummaryModels.ql

@@ -4,7 +4,7 @@ import SummaryModels
 import utils.test.InlineMadTest
 
 module InlineMadTestConfig implements InlineMadTestConfigSig {
-  string getCapturedModel(Callable c) { result = Heuristic::captureHeuristicFlow(c, _) }
+  string getCapturedModel(Callable c) { result = Heuristic::captureFlow(c, _) }
 
   string getKind() { result = "heuristic-summary" }
 }

rust/ql/src/utils/modelgenerator/debug/CaptureSummaryModelsPath.ql

@@ -11,16 +11,15 @@
 private import codeql.rust.dataflow.DataFlow
 import utils.modelgenerator.internal.CaptureModels
 import SummaryModels
-import Heuristic
-import PropagateTaintFlow::PathGraph
+import Heuristic::PropagateTaintFlow::PathGraph
 
 from
-  PropagateTaintFlow::PathNode source, PropagateTaintFlow::PathNode sink,
+  Heuristic::PropagateTaintFlow::PathNode source, Heuristic::PropagateTaintFlow::PathNode sink,
   DataFlowSummaryTargetApi api, DataFlow::Node p, DataFlow::Node returnNodeExt
 where
-  PropagateTaintFlow::flowPath(source, sink) and
+  Heuristic::PropagateTaintFlow::flowPath(source, sink) and
   p = source.getNode() and
   returnNodeExt = sink.getNode() and
-  captureThroughFlow0(api, p, returnNodeExt)
+  Heuristic::captureThroughFlow0(api, p, returnNodeExt)
 select sink.getNode(), source, sink, "There is flow from $@ to the $@.", source.getNode(),
   "parameter", sink.getNode(), "return value"

shared/mad/codeql/mad/modelgenerator/internal/ModelGeneratorImpl.qll

@@ -572,7 +572,7 @@ module MakeModelGeneratorFactory<
        *
        * `preservesValue` is `true` if the summary is value-preserving, and `false` otherwise.
        */
-      string captureHeuristicFlow(DataFlowSummaryTargetApi api, boolean preservesValue) {
+      string captureFlow(DataFlowSummaryTargetApi api, boolean preservesValue) {
         result = captureQualifierFlow(api) and preservesValue = true
         or
         result = captureThroughFlow(api, preservesValue)
@@ -988,7 +988,7 @@ module MakeModelGeneratorFactory<
           api0.lift() = api.lift() and
           exists(ContentSensitive::captureFlow(api0, true, _))
         ) and
-        result = Heuristic::captureHeuristicFlow(api, preservesValue) and
+        result = Heuristic::captureFlow(api, preservesValue) and
         lift = true
       )
     }