C#: Use set literals in Splitting.qll

hvitved · hvitved · commit 06d42dac3e99 · 2020-12-14T09:58:54.000+01:00
diff --git a/csharp/ql/src/semmle/code/csharp/controlflow/internal/Splitting.qll b/csharp/ql/src/semmle/code/csharp/controlflow/internal/Splitting.qll
@@ -703,7 +703,7 @@ module FinallySplitting {
   }
 
   int getNextListOrder() {
-    result = max(int i | i = getListOrder(_) + 1 or i = AssertionSplitting::getNextListOrder())
+    result = max([getListOrder(_) + 1, AssertionSplitting::getNextListOrder()])
   }
 
   private class FinallySplitKind extends SplitKind, TFinallySplitKind {
@@ -1209,8 +1209,7 @@ module BooleanSplitting {
   }
 
   int getNextListOrder() {
-    result =
-      max(int i | i = getListOrder(_) + 1 or i = ExceptionHandlerSplitting::getNextListOrder())
+    result = max([getListOrder(_) + 1, ExceptionHandlerSplitting::getNextListOrder()])
   }
 
   private class BooleanSplitKind extends SplitKind, TBooleanSplitKind {
@@ -1433,7 +1432,7 @@ module LoopSplitting {
   }
 
   int getNextListOrder() {
-    result = max(int i | i = getListOrder(_) + 1 or i = BooleanSplitting::getNextListOrder())
+    result = max([getListOrder(_) + 1, BooleanSplitting::getNextListOrder()])
   }
 
   private class LoopSplitKind extends SplitKind, TLoopSplitKind {

Original file line number	Diff line number	Diff line change
`@@ -703,7 +703,7 @@ module FinallySplitting {`
`703`	`703`	`}`
`704`	`704`
`705`	`705`	`int getNextListOrder() {`
`706`		`- result = max(int i \| i = getListOrder(_) + 1 or i = AssertionSplitting::getNextListOrder())`
	`706`	`+ result = max([getListOrder(_) + 1, AssertionSplitting::getNextListOrder()])`
`707`	`707`	`}`
`708`	`708`
`709`	`709`	`private class FinallySplitKind extends SplitKind, TFinallySplitKind {`
`@@ -1209,8 +1209,7 @@ module BooleanSplitting {`
`1209`	`1209`	`}`
`1210`	`1210`
`1211`	`1211`	`int getNextListOrder() {`
`1212`		`- result =`
`1213`		`- max(int i \| i = getListOrder(_) + 1 or i = ExceptionHandlerSplitting::getNextListOrder())`
	`1212`	`+ result = max([getListOrder(_) + 1, ExceptionHandlerSplitting::getNextListOrder()])`
`1214`	`1213`	`}`
`1215`	`1214`
`1216`	`1215`	`private class BooleanSplitKind extends SplitKind, TBooleanSplitKind {`
`@@ -1433,7 +1432,7 @@ module LoopSplitting {`
`1433`	`1432`	`}`
`1434`	`1433`
`1435`	`1434`	`int getNextListOrder() {`
`1436`		`- result = max(int i \| i = getListOrder(_) + 1 or i = BooleanSplitting::getNextListOrder())`
	`1435`	`+ result = max([getListOrder(_) + 1, BooleanSplitting::getNextListOrder()])`
`1437`	`1436`	`}`
`1438`	`1437`
`1439`	`1438`	`private class LoopSplitKind extends SplitKind, TLoopSplitKind {`