Fix formatting

Dave Bartolomeo · Dave Bartolomeo · commit f32a7be8747c · 2020-10-15T10:16:13.000-04:00
diff --git a/cpp/ql/src/semmle/code/cpp/ir/implementation/aliased_ssa/Operand.qll b/cpp/ql/src/semmle/code/cpp/ir/implementation/aliased_ssa/Operand.qll
@@ -484,9 +484,7 @@ class PhiInputOperand extends MemoryOperand, PhiOperandBase {
     result = "from " + getPredecessorBlock().getDisplayIndex().toString() + ":"
   }
 
-  final override string getDumpId() {
-    result = getPredecessorBlock().getDisplayIndex().toString()
-  }
+  final override string getDumpId() { result = getPredecessorBlock().getDisplayIndex().toString() }
 
   /**
    * Gets the predecessor block from which this value comes.
diff --git a/cpp/ql/src/semmle/code/cpp/ir/implementation/aliased_ssa/PrintIR.qll b/cpp/ql/src/semmle/code/cpp/ir/implementation/aliased_ssa/PrintIR.qll
@@ -62,7 +62,12 @@ private string getAdditionalOperandProperty(Operand operand, string key) {
  * operand has no properties, this predicate has no result.
  */
 private string getOperandPropertyListString(Operand operand) {
-  result = strictconcat(string key, string value | value = getAdditionalOperandProperty(operand, key) | key + ":" + value, ", ")
+  result =
+    strictconcat(string key, string value |
+      value = getAdditionalOperandProperty(operand, key)
+    |
+      key + ":" + value, ", "
+    )
 }
 
 /**
@@ -247,7 +252,9 @@ private class PrintableInstruction extends PrintableIRNode, TPrintableInstructio
       concat(Operand operand |
         operand = instr.getAnOperand()
       |
-        operand.getDumpString() + getOperandPropertyString(operand), ", " order by operand.getDumpSortOrder()
+        operand.getDumpString() + getOperandPropertyString(operand), ", "
+        order by
+          operand.getDumpSortOrder()
       )
   }
 }
diff --git a/cpp/ql/src/semmle/code/cpp/ir/implementation/internal/OperandTag.qll b/cpp/ql/src/semmle/code/cpp/ir/implementation/internal/OperandTag.qll
@@ -40,9 +40,7 @@ abstract class OperandTag extends TOperandTag {
   /**
    * Gets a label that will appear before the operand when the IR is printed.
    */
