Merge pull request #1942 from RasmusWL/python-modernise-consistent-tuple-size

taus-semmle · web-flow · commit bbc98513c0ab · 2019-09-18T13:19:36.000+02:00
Python: Modernise the `py/mixed-tuple-returns` query.
diff --git a/python/ql/src/Functions/ReturnConsistentTupleSizes.ql b/python/ql/src/Functions/ReturnConsistentTupleSizes.ql
@@ -13,10 +13,10 @@
 import python
 
 predicate returns_tuple_of_size(Function func, int size, AstNode origin) {
-    exists(Return return, TupleObject val |
+    exists(Return return, TupleValue val |
         return.getScope() = func and
-        return.getValue().refersTo(val, origin) |
-        size = val.getLength()
+        return.getValue().pointsTo(val, origin) |
+        size = val.length()
     )
 }
 

Original file line number	Diff line number	Diff line change
`@@ -13,10 +13,10 @@`
`13`	`13`	`import python`
`14`	`14`
`15`	`15`	`predicate returns_tuple_of_size(Function func, int size, AstNode origin) {`
`16`		`- exists(Return return, TupleObject val \|`
	`16`	`+ exists(Return return, TupleValue val \|`
`17`	`17`	`return.getScope() = func and`
`18`		`- return.getValue().refersTo(val, origin) \|`
`19`		`- size = val.getLength()`
	`18`	`+ return.getValue().pointsTo(val, origin) \|`
	`19`	`+ size = val.length()`
`20`	`20`	`)`
`21`	`21`	`}`
`22`	`22`