Skip to content

Commit 71fcd6a

Browse files
kfriedbergerkfriedberger
authored
Merge pull request #515 from sosy-lab/feat/immutable-lists
replace all usages of "List.of" with more readable "ImmutableList.of/copyOf"
2 parents d344e3a + 6c7ccb3 commit 71fcd6a

24 files changed

+55
-57
lines changed

‎src/org/sosy_lab/java_smt/api/BitvectorFormulaManager.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88

99
package org.sosy_lab.java_smt.api;
1010

11+
import com.google.common.collect.ImmutableList;
1112
import java.math.BigInteger;
1213
import java.util.List;
1314
import org.sosy_lab.java_smt.api.FormulaType.BitvectorType;
@@ -415,6 +416,6 @@ default BitvectorFormula extract(BitvectorFormula number, int msb, int lsb, bool
415416
BooleanFormula distinct(List<BitvectorFormula> pBits);
416417

417418
default BooleanFormula distinct(BitvectorFormula... pBits) {
418-
return distinct(List.of(pBits));
419+
return distinct(ImmutableList.copyOf(pBits));
419420
}
420421
}

‎src/org/sosy_lab/java_smt/api/BooleanFormulaManager.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88

99
package org.sosy_lab.java_smt.api;
1010

11+
import com.google.common.collect.ImmutableList;
1112
import com.google.errorprone.annotations.CanIgnoreReturnValue;
1213
import java.util.Collection;
13-
import java.util.List;
1414
import java.util.Set;
1515
import java.util.stream.Collector;
1616
import org.sosy_lab.java_smt.api.visitors.BooleanFormulaTransformationVisitor;
@@ -113,7 +113,7 @@ default BooleanFormula makeBoolean(boolean value) {
113113
* @see #and(BooleanFormula, BooleanFormula)
114114
*/
115115
default BooleanFormula and(BooleanFormula... bits) {
116-
return and(List.of(bits));
116+
return and(ImmutableList.copyOf(bits));
117117
}
118118

119119
/** Return a stream {@link Collector} that creates a conjunction of all elements in the stream. */
@@ -137,7 +137,7 @@ default BooleanFormula and(BooleanFormula... bits) {
137137
* @see #or(BooleanFormula, BooleanFormula)
138138
*/
139139
default BooleanFormula or(BooleanFormula... bits) {
140-
return or(List.of(bits));
140+
return or(ImmutableList.copyOf(bits));
141141
}
142142

143143
/** Return a stream {@link Collector} that creates a disjunction of all elements in the stream. */

‎src/org/sosy_lab/java_smt/api/StringFormulaManager.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
package org.sosy_lab.java_smt.api;
1010

11-
import java.util.Arrays;
11+
import com.google.common.collect.ImmutableList;
1212
import java.util.List;
1313
import org.sosy_lab.java_smt.api.NumeralFormula.IntegerFormula;
1414
import org.sosy_lab.java_smt.basicimpl.AbstractStringFormulaManager;
@@ -104,7 +104,7 @@ public interface StringFormulaManager {
104104
IntegerFormula length(StringFormula str);
105105

106106
default StringFormula concat(StringFormula... parts) {
107-
return concat(Arrays.asList(parts));
107+
return concat(ImmutableList.copyOf(parts));
108108
}
109109

110110
StringFormula concat(List<StringFormula> parts);
@@ -165,7 +165,7 @@ default RegexFormula range(char start, char end) {
165165
* @return formula denoting the concatenation
166166
*/
167167
default RegexFormula concat(RegexFormula... parts) {
168-
return concatRegex(Arrays.asList(parts));
168+
return concatRegex(ImmutableList.copyOf(parts));
169169
}
170170

171171
/**

‎src/org/sosy_lab/java_smt/api/UFManager.java‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88

99
package org.sosy_lab.java_smt.api;
1010

11+
import com.google.common.collect.ImmutableList;
1112
import java.util.List;
1213

1314
/** Manager for dealing with uninterpreted functions (UFs). */
@@ -20,7 +21,7 @@ <T extends Formula> FunctionDeclaration<T> declareUF(
2021
/** Declare an uninterpreted function. */
2122
default <T extends Formula> FunctionDeclaration<T> declareUF(
2223
String name, FormulaType<T> returnType, FormulaType<?>... args) {
23-
return declareUF(name, returnType, List.of(args));
24+
return declareUF(name, returnType, ImmutableList.copyOf(args));
2425
}
2526

2627
/**
@@ -38,7 +39,7 @@ default <T extends Formula> FunctionDeclaration<T> declareUF(
3839
* @see #callUF(FunctionDeclaration, List)
3940
*/
4041
default <T extends Formula> T callUF(FunctionDeclaration<T> funcType, Formula... args) {
41-
return callUF(funcType, List.of(args));
42+
return callUF(funcType, ImmutableList.copyOf(args));
4243
}
4344

4445
/**
@@ -58,6 +59,6 @@ <T extends Formula> T declareAndCallUF(
5859
*/
5960
default <T extends Formula> T declareAndCallUF(
6061
String name, FormulaType<T> pReturnType, Formula... pArgs) {
61-
return declareAndCallUF(name, pReturnType, List.of(pArgs));
62+
return declareAndCallUF(name, pReturnType, ImmutableList.copyOf(pArgs));
6263
}
6364
}

‎src/org/sosy_lab/java_smt/basicimpl/AbstractFormulaManager.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@
1515
import com.google.common.base.CharMatcher;
1616
import com.google.common.base.Preconditions;
1717
import com.google.common.collect.ImmutableBiMap;
18+
import com.google.common.collect.ImmutableList;
1819
import com.google.common.collect.ImmutableMap;
1920
import com.google.common.collect.ImmutableSet;
2021
import com.google.common.collect.Iterables;
2122
import java.io.IOException;
22-
import java.util.Arrays;
2323
import java.util.List;
2424
import java.util.Map;
2525
import org.checkerframework.checker.nullness.qual.Nullable;
@@ -542,7 +542,7 @@ public <T extends Formula> T makeApplication(
542542
@Override
543543
public <T extends Formula> T makeApplication(
544544
FunctionDeclaration<T> declaration, Formula... args) {
545-
return makeApplication(declaration, Arrays.asList(args));
545+
return makeApplication(declaration, ImmutableList.copyOf(args));
546546
}
547547

548548
@Override

‎src/org/sosy_lab/java_smt/basicimpl/AbstractUFManager.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010

1111
import static org.sosy_lab.java_smt.basicimpl.AbstractFormulaManager.checkVariableName;
1212

13+
import com.google.common.collect.ImmutableList;
1314
import com.google.common.collect.Lists;
14-
import java.util.Arrays;
1515
import java.util.List;
1616
import org.sosy_lab.java_smt.api.Formula;
1717
import org.sosy_lab.java_smt.api.FormulaType;
@@ -68,6 +68,6 @@ public <T extends Formula> T declareAndCallUF(
6868
public <T extends Formula> T declareAndCallUF(
6969
String name, FormulaType<T> pReturnType, Formula... pArgs) {
7070
checkVariableName(name);
71-
return declareAndCallUF(name, pReturnType, Arrays.asList(pArgs));
71+
return declareAndCallUF(name, pReturnType, ImmutableList.copyOf(pArgs));
7272
}
7373
}

‎src/org/sosy_lab/java_smt/delegate/debugging/DebuggingAssertions.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
package org.sosy_lab.java_smt.delegate.debugging;
1010

1111
import com.google.common.base.Preconditions;
12-
import java.util.List;
12+
import com.google.common.collect.ImmutableList;
1313
import org.sosy_lab.common.configuration.Configuration;
1414
import org.sosy_lab.common.configuration.InvalidConfigurationException;
1515
import org.sosy_lab.java_smt.SolverContextFactory.Solvers;
@@ -54,7 +54,7 @@ public void addFunctionDeclaration(FunctionDeclaration<?> pFunctionDeclaration)
5454

5555
/** Assert that the function declaration belongs to this context. */
5656
public void assertDeclarationInContext(FunctionDeclaration<?> pFunctionDeclaration) {
57-
if (List.of(FunctionDeclarationKind.VAR, FunctionDeclarationKind.UF)
57+
if (ImmutableList.of(FunctionDeclarationKind.VAR, FunctionDeclarationKind.UF)
5858
.contains(pFunctionDeclaration.getKind())) {
5959
Preconditions.checkArgument(
6060
debugInfo.getDeclaredFunctions().contains(pFunctionDeclaration),

‎src/org/sosy_lab/java_smt/example/Binoxxo.java‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
package org.sosy_lab.java_smt.example;
1010

1111
import com.google.common.base.Preconditions;
12+
import com.google.common.collect.ImmutableList;
1213
import java.io.IOException;
1314
import java.math.BigInteger;
1415
import java.nio.charset.Charset;
@@ -95,7 +96,7 @@ public static void main(String... args)
9596
SolverContextFactory.createSolverContext(config, logger, notifier, solver)) {
9697

9798
for (BinoxxoSolver<?> binoxxo :
98-
List.of(
99+
ImmutableList.of(
99100
new IntegerBasedBinoxxoSolver(context), new BooleanBasedBinoxxoSolver(context))) {
100101
long start = System.currentTimeMillis();
101102

@@ -300,7 +301,7 @@ List<BooleanFormula> getRules(IntegerFormula[][] symbols) {
300301
for (int row = 0; row < size; row++) {
301302
for (int col = 0; col < size - 2; col++) {
302303
List<IntegerFormula> lst =
303-
List.of(symbols[row][col], symbols[row][col + 1], symbols[row][col + 2]);
304+
ImmutableList.of(symbols[row][col], symbols[row][col + 1], symbols[row][col + 2]);
304305
IntegerFormula sum = imgr.sum(lst);
305306
rules.add(bmgr.or(imgr.equal(one, sum), imgr.equal(two, sum)));
306307
}
@@ -310,7 +311,7 @@ List<BooleanFormula> getRules(IntegerFormula[][] symbols) {
310311
for (int col = 0; col < size; col++) {
311312
for (int row = 0; row < size - 2; row++) {
312313
List<IntegerFormula> lst =
313-
List.of(symbols[row][col], symbols[row + 1][col], symbols[row + 2][col]);
314+
ImmutableList.of(symbols[row][col], symbols[row + 1][col], symbols[row + 2][col]);
314315
IntegerFormula sum = imgr.sum(lst);
315316
rules.add(bmgr.or(imgr.equal(one, sum), imgr.equal(two, sum)));
316317
}
@@ -398,7 +399,7 @@ List<BooleanFormula> getRules(BooleanFormula[][] symbols) {
398399
for (int row = 0; row < size; row++) {
399400
for (int col = 0; col < size - 2; col++) {
400401
List<BooleanFormula> lst =
401-
List.of(symbols[row][col], symbols[row][col + 1], symbols[row][col + 2]);
402+
ImmutableList.of(symbols[row][col], symbols[row][col + 1], symbols[row][col + 2]);
402403
rules.add(bmgr.not(bmgr.and(lst)));
403404
rules.add(bmgr.or(lst));
404405
}
@@ -408,7 +409,7 @@ List<BooleanFormula> getRules(BooleanFormula[][] symbols) {
408409
for (int col = 0; col < size; col++) {
409410
for (int row = 0; row < size - 2; row++) {
410411
List<BooleanFormula> lst =
411-
List.of(symbols[row][col], symbols[row + 1][col], symbols[row + 2][col]);
412+
ImmutableList.of(symbols[row][col], symbols[row + 1][col], symbols[row + 2][col]);
412413
rules.add(bmgr.not(bmgr.and(lst)));
413414
rules.add(bmgr.or(lst));
414415
}

‎src/org/sosy_lab/java_smt/example/Sudoku.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ public static void main(String... args)
108108
SolverContextFactory.createSolverContext(config, logger, notifier, solver)) {
109109

110110
for (SudokuSolver<?> sudoku :
111-
List.of(
111+
ImmutableList.of(
112112
new IntegerBasedSudokuSolver(context),
113113
new EnumerationBasedSudokuSolver(context),
114114
new BooleanBasedSudokuSolver(context))) {

‎src/org/sosy_lab/java_smt/solvers/cvc4/CVC4NativeAPITest.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@
3131
import edu.stanford.CVC4.vectorExpr;
3232
import java.io.FileNotFoundException;
3333
import java.io.UnsupportedEncodingException;
34-
import java.util.Arrays;
3534
import org.junit.After;
3635
import org.junit.AssumptionViolatedException;
3736
import org.junit.Before;
@@ -766,7 +765,7 @@ public void checkUnsatCore() {
766765

767766
// UnsatCores are iterable
768767
for (Expr e : unsatCore) {
769-
assertThat(e.toString()).isIn(Arrays.asList("(not (or a b))", "(and a b)"));
768+
assertThat(e.toString()).isAnyOf("(not (or a b))", "(and a b)");
770769
}
771770
}
772771

0 commit comments

Comments
 (0)