-  final string getLabel() {
-    if alwaysPrintLabel() then result = getId() + ":" else result = ""
-  }
+  final string getLabel() { if alwaysPrintLabel() then result = getId() + ":" else result = "" }
 
   /**
    * Gets an identifier that uniquely identifies this operand within its instruction.
diff --git a/cpp/ql/src/semmle/code/cpp/ir/implementation/raw/Operand.qll b/cpp/ql/src/semmle/code/cpp/ir/implementation/raw/Operand.qll
@@ -484,9 +484,7 @@ class PhiInputOperand extends MemoryOperand, PhiOperandBase {
     result = "from " + getPredecessorBlock().getDisplayIndex().toString() + ":"
   }
 
-  final override string getDumpId() {
-    result = getPredecessorBlock().getDisplayIndex().toString()
-  }
+  final override string getDumpId() { result = getPredecessorBlock().getDisplayIndex().toString() }
 
   /**
    * Gets the predecessor block from which this value comes.
diff --git a/cpp/ql/src/semmle/code/cpp/ir/implementation/raw/PrintIR.qll b/cpp/ql/src/semmle/code/cpp/ir/implementation/raw/PrintIR.qll
@@ -62,7 +62,12 @@ private string getAdditionalOperandProperty(Operand operand, string key) {
  * operand has no properties, this predicate has no result.
  */
 private string getOperandPropertyListString(Operand operand) {
-  result = strictconcat(string key, string value | value = getAdditionalOperandProperty(operand, key) | key + ":" + value, ", ")
+  result =
+    strictconcat(string key, string value |
+      value = getAdditionalOperandProperty(operand, key)
+    |
+      key + ":" + value, ", "
+    )
 }
 
 /**
@@ -247,7 +252,9 @@ private class PrintableInstruction extends PrintableIRNode, TPrintableInstructio
       concat(Operand operand |
         operand = instr.getAnOperand()
       |
-        operand.getDumpString() + getOperandPropertyString(operand), ", " order by operand.getDumpSortOrder()
+        operand.getDumpString() + getOperandPropertyString(operand), ", "
+        order by
+          operand.getDumpSortOrder()
       )
   }
 }
diff --git a/cpp/ql/src/semmle/code/cpp/ir/implementation/unaliased_ssa/Operand.qll b/cpp/ql/src/semmle/code/cpp/ir/implementation/unaliased_ssa/Operand.qll
@@ -484,9 +484,7 @@ class PhiInputOperand extends MemoryOperand, PhiOperandBase {
     result = "from " + getPredecessorBlock().getDisplayIndex().toString() + ":"
   }
 
-  final override string getDumpId() {
-    result = getPredecessorBlock().getDisplayIndex().toString()
-  }
+  final override string getDumpId() { result = getPredecessorBlock().getDisplayIndex().toString() }
 
   /**
    * Gets the predecessor block from which this value comes.
diff --git a/cpp/ql/src/semmle/code/cpp/ir/implementation/unaliased_ssa/PrintIR.qll b/cpp/ql/src/semmle/code/cpp/ir/implementation/unaliased_ssa/PrintIR.qll
@@ -62,7 +62,12 @@ private string getAdditionalOperandProperty(Operand operand, string key) {
  * operand has no properties, this predicate has no result.
  */
 private string getOperandPropertyListString(Operand operand) {
-  result = strictconcat(string key, string value | value = getAdditionalOperandProperty(operand, key) | key + ":" + value, ", ")
+  result =
+    strictconcat(string key, string value |
+      value = getAdditionalOperandProperty(operand, key)
+    |
+      key + ":" + value, ", "
+    )
 }
 
 /**
@@ -247,7 +252,9 @@ private class PrintableInstruction extends PrintableIRNode, TPrintableInstructio
       concat(Operand operand |
         operand = instr.getAnOperand()
       |
-        operand.getDumpString() + getOperandPropertyString(operand), ", " order by operand.getDumpSortOrder()
+        operand.getDumpString() + getOperandPropertyString(operand), ", "
+        order by
+          operand.getDumpSortOrder()
       )
   }
 }
diff --git a/csharp/ql/src/experimental/ir/implementation/internal/OperandTag.qll b/csharp/ql/src/experimental/ir/implementation/internal/OperandTag.qll
@@ -40,9 +40,7 @@ abstract class OperandTag extends TOperandTag {
   /**
    * Gets a label that will appear before the operand when the IR is printed.
    */
