Merge pull request #1846 from hvitved/csharp/autoformat

Approved by jbj

Author: semmle-qlci

cpp/ql/src/semmle/code/cpp/ir/implementation/EdgeKind.qll

@@ -1,12 +1,13 @@
 private import internal.EdgeKindInternal
 
 private newtype TEdgeKind =
-  TGotoEdge() or  // Single successor (including fall-through)
-  TTrueEdge() or  // 'true' edge of conditional branch
-  TFalseEdge() or  // 'false' edge of conditional branch
-  TExceptionEdge() or  // Thrown exception
-  TDefaultEdge() or  // 'default' label of switch
-  TCaseEdge(string minValue, string maxValue) {  // Case label of switch
+  TGotoEdge() or // Single successor (including fall-through)
+  TTrueEdge() or // 'true' edge of conditional branch
+  TFalseEdge() or // 'false' edge of conditional branch
+  TExceptionEdge() or // Thrown exception
+  TDefaultEdge() or // 'default' label of switch
+  TCaseEdge(string minValue, string maxValue) {
+    // Case label of switch
     Language::hasCaseEdge(minValue, maxValue)
   }
 
@@ -24,99 +25,71 @@ abstract class EdgeKind extends TEdgeKind {
  * or `IRBlock`.
  */
 class GotoEdge extends EdgeKind, TGotoEdge {
-  override final string toString() {
-    result = "Goto"
-  }
+  final override string toString() { result = "Goto" }
 }
 
-GotoEdge gotoEdge() {
-  result = TGotoEdge()
-}
+GotoEdge gotoEdge() { result = TGotoEdge() }
 
 /**
  * A "true" edge, representing the successor of a conditional branch when the
  * condition is non-zero.
  */
 class TrueEdge extends EdgeKind, TTrueEdge {
-  override final string toString() {
-    result = "True"
-  }
+  final override string toString() { result = "True" }
 }
 
-TrueEdge trueEdge() {
-  result = TTrueEdge()
-}
+TrueEdge trueEdge() { result = TTrueEdge() }
 
 /**
  * A "false" edge, representing the successor of a conditional branch when the
  * condition is zero.
  */
 class FalseEdge extends EdgeKind, TFalseEdge {
-  override final string toString() {
-    result = "False"
-  }
+  final override string toString() { result = "False" }
 }
 
-FalseEdge falseEdge() {
-  result = TFalseEdge()
-}
+FalseEdge falseEdge() { result = TFalseEdge() }
 
 /**
  * An "exception" edge, representing the successor of an instruction when that
  * instruction's evaluation throws an exception.
  */
 class ExceptionEdge extends EdgeKind, TExceptionEdge {
-  override final string toString() {
-    result = "Exception"
-  }
+  final override string toString() { result = "Exception" }
 }
 
-ExceptionEdge exceptionEdge() {
-  result = TExceptionEdge()
-}
+ExceptionEdge exceptionEdge() { result = TExceptionEdge() }
 
 /**
  * A "default" edge, representing the successor of a `Switch` instruction when
  * none of the case values matches the condition value.
  */
 class DefaultEdge extends EdgeKind, TDefaultEdge {
-  override final string toString() {
-    result = "Default"
-  }
+  final override string toString() { result = "Default" }
 }
 
-DefaultEdge defaultEdge() {
-  result = TDefaultEdge()
-}
+DefaultEdge defaultEdge() { result = TDefaultEdge() }
 
 /**
  * A "case" edge, representing the successor of a `Switch` instruction when the
  * the condition value matches a correponding `case` label.
  */
 class CaseEdge extends EdgeKind, TCaseEdge {
   string minValue;
+
   string maxValue;
 
-  CaseEdge() {
-    this = TCaseEdge(minValue, maxValue)
-  }
+  CaseEdge() { this = TCaseEdge(minValue, maxValue) }
 
-  override final string toString() {
-    if minValue = maxValue then
-      result = "Case[" + minValue + "]"
-    else
-      result = "Case[" + minValue + ".." + maxValue + "]"
+  final override string toString() {
+    if minValue = maxValue
+    then result = "Case[" + minValue + "]"
+    else result = "Case[" + minValue + ".." + maxValue + "]"
   }
 
-  string getMinValue() {
-    result = minValue
-  }
+  string getMinValue() { result = minValue }
 
-  string getMaxValue() {
-    result = maxValue
-  }
+  string getMaxValue() { result = maxValue }
 }
 
-CaseEdge caseEdge(string minValue, string maxValue) {
-  result = TCaseEdge(minValue, maxValue)
-}
+CaseEdge caseEdge(string minValue, string maxValue) { result = TCaseEdge(minValue, maxValue) }

cpp/ql/src/semmle/code/cpp/ir/implementation/MemoryAccessKind.qll

@@ -15,45 +15,33 @@ private newtype TMemoryAccessKind =
  * memory result.
  */
 class MemoryAccessKind extends TMemoryAccessKind {
-  string toString() {
-    none()
-  }
+  string toString() { none() }
 
   /**
    * Holds if the operand or result accesses memory pointed to by the `AddressOperand` on the
    * same instruction.
    */
-  predicate usesAddressOperand() {
-    none()
-  }
+  predicate usesAddressOperand() { none() }
 }
 
 /**
  * The operand or result accesses memory at the address specified by the `AddressOperand` on the
  * same instruction.
  */
 class IndirectMemoryAccess extends MemoryAccessKind, TIndirectMemoryAccess {
-  override string toString() {
-    result = "indirect"
-  }
-  
-  override final predicate usesAddressOperand() {
-    any()
-  }
+  override string toString() { result = "indirect" }
+
+  final override predicate usesAddressOperand() { any() }
 }
 
 /**
  * The operand or result may access some, all, or none of the memory at the address specified by the
  * `AddressOperand` on the same instruction.
  */
 class IndirectMayMemoryAccess extends MemoryAccessKind, TIndirectMayMemoryAccess {
-  override string toString() {
-    result = "indirect(may)"
-  }
+  override string toString() { result = "indirect(may)" }
 
-  override final predicate usesAddressOperand() {
-    any()
-  }
+  final override predicate usesAddressOperand() { any() }
 }
 
 /**
@@ -62,13 +50,9 @@ class IndirectMayMemoryAccess extends MemoryAccessKind, TIndirectMayMemoryAccess
  * `BufferSizeOperand`.
  */
 class BufferMemoryAccess extends MemoryAccessKind, TBufferMemoryAccess {
-  override string toString() {
-    result = "buffer"
-  }
+  override string toString() { result = "buffer" }
 
-  override final predicate usesAddressOperand() {
-    any()
-  }
+  final override predicate usesAddressOperand() { any() }
 }
 
 /**
@@ -77,69 +61,53 @@ class BufferMemoryAccess extends MemoryAccessKind, TBufferMemoryAccess {
  * elements given by the `BufferSizeOperand`.
  */
 class BufferMayMemoryAccess extends MemoryAccessKind, TBufferMayMemoryAccess {
-  override string toString() {
-    result = "buffer(may)"
-  }
+  override string toString() { result = "buffer(may)" }
 
-  override final predicate usesAddressOperand() {
-    any()
-  }
+  final override predicate usesAddressOperand() { any() }
 }
 
 /**
  * The operand or result accesses all memory whose address has escaped.
  */
 class EscapedMemoryAccess extends MemoryAccessKind, TEscapedMemoryAccess {
-  override string toString() {
-    result = "escaped"
-  }
+  override string toString() { result = "escaped" }
 }
 
 /**
  * The operand or result may access all memory whose address has escaped.
  */
 class EscapedMayMemoryAccess extends MemoryAccessKind, TEscapedMayMemoryAccess {
-  override string toString() {
-    result = "escaped(may)"
-  }
+  override string toString() { result = "escaped(may)" }
 }
 
 /**
  * The operand is a Phi operand, which accesses the same memory as its
  * definition.
  */
 class PhiMemoryAccess extends MemoryAccessKind, TPhiMemoryAccess {
-  override string toString() {
-    result = "phi"
-  }
+  override string toString() { result = "phi" }
 }
 
 /**
  * The operand is a ChiTotal operand, which accesses the same memory as its
  * definition.
  */
 class ChiTotalMemoryAccess extends MemoryAccessKind, TChiTotalMemoryAccess {
-  override string toString() {
-    result = "chi(total)"
-  }
+  override string toString() { result = "chi(total)" }
 }
 
 /**
  * The operand is a ChiPartial operand, which accesses the same memory as its
  * definition.
  */
 class ChiPartialMemoryAccess extends MemoryAccessKind, TChiPartialMemoryAccess {
-  override string toString() {
-    result = "chi(partial)"
-  }
+  override string toString() { result = "chi(partial)" }
 }
 
 /**
  * The operand accesses memory not modeled in SSA. Used only on the result of
  * `UnmodeledDefinition` and on the operands of `UnmodeledUse`.
  */
 class UnmodeledMemoryAccess extends MemoryAccessKind, TUnmodeledMemoryAccess {
-  override string toString() {
-    result = "unmodeled"
-  }
+  override string toString() { result = "unmodeled" }
 }