Python: Modernizes query

BekaValentine · BekaValentine · commit b09ab67e7526 · 2020-03-04T17:10:32.000-08:00
diff --git a/python/ql/src/Exceptions/IncorrectExceptOrder.ql b/python/ql/src/Exceptions/IncorrectExceptOrder.ql
@@ -14,7 +14,7 @@
 
 import python
 
-predicate incorrect_except_order(ExceptStmt ex1, ClassObject cls1, ExceptStmt ex2, ClassObject cls2) {
+predicate incorrect_except_order(ExceptStmt ex1, ClassValue cls1, ExceptStmt ex2, ClassValue cls2) {
    exists(int i, int j, Try t | 
        ex1 = t.getHandler(i) and
        ex2 = t.getHandler(j) and i < j and
@@ -24,11 +24,11 @@ predicate incorrect_except_order(ExceptStmt ex1, ClassObject cls1, ExceptStmt ex
    )
 }
 
-ClassObject except_class(ExceptStmt ex) {
-    ex.getType().refersTo(result)
+ClassValue except_class(ExceptStmt ex) {
+    ex.getType().pointsTo(result)
 }
 
-from ExceptStmt ex1, ClassObject cls1, ExceptStmt ex2, ClassObject cls2
+from ExceptStmt ex1, ClassValue cls1, ExceptStmt ex2, ClassValue cls2
 where incorrect_except_order(ex1, cls1, ex2, cls2)
 select ex2, "Except block for $@ is unreachable; the more general $@ for $@ will always be executed in preference.",
        cls2, cls2.getName(), ex1, "except block", cls1, cls1.getName()

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@`
`14`	`14`
`15`	`15`	`import python`
`16`	`16`
`17`		`-predicate incorrect_except_order(ExceptStmt ex1, ClassObject cls1, ExceptStmt ex2, ClassObject cls2) {`
	`17`	`+predicate incorrect_except_order(ExceptStmt ex1, ClassValue cls1, ExceptStmt ex2, ClassValue cls2) {`
`18`	`18`	`exists(int i, int j, Try t \|`
`19`	`19`	`ex1 = t.getHandler(i) and`
`20`	`20`	`ex2 = t.getHandler(j) and i < j and`
`@@ -24,11 +24,11 @@ predicate incorrect_except_order(ExceptStmt ex1, ClassObject cls1, ExceptStmt ex`
`24`	`24`	`)`
`25`	`25`	`}`
`26`	`26`
`27`		`-ClassObject except_class(ExceptStmt ex) {`
`28`		`- ex.getType().refersTo(result)`
	`27`	`+ClassValue except_class(ExceptStmt ex) {`
	`28`	`+ ex.getType().pointsTo(result)`
`29`	`29`	`}`
`30`	`30`
`31`		`-from ExceptStmt ex1, ClassObject cls1, ExceptStmt ex2, ClassObject cls2`
	`31`	`+from ExceptStmt ex1, ClassValue cls1, ExceptStmt ex2, ClassValue cls2`
`32`	`32`	`where incorrect_except_order(ex1, cls1, ex2, cls2)`
`33`	`33`	`select ex2, "Except block for $@ is unreachable; the more general $@ for $@ will always be executed in preference.",`
`34`	`34`	`cls2, cls2.getName(), ex1, "except block", cls1, cls1.getName()`