Python: Modernise Statements/RedundantAssignment

RasmusWL · RasmusWL · commit b4ab0b55be30 · 2020-02-19T14:12:22.000+01:00
diff --git a/python/ql/src/Statements/RedundantAssignment.ql b/python/ql/src/Statements/RedundantAssignment.ql
@@ -57,11 +57,10 @@ predicate same_name(Name n1, Name n2) {
     not maybe_defined_in_outer_scope(n2)
 }
 
-ClassObject value_type(Attribute a) { a.getObject().refersTo(_, result, _) }
+ClassValue value_type(Attribute a) { a.getObject().pointsTo().getClass() = result }
 
 predicate is_property_access(Attribute a) {
-    // TODO: We need something to model PropertyObject in the Value API
-    value_type(a).lookupAttribute(a.getName()) instanceof PropertyObject
+    value_type(a).lookup(a.getName()) instanceof PropertyValue
 }
 
 predicate same_attribute(Attribute a1, Attribute a2) {

Original file line number	Diff line number	Diff line change
`@@ -57,11 +57,10 @@ predicate same_name(Name n1, Name n2) {`
`57`	`57`	`not maybe_defined_in_outer_scope(n2)`
`58`	`58`	`}`
`59`	`59`
`60`		`-ClassObject value_type(Attribute a) { a.getObject().refersTo(_, result, _) }`
	`60`	`+ClassValue value_type(Attribute a) { a.getObject().pointsTo().getClass() = result }`
`61`	`61`
`62`	`62`	`predicate is_property_access(Attribute a) {`
`63`		`- // TODO: We need something to model PropertyObject in the Value API`
`64`		`- value_type(a).lookupAttribute(a.getName()) instanceof PropertyObject`
	`63`	`+ value_type(a).lookup(a.getName()) instanceof PropertyValue`
`65`	`64`	`}`
`66`	`65`
`67`	`66`	`predicate same_attribute(Attribute a1, Attribute a2) {`