Rename ParenExpr.getExpression() to getExpr() for consistency with similar predicates in other classes.

ql/src/semmle/go/Expr.qll

@@ -314,12 +314,12 @@ class StructLit extends CompositeLit {
  */
 class ParenExpr extends @parenexpr, Expr {
   /** Gets the expression between parentheses. */
-  Expr getExpression() { result = getChildExpr(0) }
+  Expr getExpr() { result = getChildExpr(0) }
 
-  override Expr stripParens() { result = getExpression().stripParens() }
+  override Expr stripParens() { result = getExpr().stripParens() }
 
   override predicate isPlatformIndependentConstant() {
-    getExpression().isPlatformIndependentConstant()
+    getExpr().isPlatformIndependentConstant()
   }
 
   override string toString() { result = "(...)" }
@@ -388,7 +388,7 @@ class SliceExpr extends @sliceexpr, Expr {
  */
 class TypeAssertExpr extends @typeassertexpr, Expr {
   /** Gets the base expression whose type is being asserted. */
-  Expr getExpression() { result = getChildExpr(0) }
+  Expr getExpr() { result = getChildExpr(0) }
 
   /** Gets the expression representing the asserted type. */
   Expr getTypeExpr() { result = getChildExpr(1) }
@@ -396,7 +396,7 @@ class TypeAssertExpr extends @typeassertexpr, Expr {
   override predicate mayHaveOwnSideEffects() { any() }
 
   override predicate isPlatformIndependentConstant() {
-    getExpression().isPlatformIndependentConstant()
+    getExpr().isPlatformIndependentConstant()
   }
 
   override string toString() { result = "type assertion" }
@@ -1160,7 +1160,7 @@ private predicate isTypeExprBottomUp(Expr e) {
   e instanceof InterfaceTypeExpr or
   e instanceof MapTypeExpr or
   e instanceof ChanTypeExpr or
-  isTypeExprBottomUp(e.(ParenExpr).getExpression()) or
+  isTypeExprBottomUp(e.(ParenExpr).getExpr()) or
   isTypeExprBottomUp(e.(StarExpr).getBase()) or
   isTypeExprBottomUp(e.(Ellipsis).getOperand())
 }
@@ -1208,7 +1208,7 @@ private predicate isTypeExprTopDown(Expr e) {
   or
   e = any(SelectorExpr sel | isTypeExprTopDown(sel)).getBase()
   or
-  e = any(ParenExpr pe | isTypeExprTopDown(pe)).getExpression()
+  e = any(ParenExpr pe | isTypeExprTopDown(pe)).getExpr()
   or
   e = any(StarExpr se | isTypeExprTopDown(se)).getBase()
   or
@@ -1240,7 +1240,7 @@ class ReferenceExpr extends Expr {
     not this = any(MethodSpec md).getNameExpr() and
     not this = any(StructLit sl).getKey(_)
     or
-    this.(ParenExpr).getExpression() instanceof ReferenceExpr
+    this.(ParenExpr).getExpr() instanceof ReferenceExpr
     or
     this.(StarExpr).getBase() instanceof ReferenceExpr
     or
@@ -1282,7 +1282,7 @@ class ValueExpr extends Expr {
     this instanceof BasicLit or
     this instanceof FuncLit or
     this instanceof CompositeLit or
-    this.(ParenExpr).getExpression() instanceof ValueExpr or
+    this.(ParenExpr).getExpr() instanceof ValueExpr or
     this instanceof SliceExpr or
     this instanceof TypeAssertExpr or
     this instanceof CallOrConversionExpr or

ql/src/semmle/go/controlflow/ControlFlowGraph.qll

@@ -155,7 +155,7 @@ module ControlFlow {
     private predicate ensuresAux(Expr expr, boolean b) {
       expr = cond and b = outcome
       or
-      expr = any(ParenExpr par | ensuresAux(par, b)).getExpression()
+      expr = any(ParenExpr par | ensuresAux(par, b)).getExpr()
       or
       expr = any(NotExpr ne | ensuresAux(ne, b.booleanNot())).getOperand()
       or

ql/src/semmle/go/controlflow/ControlFlowGraphImpl.qll

@@ -29,7 +29,7 @@ private predicate isCondRoot(Expr e) {
 private predicate isCond(Expr e) {
   isCondRoot(e) or
   e = any(LogicalBinaryExpr lbe | isCond(lbe)).getRightOperand() or
-  e = any(ParenExpr par | isCond(par)).getExpression()
+  e = any(ParenExpr par | isCond(par)).getExpr()
 }
 
 /**
@@ -703,7 +703,7 @@ module CFG {
       or
       i = 0 and result = this.(LabeledStmt).getStmt()
       or
-      i = 0 and result = this.(ParenExpr).getExpression()
+      i = 0 and result = this.(ParenExpr).getExpr()
       or
       result = this.(PlainBlock).getStmt(i)
     }
@@ -1851,7 +1851,7 @@ module CFG {
       result = Panic()
     }
 
-    override ControlFlowTree getChildTree(int i) { i = 0 and result = getExpression() }
+    override ControlFlowTree getChildTree(int i) { i = 0 and result = getExpr() }
   }
 
   private class UnaryExprTree extends ControlFlowTree, UnaryExpr {

ql/src/semmle/go/controlflow/IR.qll

@@ -1486,7 +1486,7 @@ module IR {
    */
   Instruction evalExprInstruction(Expr e) {
     result = MkExprNode(e) or
-    result = evalExprInstruction(e.(ParenExpr).getExpression())
+    result = evalExprInstruction(e.(ParenExpr).getExpr())
   }
 
   /**

ql/src/semmle/go/dataflow/internal/DataFlowUtil.qll

@@ -735,7 +735,7 @@ predicate simpleLocalFlowStep(Node nodeFrom, Node nodeTo) {
   exists(Expr pred, Expr succ |
     succ.(LogicalBinaryExpr).getAnOperand() = pred or
     succ.(ConversionExpr).getOperand() = pred or
-    succ.(TypeAssertExpr).getExpression() = pred
+    succ.(TypeAssertExpr).getExpr() = pred
   |
     nodeFrom = exprNode(pred) and
     nodeTo = exprNode(succ)