Rename super_() to superType() for better consistency.

markshannon · markshannon · commit 92d0aef6f48c · 2019-05-09T14:47:12.000+01:00
diff --git a/python/ql/src/semmle/python/objects/Instances.qll b/python/ql/src/semmle/python/objects/Instances.qll
@@ -368,7 +368,7 @@ class SuperInstance extends TSuperInstance, ObjectInternal {
     override boolean isClass() { result = false }
 
     override ObjectInternal getClass() {
-        result = ObjectInternal::super_()
+        result = ObjectInternal::superType()
     }
 
     override boolean isComparable() { result = false }
diff --git a/python/ql/src/semmle/python/objects/ObjectInternal.qll b/python/ql/src/semmle/python/objects/ObjectInternal.qll
@@ -418,7 +418,7 @@ module ObjectInternal {
         result = TBuiltinClassObject(Builtin::special("property"))
     }
 
-    ObjectInternal super_() {
+    ObjectInternal superType() {
         result = TBuiltinClassObject(Builtin::special("super"))
     }
 
diff --git a/python/ql/src/semmle/python/objects/TObject.qll b/python/ql/src/semmle/python/objects/TObject.qll
@@ -121,7 +121,7 @@ newtype TObject =
     }
     or
     TUnknownInstance(BuiltinClassObjectInternal cls) {
-        cls != ObjectInternal::super_() and
+        cls != ObjectInternal::superType() and
         cls != ObjectInternal::builtin("bool") and
         cls != ObjectInternal::noneType()
     }
@@ -208,7 +208,7 @@ pragma [noinline]
 private predicate super_call2(CallNode call, ControlFlowNode arg0, ControlFlowNode arg1, PointsToContext context) {
     exists(ControlFlowNode func |
         call2(call, func, arg0, arg1) and
-        PointsToInternal::pointsTo(func, context, ObjectInternal::super_(), _)
+        PointsToInternal::pointsTo(func, context, ObjectInternal::superType(), _)
     )
 }
 
@@ -238,7 +238,7 @@ predicate method_binding(AttrNode instantiation, ObjectInternal self, CallableOb
         receiver(instantiation, context, obj, name) |
         exists(ObjectInternal cls |
             cls = obj.getClass() and
-            cls != ObjectInternal::super_() and
+            cls != ObjectInternal::superType() and
             cls.attribute(name, function, _) and
             self = obj
         )

Original file line number	Diff line number	Diff line change
`@@ -368,7 +368,7 @@ class SuperInstance extends TSuperInstance, ObjectInternal {`
`368`	`368`	`override boolean isClass() { result = false }`
`369`	`369`
`370`	`370`	`override ObjectInternal getClass() {`
`371`		`- result = ObjectInternal::super_()`
	`371`	`+ result = ObjectInternal::superType()`
`372`	`372`	`}`
`373`	`373`
`374`	`374`	`override boolean isComparable() { result = false }`
Original file line number	Diff line number	Diff line change
`@@ -418,7 +418,7 @@ module ObjectInternal {`
`418`	`418`	`result = TBuiltinClassObject(Builtin::special("property"))`
`419`	`419`	`}`
`420`	`420`
`421`		`- ObjectInternal super_() {`
	`421`	`+ ObjectInternal superType() {`
`422`	`422`	`result = TBuiltinClassObject(Builtin::special("super"))`
`423`	`423`	`}`
`424`	`424`
Original file line number	Diff line number	Diff line change
`@@ -121,7 +121,7 @@ newtype TObject =`
`121`	`121`	`}`
`122`	`122`	`or`
`123`	`123`	`TUnknownInstance(BuiltinClassObjectInternal cls) {`
`124`		`- cls != ObjectInternal::super_() and`
	`124`	`+ cls != ObjectInternal::superType() and`
`125`	`125`	`cls != ObjectInternal::builtin("bool") and`
`126`	`126`	`cls != ObjectInternal::noneType()`
`127`	`127`	`}`
`@@ -208,7 +208,7 @@ pragma [noinline]`
`208`	`208`	`private predicate super_call2(CallNode call, ControlFlowNode arg0, ControlFlowNode arg1, PointsToContext context) {`
`209`	`209`	`exists(ControlFlowNode func \|`
`210`	`210`	`call2(call, func, arg0, arg1) and`
`211`		`- PointsToInternal::pointsTo(func, context, ObjectInternal::super_(), _)`
	`211`	`+ PointsToInternal::pointsTo(func, context, ObjectInternal::superType(), _)`
`212`	`212`	`)`
`213`	`213`	`}`
`214`	`214`
`@@ -238,7 +238,7 @@ predicate method_binding(AttrNode instantiation, ObjectInternal self, CallableOb`
`238`	`238`	`receiver(instantiation, context, obj, name) \|`
`239`	`239`	`exists(ObjectInternal cls \|`
`240`	`240`	`cls = obj.getClass() and`
`241`		`- cls != ObjectInternal::super_() and`
	`241`	`+ cls != ObjectInternal::superType() and`
`242`	`242`	`cls.attribute(name, function, _) and`
`243`	`243`	`self = obj`
`244`	`244`	`)`