From 5571f1eac762fbf5fd9833b7d319db43ab64fcbc Mon Sep 17 00:00:00 2001
From: Max Schaefer <max@semmle.com>
Date: Fri, 7 Feb 2020 16:24:35 +0000
Subject: [PATCH] Rename `Comparison` to `ComparisonExpr`.

---
 ql/src/InconsistentCode/WhitespaceContradictsPrecedence.ql | 4 ++--
 ql/src/RedundantCode/CompareIdenticalValues.ql             | 2 +-
 ql/src/RedundantCode/NegativeLengthCheck.ql                | 2 +-
 ql/src/semmle/go/Expr.qll                                  | 6 +++---
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/ql/src/InconsistentCode/WhitespaceContradictsPrecedence.ql b/ql/src/InconsistentCode/WhitespaceContradictsPrecedence.ql
index c2d2f80a6b6..7dde89c445f 100644
--- a/ql/src/InconsistentCode/WhitespaceContradictsPrecedence.ql
+++ b/ql/src/InconsistentCode/WhitespaceContradictsPrecedence.ql
@@ -51,10 +51,10 @@ class AssocNestedExpr extends BinaryExpr {
 class HarmlessNestedExpr extends BinaryExpr {
   HarmlessNestedExpr() {
     exists(BinaryExpr parent | this = parent.getAChildExpr() |
-      parent instanceof Comparison and
+      parent instanceof ComparisonExpr and
       (this instanceof ArithmeticExpr or this instanceof ShiftExpr)
       or
-      parent instanceof LogicalExpr and this instanceof Comparison
+      parent instanceof LogicalExpr and this instanceof ComparisonExpr
     )
   }
 }
diff --git a/ql/src/RedundantCode/CompareIdenticalValues.ql b/ql/src/RedundantCode/CompareIdenticalValues.ql
index 5ce12c4f395..4f63b222018 100644
--- a/ql/src/RedundantCode/CompareIdenticalValues.ql
+++ b/ql/src/RedundantCode/CompareIdenticalValues.ql
@@ -13,7 +13,7 @@
 
 import go
 
-from Comparison cmp, Expr l
+from ComparisonExpr cmp, Expr l
 where
   l = cmp.getLeftOperand() and
   l.getGlobalValueNumber() = cmp.getRightOperand().getGlobalValueNumber() and
diff --git a/ql/src/RedundantCode/NegativeLengthCheck.ql b/ql/src/RedundantCode/NegativeLengthCheck.ql
index c199d09fbc8..90d4b96f495 100644
--- a/ql/src/RedundantCode/NegativeLengthCheck.ql
+++ b/ql/src/RedundantCode/NegativeLengthCheck.ql
@@ -11,7 +11,7 @@
 
 import go
 
-from Comparison cmp, BuiltinFunction len, int ub, string r
+from ComparisonExpr cmp, BuiltinFunction len, int ub, string r
 where
   (len = Builtin::len() or len = Builtin::cap()) and
   (
diff --git a/ql/src/semmle/go/Expr.qll b/ql/src/semmle/go/Expr.qll
index 18a53eca034..2ccd8f8f565 100644
--- a/ql/src/semmle/go/Expr.qll
+++ b/ql/src/semmle/go/Expr.qll
@@ -800,12 +800,12 @@ class ShiftExpr extends @shiftexpr, BitwiseBinaryExpr { }
 /**
  * A comparison expression, that is, `==`, `!=`, `<`, `<=`, `>=` or `>`.
  */
-class Comparison extends @comparison, BinaryExpr { }
+class ComparisonExpr extends @comparison, BinaryExpr { }
 
 /**
  * An equality test, that is, `==` or `!=`.
  */
-class EqualityTestExpr extends @equalitytest, Comparison {
+class EqualityTestExpr extends @equalitytest, ComparisonExpr {
   /** Gets the polarity of this equality test, that is, `true` for `==` and `false` for `!=`. */
   boolean getPolarity() { none() }
 }
@@ -813,7 +813,7 @@ class EqualityTestExpr extends @equalitytest, Comparison {
 /**
  * A relational comparison, that is, `<`, `<=`, `>=` or `>`.
  */
-class RelationalComparisonExpr extends @relationalcomparison, Comparison {
+class RelationalComparisonExpr extends @relationalcomparison, ComparisonExpr {
   /** Holds if this comparison is strict, that is, it implies inequality. */
   predicate isStrict() { none() }