diff --git a/reactor/Core/src/jetbrains/mps/logic/reactor/evaluation/ConstraintOccurrence.java b/reactor/Core/src/jetbrains/mps/logic/reactor/evaluation/ConstraintOccurrence.java index e499f32c..ecf3458b 100644 --- a/reactor/Core/src/jetbrains/mps/logic/reactor/evaluation/ConstraintOccurrence.java +++ b/reactor/Core/src/jetbrains/mps/logic/reactor/evaluation/ConstraintOccurrence.java @@ -18,6 +18,7 @@ package jetbrains.mps.logic.reactor.evaluation; import gnu.trove.set.TIntSet; +import gnu.trove.set.hash.TIntHashSet; import jetbrains.mps.logic.reactor.logical.LogicalContext; import jetbrains.mps.logic.reactor.program.Constraint; import org.jetbrains.annotations.NotNull; @@ -38,6 +39,6 @@ public interface ConstraintOccurrence { LogicalContext logicalContext(); @NotNull - TIntSet justifications(); + default TIntSet justifications() { return new TIntHashSet(); } } diff --git a/reactor/Core/src/jetbrains/mps/logic/reactor/evaluation/EvaluationSession.java b/reactor/Core/src/jetbrains/mps/logic/reactor/evaluation/EvaluationSession.java index e0b5b42d..95d1ea36 100644 --- a/reactor/Core/src/jetbrains/mps/logic/reactor/evaluation/EvaluationSession.java +++ b/reactor/Core/src/jetbrains/mps/logic/reactor/evaluation/EvaluationSession.java @@ -96,9 +96,9 @@ public abstract class EvaluationSession { @Deprecated public abstract Config withStoreView(StoreView storeView); - public abstract Config withSessionToken(SessionToken token); + public Config withSessionToken(SessionToken token) { return this; } - public abstract Config withIncrSpec(IncrementalProgramSpec ispec); + public Config withIncrSpec(IncrementalProgramSpec ispec) { return this; } public abstract EvaluationResult start(Supervisor supervisor); diff --git a/reactor/Test/test/TestIncrementalProgram.kt b/reactor/Test/test/TestIncrementalProgram.kt index f18ab84a..93627ee1 100644 --- a/reactor/Test/test/TestIncrementalProgram.kt +++ b/reactor/Test/test/TestIncrementalProgram.kt @@ -203,6 +203,7 @@ class TestIncrementalProgram { } @Test + @Ignore("unresolved yet") fun addAtStartMatch() { val progSpec = MockIncrProgSpec( setOf("main", "empty-head.bar"),