C++/C#/JS/Python: Replace 'if p() then q() else none()' with a conjunction

cpp/ql/lib/semmle/code/cpp/Declaration.qll

@@ -275,9 +275,8 @@ class Declaration extends Locatable, @declaration {
    * `getTemplateArgumentKind(0)`.
    */
   final Locatable getTemplateArgumentKind(int index) {
-    if exists(getTemplateArgumentValue(index))
-    then result = getTemplateArgumentType(index)
-    else none()
+    exists(getTemplateArgumentValue(index)) and
+    result = getTemplateArgumentType(index)
   }
 
   /** Gets the number of template arguments for this declaration. */

cpp/ql/lib/semmle/code/cpp/controlflow/internal/ConstantExprs.qll

@@ -344,14 +344,13 @@ private int convertIntToType(int val, IntegralType t) {
   then if val = 0 then result = 0 else result = 1
   else
     if t.isUnsigned()
-    then if val >= 0 and val.bitShiftRight(t.getSize() * 8) = 0 then result = val else none()
+    then val >= 0 and val.bitShiftRight(t.getSize() * 8) = 0 and result = val
     else
       if val >= 0 and val.bitShiftRight(t.getSize() * 8 - 1) = 0
       then result = val
-      else
-        if (-(val + 1)).bitShiftRight(t.getSize() * 8 - 1) = 0
-        then result = val
-        else none()
+      else (
+        (-(val + 1)).bitShiftRight(t.getSize() * 8 - 1) = 0 and result = val
+      )
 }
 
 /**

cpp/ql/lib/semmle/code/cpp/ir/internal/IntegerInterval.qll

@@ -18,10 +18,11 @@ Overlap getOverlap(IntValue defStart, IntValue defEnd, IntValue useStart, IntVal
   else
     if isLE(defStart, useStart) and isGE(defEnd, useEnd)
     then result instanceof MustTotallyOverlap
-    else
-      if isLE(defEnd, useStart) or isGE(defStart, useEnd)
-      then none()
-      else result instanceof MayPartiallyOverlap
+    else (
+      not isLE(defEnd, useStart) and
+      not isGE(defStart, useEnd) and
+      result instanceof MayPartiallyOverlap
+    )
 }
 
 /**

cpp/ql/lib/semmle/code/cpp/security/BufferWrite.qll

@@ -365,7 +365,7 @@ class GetsBW extends BufferWriteCall {
   /**
    * Gets the index of the parameter that is the maximum number of characters to be read.
    */
-  int getParamSize() { if exists(getArgument(1)) then result = 1 else none() }
+  int getParamSize() { exists(getArgument(1)) and result = 1 }
 
   override Type getBufferType() { result = this.getTarget().getParameter(0).getUnspecifiedType() }
 

cpp/ql/src/Likely Bugs/Arithmetic/PointlessComparison.ql

@@ -50,10 +50,7 @@ where
     // If either of the operands is constant, then don't include it.
     (
       if cmp.getLeftOperand().isConstant()
-      then
-        if cmp.getRightOperand().isConstant()
-        then none() // Both operands are constant so don't create a message.
-        else reason = rightReason
+      then not cmp.getRightOperand().isConstant() and reason = rightReason
       else
         if cmp.getRightOperand().isConstant()
         then reason = leftReason

cpp/ql/src/Security/CWE/CWE-468/IncorrectPointerScalingCommon.qll

@@ -121,16 +121,14 @@ predicate exprSourceType(Expr use, Type sourceType, Location sourceLoc) {
           else
             if use instanceof CrementOperation
             then exprSourceType(use.(CrementOperation).getOperand(), sourceType, sourceLoc)
-            else
+            else (
               // Conversions are not in the AST, so ignore them.
-              if use instanceof Conversion
-              then none()
-              else (
-                // Source expressions
-                sourceType = use.getUnspecifiedType() and
-                isPointerType(sourceType) and
-                sourceLoc = use.getLocation()
-              )
+              not use instanceof Conversion and
+              // Source expressions
+              sourceType = use.getUnspecifiedType() and
+              isPointerType(sourceType) and
+              sourceLoc = use.getLocation()
+            )
 }
 
 /**

csharp/ql/src/experimental/ir/internal/IntegerInterval.qll

@@ -18,10 +18,11 @@ Overlap getOverlap(IntValue defStart, IntValue defEnd, IntValue useStart, IntVal
   else
     if isLE(defStart, useStart) and isGE(defEnd, useEnd)
     then result instanceof MustTotallyOverlap
-    else
-      if isLE(defEnd, useStart) or isGE(defStart, useEnd)
-      then none()
-      else result instanceof MayPartiallyOverlap
+    else (
+      not isLE(defEnd, useStart) and
+      not isGE(defStart, useEnd) and
+      result instanceof MayPartiallyOverlap
+    )
 }
 
 /**

csharp/ql/src/experimental/ir/rangeanalysis/RangeUtils.qll

@@ -52,10 +52,7 @@ IntValue getArrayDim(Variable arr) {
     arr.getInitializer() = ac and
     if exists(ac.getLengthArgument(0))
     then result = ac.getLengthArgument(0).getValue().toInt()
-    else
-      if exists(ac.getInitializer())
-      then result = ac.getInitializer().getNumberOfElements()
-      else none()
+    else result = ac.getInitializer().getNumberOfElements()
   )
 }
 

javascript/ql/lib/semmle/javascript/RangeAnalysis.qll

@@ -236,10 +236,9 @@ module RangeAnalysis {
   ) {
     if exists(r.getImmediatePredecessor())
     then linearDefinitionSum(r.getImmediatePredecessor(), xroot, xsign, yroot, ysign, bias)
-    else
-      if exists(r.asExpr().getIntValue())
-      then none() // do not model constants as sums
-      else (
+    else (
+      not exists(r.asExpr().getIntValue()) and // do not model constants as sums
+      (
         exists(AddExpr add, int bias1, int bias2 | r.asExpr() = add |
           // r = r1 + r2
           linearDefinition(add.getLeftOperand().flow(), xroot, xsign, bias1) and
@@ -257,6 +256,7 @@ module RangeAnalysis {
         linearDefinitionSum(r.asExpr().(NegExpr).getOperand().flow(), xroot, -xsign, yroot, -ysign,
           -bias)
       )
+    )
   }
 
   /**

python/ql/src/Functions/SignatureSpecialMethods.ql

@@ -132,12 +132,12 @@ predicate incorrect_special_method_defn(
     else
       if required < func.minParameters()
       then message = "Too many parameters" and show_counts = true
-      else
-        if func.minParameters() < required and not func.getScope().hasVarArg()
-        then
-          message = (required - func.minParameters()) + " default values(s) will never be used" and
-          show_counts = false
-        else none()
+      else (
+        func.minParameters() < required and
+        not func.getScope().hasVarArg() and
+        message = (required - func.minParameters()) + " default values(s) will never be used" and
+        show_counts = false
+      )
   )
 }