Swift: give a clearer name to {Self,Super}RefExpr.getMethodDecl

d10c · d10c · commit 3da54ebc61e4 · 2022-12-19T17:33:13.000-05:00
diff --git a/swift/ql/lib/codeql/swift/elements/expr/SelfRefExpr.qll b/swift/ql/lib/codeql/swift/elements/expr/SelfRefExpr.qll
@@ -10,5 +10,5 @@ class SelfRefExpr extends DeclRefExpr {
 
   VarDecl getSelf() { result = this.getDecl() }
 
-  MethodDecl getMethodDecl() { result = methodDecl }
+  MethodDecl getDeclaringMethod() { result = methodDecl }
 }
diff --git a/swift/ql/lib/codeql/swift/elements/expr/SuperRefExpr.qll b/swift/ql/lib/codeql/swift/elements/expr/SuperRefExpr.qll
@@ -5,5 +5,5 @@ private import codeql.swift.elements.decl.MethodDecl
 class SuperRefExpr extends Generated::SuperRefExpr {
   override string toString() { result = "super" }
 
-  MethodDecl getMethodDecl() { this.getSelf() = result.getSelfParam() }
+  MethodDecl getDeclaringMethod() { this.getSelf() = result.getSelfParam() }
 }

Original file line number	Diff line number	Diff line change
`@@ -10,5 +10,5 @@ class SelfRefExpr extends DeclRefExpr {`
`10`	`10`
`11`	`11`	`VarDecl getSelf() { result = this.getDecl() }`
`12`	`12`
`13`		`- MethodDecl getMethodDecl() { result = methodDecl }`
	`13`	`+ MethodDecl getDeclaringMethod() { result = methodDecl }`
`14`	`14`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,5 +5,5 @@ private import codeql.swift.elements.decl.MethodDecl`
`5`	`5`	`class SuperRefExpr extends Generated::SuperRefExpr {`
`6`	`6`	`override string toString() { result = "super" }`
`7`	`7`
`8`		`- MethodDecl getMethodDecl() { this.getSelf() = result.getSelfParam() }`
	`8`	`+ MethodDecl getDeclaringMethod() { this.getSelf() = result.getSelfParam() }`
`9`	`9`	`}`