Python: Use unambiguous name getCallNode

RasmusWL · RasmusWL · commit a38fd2d3d173 · 2020-03-09T17:05:00.000+01:00
diff --git a/python/ql/src/semmle/python/objects/Descriptors.qll b/python/ql/src/semmle/python/objects/Descriptors.qll
@@ -20,7 +20,7 @@ class PropertyInternal extends ObjectInternal, TProperty {
         this = TProperty(_, _, result)
     }
 
-    private CallNode getCall() { this = TProperty(result, _, _) }
+    private CallNode getCallNode() { this = TProperty(result, _, _) }
 
     /** Gets the setter function of this property */
     CallableObjectInternal getSetter() {
@@ -33,7 +33,7 @@ class PropertyInternal extends ObjectInternal, TProperty {
         or
         // x = property(getter, setter, deleter)
         exists(ControlFlowNode setter_arg |
-            setter_arg = getCall().getArg(1) or setter_arg = getCall().getArgByName("fset")
+            setter_arg = getCallNode().getArg(1) or setter_arg = getCallNode().getArgByName("fset")
         |
             PointsToInternal::pointsTo(setter_arg, this.getContext(), result, _)
         )
@@ -49,7 +49,7 @@ class PropertyInternal extends ObjectInternal, TProperty {
         or
         // x = property(getter, setter, deleter)
         exists(ControlFlowNode deleter_arg |
-            deleter_arg = getCall().getArg(2) or deleter_arg = getCall().getArgByName("fdel")
+            deleter_arg = getCallNode().getArg(2) or deleter_arg = getCallNode().getArgByName("fdel")
         |
             PointsToInternal::pointsTo(deleter_arg, this.getContext(), result, _)
         )

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ class PropertyInternal extends ObjectInternal, TProperty {`
`20`	`20`	`this = TProperty(_, _, result)`
`21`	`21`	`}`
`22`	`22`
`23`		`- private CallNode getCall() { this = TProperty(result, _, _) }`
	`23`	`+ private CallNode getCallNode() { this = TProperty(result, _, _) }`
`24`	`24`
`25`	`25`	`/** Gets the setter function of this property */`
`26`	`26`	`CallableObjectInternal getSetter() {`
`@@ -33,7 +33,7 @@ class PropertyInternal extends ObjectInternal, TProperty {`
`33`	`33`	`or`
`34`	`34`	`// x = property(getter, setter, deleter)`
`35`	`35`	`exists(ControlFlowNode setter_arg \|`
`36`		`- setter_arg = getCall().getArg(1) or setter_arg = getCall().getArgByName("fset")`
	`36`	`+ setter_arg = getCallNode().getArg(1) or setter_arg = getCallNode().getArgByName("fset")`
`37`	`37`	`\|`
`38`	`38`	`PointsToInternal::pointsTo(setter_arg, this.getContext(), result, _)`
`39`	`39`	`)`
`@@ -49,7 +49,7 @@ class PropertyInternal extends ObjectInternal, TProperty {`
`49`	`49`	`or`
`50`	`50`	`// x = property(getter, setter, deleter)`
`51`	`51`	`exists(ControlFlowNode deleter_arg \|`
`52`		`- deleter_arg = getCall().getArg(2) or deleter_arg = getCall().getArgByName("fdel")`
	`52`	`+ deleter_arg = getCallNode().getArg(2) or deleter_arg = getCallNode().getArgByName("fdel")`
`53`	`53`	`\|`
`54`	`54`	`PointsToInternal::pointsTo(deleter_arg, this.getContext(), result, _)`
`55`	`55`	`)`