-  final string getLabel() {
-    if alwaysPrintLabel() then result = getId() + ":" else result = ""
-  }
+  final string getLabel() { if alwaysPrintLabel() then result = getId() + ":" else result = "" }
 
   /**
    * Gets an identifier that uniquely identifies this operand within its instruction.
diff --git a/csharp/ql/src/experimental/ir/implementation/raw/Operand.qll b/csharp/ql/src/experimental/ir/implementation/raw/Operand.qll
@@ -484,9 +484,7 @@ class PhiInputOperand extends MemoryOperand, PhiOperandBase {
     result = "from " + getPredecessorBlock().getDisplayIndex().toString() + ":"
   }
 
-  final override string getDumpId() {
-    result = getPredecessorBlock().getDisplayIndex().toString()
-  }
+  final override string getDumpId() { result = getPredecessorBlock().getDisplayIndex().toString() }
 
   /**
    * Gets the predecessor block from which this value comes.
diff --git a/csharp/ql/src/experimental/ir/implementation/raw/PrintIR.qll b/csharp/ql/src/experimental/ir/implementation/raw/PrintIR.qll
@@ -62,7 +62,12 @@ private string getAdditionalOperandProperty(Operand operand, string key) {
  * operand has no properties, this predicate has no result.
  */
 private string getOperandPropertyListString(Operand operand) {
-  result = strictconcat(string key, string value | value = getAdditionalOperandProperty(operand, key) | key + ":" + value, ", ")
+  result =
+    strictconcat(string key, string value |
+      value = getAdditionalOperandProperty(operand, key)
+    |
+      key + ":" + value, ", "
+    )
 }
 
 /**
@@ -247,7 +252,9 @@ private class PrintableInstruction extends PrintableIRNode, TPrintableInstructio
       concat(Operand operand |
         operand = instr.getAnOperand()
       |
-        operand.getDumpString() + getOperandPropertyString(operand), ", " order by operand.getDumpSortOrder()
+        operand.getDumpString() + getOperandPropertyString(operand), ", "
+        order by
+          operand.getDumpSortOrder()
       )
   }
 }
diff --git a/csharp/ql/src/experimental/ir/implementation/unaliased_ssa/Operand.qll b/csharp/ql/src/experimental/ir/implementation/unaliased_ssa/Operand.qll
@@ -484,9 +484,7 @@ class PhiInputOperand extends MemoryOperand, PhiOperandBase {
     result = "from " + getPredecessorBlock().getDisplayIndex().toString() + ":"
   }
 
-  final override string getDumpId() {
-    result = getPredecessorBlock().getDisplayIndex().toString()
-  }
+  final override string getDumpId() { result = getPredecessorBlock().getDisplayIndex().toString() }
 
   /**
    * Gets the predecessor block from which this value comes.
diff --git a/csharp/ql/src/experimental/ir/implementation/unaliased_ssa/PrintIR.qll b/csharp/ql/src/experimental/ir/implementation/unaliased_ssa/PrintIR.qll
@@ -62,7 +62,12 @@ private string getAdditionalOperandProperty(Operand operand, string key) {
  * operand has no properties, this predicate has no result.
  */
 private string getOperandPropertyListString(Operand operand) {
-  result = strictconcat(string key, string value | value = getAdditionalOperandProperty(operand, key) | key + ":" + value, ", ")
+  result =
+    strictconcat(string key, string value |
+      value = getAdditionalOperandProperty(operand, key)
+    |
+      key + ":" + value, ", "
+    )
 }
 
 /**
@@ -247,7 +252,9 @@ private class PrintableInstruction extends PrintableIRNode, TPrintableInstructio
       concat(Operand operand |
         operand = instr.getAnOperand()
       |
-        operand.getDumpString() + getOperandPropertyString(operand), ", " order by operand.getDumpSortOrder()
+        operand.getDumpString() + getOperandPropertyString(operand), ", "
+        order by
+          operand.getDumpSortOrder()
       )
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -484,9 +484,7 @@ class PhiInputOperand extends MemoryOperand, PhiOperandBase {`
`484`	`484`	`result = "from " + getPredecessorBlock().getDisplayIndex().toString() + ":"`
`485`	`485`	`}`
`486`	`486`
`487`		`- final override string getDumpId() {`
`488`		`- result = getPredecessorBlock().getDisplayIndex().toString()`
`489`		`- }`
	`487`	`+ final override string getDumpId() { result = getPredecessorBlock().getDisplayIndex().toString() }`
`490`	`488`
`491`	`489`	`/**`
`492`	`490`	`* Gets the predecessor block from which this value comes.`
Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,12 @@ private string getAdditionalOperandProperty(Operand operand, string key) {`
`62`	`62`	`* operand has no properties, this predicate has no result.`
`63`	`63`	`*/`
`64`	`64`	`private string getOperandPropertyListString(Operand operand) {`
`65`		`- result = strictconcat(string key, string value \| value = getAdditionalOperandProperty(operand, key) \| key + ":" + value, ", ")`
	`65`	`+ result =`
	`66`	`+ strictconcat(string key, string value \|`
	`67`	`+ value = getAdditionalOperandProperty(operand, key)`
	`68`	`+ \|`
	`69`	`+ key + ":" + value, ", "`
	`70`	`+ )`
`66`	`71`	`}`
`67`	`72`
`68`	`73`	`/**`
`@@ -247,7 +252,9 @@ private class PrintableInstruction extends PrintableIRNode, TPrintableInstructio`
`247`	`252`	`concat(Operand operand \|`
`248`	`253`	`operand = instr.getAnOperand()`
`249`	`254`	`\|`
`250`		`- operand.getDumpString() + getOperandPropertyString(operand), ", " order by operand.getDumpSortOrder()`
	`255`	`+ operand.getDumpString() + getOperandPropertyString(operand), ", "`
	`256`	`+ order by`
	`257`	`+ operand.getDumpSortOrder()`
`251`	`258`	`)`
`252`	`259`	`}`
`253`	`260`	`}`