Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 47f5b04

Browse files
yoffyoff
committed
Python: fix identical-files.json after move
also more grouping
1 parent e192b66 commit 47f5b04

2 files changed

Lines changed: 24 additions & 23 deletions

File tree

‎config/identical-files.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,15 @@
1919
"csharp/ql/src/semmle/code/csharp/dataflow/internal/DataFlowImpl3.qll",
2020
"csharp/ql/src/semmle/code/csharp/dataflow/internal/DataFlowImpl4.qll",
2121
"csharp/ql/src/semmle/code/csharp/dataflow/internal/DataFlowImpl5.qll",
22-
"python/ql/src/semmle/code/python/dataflow/internal/DataFlowImpl.qll",
23-
"python/ql/src/semmle/code/python/dataflow/internal/DataFlowImpl2.qll"
22+
"python/ql/src/experimental/dataflow/internal/DataFlowImpl.qll",
23+
"python/ql/src/experimental/dataflow/internal/DataFlowImpl2.qll"
2424
],
2525
"DataFlow Java/C++/C#/Python Common": [
2626
"java/ql/src/semmle/code/java/dataflow/internal/DataFlowImplCommon.qll",
2727
"cpp/ql/src/semmle/code/cpp/dataflow/internal/DataFlowImplCommon.qll",
2828
"cpp/ql/src/semmle/code/cpp/ir/dataflow/internal/DataFlowImplCommon.qll",
2929
"csharp/ql/src/semmle/code/csharp/dataflow/internal/DataFlowImplCommon.qll",
30-
"python/ql/src/semmle/code/python/dataflow/internal/DataFlowImplCommon.qll"
30+
"python/ql/src/experimental/dataflow/internal/DataFlowImplCommon.qll"
3131
],
3232
"TaintTracking::Configuration Java/C++/C#/Python": [
3333
"cpp/ql/src/semmle/code/cpp/dataflow/internal/tainttracking1/TaintTrackingImpl.qll",
@@ -41,14 +41,14 @@
4141
"csharp/ql/src/semmle/code/csharp/dataflow/internal/tainttracking5/TaintTrackingImpl.qll",
4242
"java/ql/src/semmle/code/java/dataflow/internal/tainttracking1/TaintTrackingImpl.qll",
4343
"java/ql/src/semmle/code/java/dataflow/internal/tainttracking2/TaintTrackingImpl.qll",
44-
"python/ql/src/semmle/code/python/dataflow/internal/tainttracking1/TaintTrackingImpl.qll"
44+
"python/ql/src/experimental/dataflow/internal/tainttracking1/TaintTrackingImpl.qll"
4545
],
4646
"DataFlow Java/C++/C#/Python Consistency checks": [
4747
"java/ql/src/semmle/code/java/dataflow/internal/DataFlowImplConsistency.qll",
4848
"cpp/ql/src/semmle/code/cpp/dataflow/internal/DataFlowImplConsistency.qll",
4949
"cpp/ql/src/semmle/code/cpp/ir/dataflow/internal/DataFlowImplConsistency.qll",
5050
"csharp/ql/src/semmle/code/csharp/dataflow/internal/DataFlowImplConsistency.qll",
51-
"python/ql/src/semmle/code/python/dataflow/internal/DataFlowImplConsistency.qll"
51+
"python/ql/src/experimental/dataflow/internal/DataFlowImplConsistency.qll"
5252
],
5353
"C++ SubBasicBlocks": [
5454
"cpp/ql/src/semmle/code/cpp/controlflow/SubBasicBlocks.qll",

‎python/ql/src/experimental/dataflow/internal/DataFlowPrivate.qll‎

Lines changed: 19 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -9,22 +9,6 @@ private import DataFlowPublic
99
// Nodes
1010
//--------
1111

12-
class DataFlowCall extends CallNode {
13-
/** Gets the enclosing callable of this call. */
14-
abstract DataFlowCallable getEnclosingCallable();
15-
}
16-
17-
/** A data flow node that represents a call argument. */
18-
abstract class ArgumentNode extends Node {
19-
/** Holds if this argument occurs at the given position in the given call. */
20-
cached
21-
abstract predicate argumentOf(DataFlowCall call, int pos);
22-
23-
/** Gets the call in which this node is an argument. */
24-
final DataFlowCall getCall() { this.argumentOf(result, _) }
25-
}
26-
27-
2812
/**
2913
* A node associated with an object after an operation that might have
3014
* changed its state.
@@ -103,10 +87,27 @@ predicate simpleLocalFlowStep(Node nodeFrom, Node nodeTo) {
10387
// Global flow
10488
//--------
10589

106-
import semmle.python.pointsto.CallGraph
107-
90+
/** Represents a callable */
10891
class DataFlowCallable = FunctionObject;
10992

93+
/** Represents a call to a callable */
94+
class DataFlowCall extends CallNode {
95+
/** Gets the enclosing callable of this call. */
96+
abstract DataFlowCallable getEnclosingCallable();
97+
}
98+
99+
/** A data flow node that represents a call argument. */
100+
abstract class ArgumentNode extends Node {
101+
/** Holds if this argument occurs at the given position in the given call. */
102+
cached
103+
abstract predicate argumentOf(DataFlowCall call, int pos);
104+
105+
/** Gets the call in which this node is an argument. */
106+
final DataFlowCall getCall() { this.argumentOf(result, _) }
107+
}
108+
109+
import semmle.python.pointsto.CallGraph
110+
110111
/** Gets a viable run-time target for the call `call`. */
111112
DataFlowCallable viableCallable(DataFlowCall call) {
112113
exists(FunctionInvocation i |

0 commit comments

Comments
 (0)