Skip to content

Commit 2e76ca4

Browse files
author
BaierD
committed
Clean up code (Improve comments, format, add private default constructor for class only used statically and remove not thrown exceptions)
1 parent 0254c32 commit 2e76ca4

File tree

5 files changed

+21
-7
lines changed

5 files changed

+21
-7
lines changed

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

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,23 @@
2525
import org.checkerframework.checker.nullness.qual.Nullable;
2626
import org.sosy_lab.common.Appender;
2727
import org.sosy_lab.common.Appenders;
28-
import org.sosy_lab.java_smt.api.*;
28+
import org.sosy_lab.java_smt.api.ArrayFormulaManager;
29+
import org.sosy_lab.java_smt.api.BooleanFormula;
30+
import org.sosy_lab.java_smt.api.EnumerationFormulaManager;
31+
import org.sosy_lab.java_smt.api.FloatingPointFormulaManager;
32+
import org.sosy_lab.java_smt.api.Formula;
33+
import org.sosy_lab.java_smt.api.FormulaManager;
34+
import org.sosy_lab.java_smt.api.FormulaType;
2935
import org.sosy_lab.java_smt.api.FormulaType.ArrayFormulaType;
3036
import org.sosy_lab.java_smt.api.FormulaType.BitvectorType;
3137
import org.sosy_lab.java_smt.api.FormulaType.FloatingPointType;
38+
import org.sosy_lab.java_smt.api.FunctionDeclaration;
39+
import org.sosy_lab.java_smt.api.FunctionDeclarationKind;
40+
import org.sosy_lab.java_smt.api.IntegerFormulaManager;
41+
import org.sosy_lab.java_smt.api.RationalFormulaManager;
42+
import org.sosy_lab.java_smt.api.SLFormulaManager;
43+
import org.sosy_lab.java_smt.api.StringFormulaManager;
44+
import org.sosy_lab.java_smt.api.Tactic;
3245
import org.sosy_lab.java_smt.api.visitors.FormulaTransformationVisitor;
3346
import org.sosy_lab.java_smt.api.visitors.FormulaVisitor;
3447
import org.sosy_lab.java_smt.api.visitors.TraversalProcess;

src/org/sosy_lab/java_smt/basicimpl/Tokenizer.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,11 @@
1414
import java.util.List;
1515
import java.util.Optional;
1616

17-
/** Helper class for splitting up an SMT-LIB2 file into a string of commands */
17+
/** Helper class for splitting up an SMT-LIB2 file into a string of commands. */
1818
public class Tokenizer {
19+
20+
private Tokenizer() {}
21+
1922
/**
2023
* Split up a sequence of lisp expressions.
2124
*

src/org/sosy_lab/java_smt/solvers/yices2/Yices2FormulaManager.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ public Integer parseImpl(String pS) throws IllegalArgumentException {
7171
return yices_parse_term(pS);
7272
}
7373

74-
/** Helper function to (pretty) print yices2 sorts */
74+
/** Helper function to (pretty) print yices2 sorts. */
7575
private String getTypeRepr(int type) {
7676
if (yices_type_is_bitvector(type)) {
7777
return "(_ BitVec " + yices_bvtype_size(type) + ")";

src/org/sosy_lab/java_smt/test/SanitizerTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ public void exitAtTheEnd() throws SolverException, InterruptedException {
7777
}
7878

7979
@Test
80-
public void stackPushTest() throws SolverException, InterruptedException {
80+
public void stackPushTest() {
8181
// FIXME: We currently don't support stack operations and expect an exceptions to be thrown for
8282
// these inputs
8383

src/org/sosy_lab/java_smt/test/SolverFormulaIOTest.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -481,9 +481,7 @@ private void checkThatAssertIsInLastLine(String dump) {
481481
TruthJUnit.assume().that(solver).isNotEqualTo(Solvers.BOOLECTOR);
482482

483483
String lastCommand = getLast(Tokenizer.tokenize(dump));
484-
assertWithMessage("last line(s) of <\n" + dump + ">")
485-
.that(lastCommand)
486-
.startsWith("(assert ");
484+
assertWithMessage("last line(s) of <\n" + dump + ">").that(lastCommand).startsWith("(assert ");
487485
assertWithMessage("last line(s) of <\n" + dump + ">").that(lastCommand).endsWith(")");
488486
}
489487

0 commit comments

Comments
 (0)