Merge pull request github#3737 from Marcono1234/patch-1

aschackmull · web-flow · commit 71665a02fa75 · 2020-06-22T10:46:00.000+02:00
Simplify NoAssignInBooleanExprs.ql
diff --git a/java/ql/src/Likely Bugs/Comparison/NoAssignInBooleanExprs.ql b/java/ql/src/Likely Bugs/Comparison/NoAssignInBooleanExprs.ql
@@ -17,10 +17,7 @@ import semmle.code.java.Statement
 /** An expression that is used as a condition. */
 class BooleanExpr extends Expr {
   BooleanExpr() {
-    exists(IfStmt s | s.getCondition() = this) or
-    exists(ForStmt s | s.getCondition() = this) or
-    exists(WhileStmt s | s.getCondition() = this) or
-    exists(DoStmt s | s.getCondition() = this) or
+    exists(ConditionalStmt s | s.getCondition() = this) or
     exists(ConditionalExpr s | s.getCondition() = this)
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -17,10 +17,7 @@ import semmle.code.java.Statement`
`17`	`17`	`/** An expression that is used as a condition. */`
`18`	`18`	`class BooleanExpr extends Expr {`
`19`	`19`	`BooleanExpr() {`
`20`		`- exists(IfStmt s \| s.getCondition() = this) or`
`21`		`- exists(ForStmt s \| s.getCondition() = this) or`
`22`		`- exists(WhileStmt s \| s.getCondition() = this) or`
`23`		`- exists(DoStmt s \| s.getCondition() = this) or`
	`20`	`+ exists(ConditionalStmt s \| s.getCondition() = this) or`
`24`	`21`	`exists(ConditionalExpr s \| s.getCondition() = this)`
`25`	`22`	`}`
`26`	`23`	`}`