use set literals instead of big disjunctions

Author: erik-krogh

java/ql/lib/semmle/code/java/frameworks/struts/StrutsConventions.qll

@@ -101,12 +101,7 @@ class Struts2ConventionActionClass extends Class {
     exists(string ancestorPackage |
       // Has an ancestor package on the whitelist
       ancestorPackage = this.getPackage().getName().splitAt(".") and
-      (
-        ancestorPackage = "struts" or
-        ancestorPackage = "struts2" or
-        ancestorPackage = "action" or
-        ancestorPackage = "actions"
-      )
+      ancestorPackage = ["struts", "struts2", "action", "actions"]
     ) and
     (
       this.getName().matches("%" + getConventionSuffix(this)) or

java/ql/src/Likely Bugs/Comparison/UselessComparisonTest.qll

@@ -7,12 +7,7 @@ import semmle.code.java.dataflow.SSA
  * The kind of bound that is known to hold for some variable.
  */
 library class BoundKind extends string {
-  BoundKind() {
-    this = "=" or
-    this = "!=" or
-    this = ">=" or
-    this = "<="
-  }
+  BoundKind() { this = ["=", "!=", ">=", "<="] }
 
   predicate isEqual() { this = "=" }
 

python/ql/lib/semmle/python/web/cherrypy/Request.qll

@@ -15,12 +15,7 @@ class CherryPyRequest extends TaintKind {
   }
 
   override TaintKind getTaintOfMethodResult(string name) {
-    (
-      name = "getHeader" or
-      name = "getCookie" or
-      name = "getUser" or
-      name = "getPassword"
-    ) and
+    name in ["getHeader", "getCookie", "getUser", "getPassword"] and
     result instanceof ExternalStringKind
   }
 }

python/ql/lib/semmle/python/web/flask/Request.qll

@@ -16,10 +16,7 @@ class FlaskRequestData extends HttpRequestTaintSource {
   FlaskRequestData() {
     not this instanceof FlaskRequestArgs and
     exists(string name | flask_request_attr(this, name) |
-      name = "path" or
-      name = "full_path" or
-      name = "base_url" or
-      name = "url"
+      name in ["path", "full_path", "base_url", "url"]
     )
   }
 

python/ql/lib/semmle/python/web/tornado/Request.qll

@@ -41,10 +41,7 @@ class TornadoRequestSource extends HttpRequestTaintSource {
 class TornadoExternalInputSource extends HttpRequestTaintSource {
   TornadoExternalInputSource() {
     exists(string name |
-      name = "get_argument" or
-      name = "get_query_argument" or
-      name = "get_body_argument" or
-      name = "decode_argument"
+      name in ["get_argument", "get_query_argument", "get_body_argument", "decode_argument"]
     |
       this = callToNamedTornadoRequestHandlerMethod(name)
     )

python/ql/lib/semmle/python/web/twisted/Request.qll

@@ -16,12 +16,7 @@ class TwistedRequest extends TaintKind {
   }
 
   override TaintKind getTaintOfMethodResult(string name) {
-    (
-      name = "getHeader" or
-      name = "getCookie" or
-      name = "getUser" or
-      name = "getPassword"
-    ) and
+    name in ["getHeader", "getCookie", "getUser", "getPassword"] and
     result instanceof ExternalStringKind
   }
 }

python/ql/src/Expressions/Formatting/AdvancedFormatting.qll

@@ -40,9 +40,7 @@ library class PossibleAdvancedFormatString extends StrConst {
 
   private predicate implicitlyNumberedField(int start, int end) {
     this.field(start, end) and
-    exists(string c | start + 1 = this.getText().indexOf(c) |
-      c = "}" or c = ":" or c = "!" or c = "."
-    )
+    exists(string c | start + 1 = this.getText().indexOf(c) | c in ["}", ":", "!", "."])
   }
 
   /** Whether this format string has implicitly numbered fields */

python/ql/src/Expressions/Regex/DuplicateCharacterInSet.ql

@@ -32,7 +32,7 @@ predicate duplicate_char_in_class(Regex r, string char) {
   //Ignore whitespace in verbose mode
   not (
     r.getAMode() = "VERBOSE" and
-    (char = " " or char = "\t" or char = "\r" or char = "\n")
+    char in [" ", "\t", "\r", "\n"]
   )
 }
 

python/ql/src/Statements/ModificationOfLocals.ql

@@ -22,10 +22,7 @@ predicate modification_of_locals(ControlFlowNode f) {
     attr = f.(CallNode).getFunction() and
     originIsLocals(attr.getObject(mname))
   |
-    mname = "pop" or
-    mname = "popitem" or
-    mname = "update" or
-    mname = "clear"
+    mname in ["pop", "popitem", "update", "clear"]
   )
 }
 

python/ql/test/library-tests/PointsTo/api/Constants.ql

@@ -7,7 +7,7 @@ where
     or
     txt = "b'" + s + "'" and val = Value::forBytes(s)
   |
-    s = "a" or s = "b" or s = "c" or s = "d"
+    s in ["a", "b", "c", "d"]
   )
   or
   exists(int i | txt = i.toString() and val = Value::forInt(i) |