Skip to content

Commit f894510

Browse files
committed
Princess: fix usage of ambiguous methods for Scala types.
1 parent 5eafd01 commit f894510

File tree

1 file changed

+6
-3
lines changed

1 file changed

+6
-3
lines changed

src/org/sosy_lab/java_smt/solvers/princess/PrincessFormulaCreator.java

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
import static com.google.common.base.Preconditions.checkArgument;
1212
import static org.sosy_lab.java_smt.api.QuantifiedFormulaManager.Quantifier.EXISTS;
1313
import static org.sosy_lab.java_smt.api.QuantifiedFormulaManager.Quantifier.FORALL;
14-
import static org.sosy_lab.java_smt.solvers.princess.PrincessEnvironment.toITermSeq;
1514
import static org.sosy_lab.java_smt.solvers.princess.PrincessEnvironment.toSeq;
1615
import static scala.collection.JavaConverters.asJava;
1716
import static scala.collection.JavaConverters.asJavaCollection;
@@ -547,15 +546,19 @@ private <R> R visitQuantifier(FormulaVisitor<R> visitor, BooleanFormula f, IQuan
547546

548547
// substitute the bound variable with index 0 with a new variable, and un-shift the remaining
549548
// de-Bruijn indices, such that the next nested bound variable has index 0.
550-
IFormula substitutedBody = IFormula.subst(body, toITermSeq(substitutionVariable).toList(), -1);
549+
IFormula substitutedBody = IFormula.subst(body, asScalaList(substitutionVariable), -1);
551550

552551
return visitor.visitQuantifier(
553552
f,
554553
quantifier,
555-
List.of(encapsulateWithTypeOf(substitutionVariable)),
554+
ImmutableList.of(encapsulateWithTypeOf(substitutionVariable)),
556555
encapsulateBoolean(substitutedBody));
557556
}
558557

558+
private static scala.collection.immutable.List<ITerm> asScalaList(ITerm substitutionVariable) {
559+
return scala.collection.immutable.List$.MODULE$.empty().$colon$colon(substitutionVariable);
560+
}
561+
559562
/**
560563
* Get a fresh variable name for the given formula. We compute the same variable name for the same
561564
* body, such that a user gets the same substituted body when visiting a quantified formulas

0 commit comments

Comments
 (0)