wip

Author: hvitved

csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowImplSpecific.qll

@@ -7,27 +7,7 @@ private import codeql.dataflow.DataFlow
 
 module Private {
   import DataFlowPrivate
-  private import DataFlowDispatch as DataFlowDispatch
-
-  class DataFlowCall = DataFlowDispatch::DataFlowCall;
-
-  class DataFlowCallable = DataFlowDispatch::DataFlowCallable;
-
-  predicate viableCallable = DataFlowDispatch::viableCallable/1;
-
-  class ReturnKind = DataFlowDispatch::ReturnKind;
-
-  class ParameterPosition = DataFlowDispatch::ParameterPosition;
-
-  class ArgumentPosition = DataFlowDispatch::ArgumentPosition;
-
-  predicate parameterMatch = DataFlowDispatch::parameterMatch/2;
-
-  predicate mayBenefitFromCallContext = DataFlowDispatch::mayBenefitFromCallContext/1;
-
-  predicate viableImplInCallContext = DataFlowDispatch::viableImplInCallContext/2;
-
-  predicate getAnOutNode = DataFlowDispatch::getAnOutNode/2;
+  import DataFlowDispatch
 }
 
 module Public {

ruby/ql/lib/codeql/ruby/dataflow/internal/DataFlowImplSpecific.qll

@@ -7,27 +7,7 @@ private import codeql.dataflow.DataFlow
 
 module Private {
   import DataFlowPrivate
-  private import DataFlowDispatch as DataFlowDispatch
-
-  class DataFlowCall = DataFlowDispatch::DataFlowCall;
-
-  class DataFlowCallable = DataFlowDispatch::DataFlowCallable;
-
-  predicate viableCallable = DataFlowDispatch::viableCallable/1;
-
-  class ReturnKind = DataFlowDispatch::ReturnKind;
-
-  class ParameterPosition = DataFlowDispatch::ParameterPosition;
-
-  class ArgumentPosition = DataFlowDispatch::ArgumentPosition;
-
-  predicate parameterMatch = DataFlowDispatch::parameterMatch/2;
-
-  predicate mayBenefitFromCallContext = DataFlowDispatch::mayBenefitFromCallContext/1;
-
-  predicate viableImplInCallContext = DataFlowDispatch::viableImplInCallContext/2;
-
-  predicate getAnOutNode = DataFlowDispatch::getAnOutNode/2;
+  import DataFlowDispatch
 }
 
 module Public {

ruby/ql/lib/codeql/ruby/dataflow/internal/FlowSummaryImpl.qll

@@ -6,7 +6,6 @@ private import codeql.dataflow.internal.FlowSummaryImpl
 private import codeql.dataflow.internal.AccessPathSyntax as AccessPath
 private import codeql.ruby.AST
 private import codeql.ruby.dataflow.internal.DataFlowImplSpecific as DataFlowImplSpecific
-private import codeql.ruby.dataflow.internal.DataFlowDispatch
 private import DataFlowImplSpecific::Private
 private import DataFlowImplSpecific::Public
 

shared/dataflow/codeql/dataflow/internal/DataFlowImplCommon.qll

@@ -928,9 +928,9 @@ module MakeImplCommon<LocationSig Location, InputSig<Location> Lang> {
   }
 
   final class ArgumentPositionEx extends TArgumentPositionEx {
-    ArgumentPosition asArgumentPosition() { this = TArgumentPosition(result) }
+    ArgumentPosition asArgumentPosition() { this = TNormalArgumentPosition(result) }
 
-    ReturnKindExt asReturnKind() { this = TArgumentPositionReverse(result) }
+    ReturnKindExt asReturnKind() { this = TReverseArgumentPosition(result) }
 
     string toString() {
       result = this.asArgumentPosition().toString()
@@ -940,9 +940,9 @@ module MakeImplCommon<LocationSig Location, InputSig<Location> Lang> {
   }
 
   final class ParameterPositionEx extends TParameterPositionEx {
-    ParameterPosition asParameterPosition() { this = TParameterPosition(result) }
+    ParameterPosition asParameterPosition() { this = TNormalParameterPosition(result) }
 
-    ReturnKindExt asReturnKind() { this = TParameterPositionReverse(result) }
+    ReturnKindExt asReturnKind() { this = TReverseParameterPosition(result) }
 
     string toString() {
       result = this.asParameterPosition().toString()
@@ -1029,13 +1029,13 @@ module MakeImplCommon<LocationSig Location, InputSig<Location> Lang> {
 
     cached
     newtype TArgumentPositionEx =
-      TArgumentPosition(ArgumentPosition pos) or
-      TArgumentPositionReverse(ReturnKindExt pos)
+      TNormalArgumentPosition(ArgumentPosition pos) or
+      TReverseArgumentPosition(ReturnKindExt pos)
 
     cached
     newtype TParameterPositionEx =
-      TParameterPosition(ParameterPosition pos) or
-      TParameterPositionReverse(ReturnKindExt pos)
+      TNormalParameterPosition(ParameterPosition pos) or
+      TReverseParameterPosition(ReturnKindExt pos)
 
     cached
     predicate parameterMatchEx(ParameterPositionEx ppos, ArgumentPositionEx apos) {

swift/ql/lib/codeql/swift/dataflow/internal/DataFlowImplSpecific.qll

@@ -8,23 +8,7 @@ private import swift as Swift
 
 module Private {
   import DataFlowPrivate
-  private import DataFlowDispatch as DataFlowDispatch
-
-  class DataFlowCall = DataFlowDispatch::DataFlowCall;
-
-  class DataFlowCallable = DataFlowDispatch::DataFlowCallable;
-
-  predicate viableCallable = DataFlowDispatch::viableCallable/1;
-
-  class ReturnKind = DataFlowDispatch::ReturnKind;
-
-  class ParameterPosition = DataFlowDispatch::ParameterPosition;
-
-  class ArgumentPosition = DataFlowDispatch::ArgumentPosition;
-
-  predicate parameterMatch = DataFlowDispatch::parameterMatch/2;
-
-  predicate getAnOutNode = DataFlowDispatch::getAnOutNode/2;
+  import DataFlowDispatch
 }
 
 module Public {

swift/ql/lib/codeql/swift/dataflow/internal/FlowSummaryImpl.qll

@@ -8,7 +8,6 @@ private import codeql.dataflow.internal.AccessPathSyntax as AccessPath
 private import DataFlowImplSpecific as DataFlowImplSpecific
 private import DataFlowImplSpecific::Private
 private import DataFlowImplSpecific::Public
-private import DataFlowDispatch
 private import codeql.swift.dataflow.ExternalFlow
 
 module Input implements InputSig<Location, DataFlowImplSpecific::SwiftDataFlow> {