Python: Move typePreservingStep into Private

tausbn · tausbn · commit f05313435d68 · 2021-03-12T14:06:39.000+01:00
diff --git a/python/ql/src/experimental/typetracking/TypeTracker.qll b/python/ql/src/experimental/typetracking/TypeTracker.qll
@@ -78,12 +78,6 @@ module StepSummary {
   }
 }
 
-/** Holds if it's reasonable to expect the data flow step from `nodeFrom` to `nodeTo` to preserve types. */
-private predicate typePreservingStep(Node nodeFrom, Node nodeTo) {
-  simpleLocalFlowStep(nodeFrom, nodeTo) or
-  jumpStep(nodeFrom, nodeTo)
-}
-
 /**
  * A utility class that is equivalent to `boolean` but does not require type joining.
  */
diff --git a/python/ql/src/experimental/typetracking/TypeTrackerPrivate.qll b/python/ql/src/experimental/typetracking/TypeTrackerPrivate.qll
@@ -6,9 +6,11 @@ class Node = DataFlowPublic::Node;
 
 class LocalSourceNode = DataFlowPublic::LocalSourceNode;
 
-predicate jumpStep = DataFlowPrivate::jumpStep/2;
-
-predicate simpleLocalFlowStep = DataFlowPrivate::simpleLocalFlowStep/2;
+/** Holds if it's reasonable to expect the data flow step from `nodeFrom` to `nodeTo` to preserve types. */
+predicate typePreservingStep(Node nodeFrom, Node nodeTo) {
+  DataFlowPrivate::simpleLocalFlowStep(nodeFrom, nodeTo) or
+  DataFlowPrivate::jumpStep(nodeFrom, nodeTo)
+}
 
 /**
  * Gets the name of a possible piece of content. This will usually include things like

Original file line number	Diff line number	Diff line change
`@@ -78,12 +78,6 @@ module StepSummary {`
`78`	`78`	`}`
`79`	`79`	`}`
`80`	`80`
`81`		-/** Holds if it's reasonable to expect the data flow step from `nodeFrom` to `nodeTo` to preserve types. */
`82`		`-private predicate typePreservingStep(Node nodeFrom, Node nodeTo) {`
`83`		`- simpleLocalFlowStep(nodeFrom, nodeTo) or`
`84`		`- jumpStep(nodeFrom, nodeTo)`
`85`		`-}`
`86`		`-`
`87`	`81`	`/**`
`88`	`82`	* A utility class that is equivalent to `boolean` but does not require type joining.
`89`	`83`	`*/`