Python: Modernizes query

This commit is contained in:
Rebecca Valentine
2020-03-04 17:10:32 -08:00
parent 02ae0fbda6
commit b09ab67e75

View File

@@ -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()