Merge pull request github#2064 from jbj/leapyear-extends-abstract

geoffw0 · web-flow · commit e465f4cc8182 · 2019-10-04T14:15:21.000+01:00
C++: Avoid `extends Operation` in LeapYear.qll
diff --git a/cpp/ql/src/Likely Bugs/Leap Year/LeapYear.qll b/cpp/ql/src/Likely Bugs/Leap Year/LeapYear.qll
@@ -30,7 +30,7 @@ private predicate additionalLogicalCheck(Expr e, string operation, int valueToCh
 /**
  * An `Operation` that seems to be checking for leap year.
  */
-class CheckForLeapYearOperation extends Operation {
+class CheckForLeapYearOperation extends Expr {
   CheckForLeapYearOperation() {
     exists(BinaryArithmeticOperation bo | bo = this |
       bo.getAnOperand().getValue().toInt() = 4 and
@@ -39,8 +39,6 @@ class CheckForLeapYearOperation extends Operation {
       additionalLogicalCheck(this.getEnclosingElement(), "%", 400)
     )
   }
-
-  override string getOperator() { result = "LeapYearCheck" }
 }
 
 /**

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ private predicate additionalLogicalCheck(Expr e, string operation, int valueToCh`
`30`	`30`	`/**`
`31`	`31`	* An `Operation` that seems to be checking for leap year.
`32`	`32`	`*/`
`33`		`-class CheckForLeapYearOperation extends Operation {`
	`33`	`+class CheckForLeapYearOperation extends Expr {`
`34`	`34`	`CheckForLeapYearOperation() {`
`35`	`35`	`exists(BinaryArithmeticOperation bo \| bo = this \|`
`36`	`36`	`bo.getAnOperand().getValue().toInt() = 4 and`
`@@ -39,8 +39,6 @@ class CheckForLeapYearOperation extends Operation {`
`39`	`39`	`additionalLogicalCheck(this.getEnclosingElement(), "%", 400)`
`40`	`40`	`)`
`41`	`41`	`}`
`42`		`-`
`43`		`- override string getOperator() { result = "LeapYearCheck" }`
`44`	`42`	`}`
`45`	`43`
`46`	`44`	`/**`