Skip to content

Commit ee42d08

Browse files
committed
Python: Rename target => callee
To use a standardised naming :)
1 parent d913d33 commit ee42d08

File tree

4 files changed

+21
-21
lines changed

4 files changed

+21
-21
lines changed

python/ql/src/meta/analysis-quality/CallGraphQuality.qll

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@ class RelevantCall extends Call {
1818
module PointsToBasedCallGraph {
1919
/** A call that can be resolved by points-to. */
2020
class ResolvableCall extends RelevantCall {
21-
Value target;
21+
Value callee;
2222

23-
ResolvableCall() { target.getACall() = this.getAFlowNode() }
23+
ResolvableCall() { callee.getACall() = this.getAFlowNode() }
2424

25-
/** Gets a resolved target of this call. */
26-
Value getTarget() { result = target }
25+
/** Gets a resolved callee of this call. */
26+
Value getCallee() { result = callee }
2727
}
2828

2929
/** A call that cannot be resolved by points-to. */
@@ -32,20 +32,20 @@ module PointsToBasedCallGraph {
3232
}
3333

3434
/**
35-
* A call that can be resolved by points-to, where the resolved target is relevant.
36-
* Relevant targets include:
35+
* A call that can be resolved by points-to, where the resolved callee is relevant.
36+
* Relevant callees include:
3737
* - builtins
3838
* - standard library
3939
* - source code of the project
4040
*/
41-
class ResolvableCallRelevantTarget extends ResolvableCall {
42-
ResolvableCallRelevantTarget() {
43-
target.isBuiltin()
41+
class ResolvableCallRelevantCallee extends ResolvableCall {
42+
ResolvableCallRelevantCallee() {
43+
callee.isBuiltin()
4444
or
4545
exists(File file |
46-
file = target.(CallableValue).getScope().getLocation().getFile()
46+
file = callee.(CallableValue).getScope().getLocation().getFile()
4747
or
48-
file = target.(ClassValue).getScope().getLocation().getFile()
48+
file = callee.(ClassValue).getScope().getLocation().getFile()
4949
|
5050
file.inStdlib()
5151
or
@@ -56,10 +56,10 @@ module PointsToBasedCallGraph {
5656
}
5757

5858
/**
59-
* A call that can be resolved by points-to, where the resolved target is not considered relevant.
60-
* See `ResolvableCallRelevantTarget` for the definition of relevance.
59+
* A call that can be resolved by points-to, where the resolved callee is not considered relevant.
60+
* See `ResolvableCallRelevantCallee` for the definition of relevance.
6161
*/
62-
class ResolvableCallIrrelevantTarget extends ResolvableCall {
63-
ResolvableCallIrrelevantTarget() { not this instanceof ResolvableCallRelevantTarget }
62+
class ResolvableCallIrrelevantCallee extends ResolvableCall {
63+
ResolvableCallIrrelevantCallee() { not this instanceof ResolvableCallRelevantCallee }
6464
}
6565
}

python/ql/src/meta/analysis-quality/PointsToResolvableCallRatio.ql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
22
* @name Ratio of resolvable call by points-to
3-
* @description The percentage of (relevant) calls that can be resolved to a target.
3+
* @description The percentage of (relevant) calls that can be resolved to a callee.
44
* @kind metric
55
* @metricType project
66
* @metricAggregate sum min max avg

python/ql/src/meta/analysis-quality/PointsToResolvableCalls.ql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
22
* @name Resolvable calls by points-to
3-
* @description The number of (relevant) calls that can be resolved to a target.
3+
* @description The number of (relevant) calls that can be resolved to a callee.
44
* @kind metric
55
* @metricType project
66
* @metricAggregate sum
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
/**
2-
* @name Resolvable calls by points-to, to relevant target
3-
* @description The number of (relevant) calls that could be resolved to a target that is relevant.
2+
* @name Resolvable calls by points-to, to relevant callee
3+
* @description The number of (relevant) calls that could be resolved to a callee that is relevant.
44
* @kind metric
55
* @metricType project
66
* @metricAggregate sum
77
* @tags meta
8-
* @id py/meta/points-to-resolvable-calls-relevant-target
8+
* @id py/meta/points-to-resolvable-calls-relevant-callee
99
*/
1010

1111
import python
1212
import CallGraphQuality
1313

14-
select projectRoot(), count(PointsToBasedCallGraph::ResolvableCallRelevantTarget call)
14+
select projectRoot(), count(PointsToBasedCallGraph::ResolvableCallRelevantCallee call)

0 commit comments

Comments
 (0)