From 716e285c0c071aba90ea9db581e7c77e28120a96 Mon Sep 17 00:00:00 2001 From: Grigorii Kirgizov Date: Thu, 7 Nov 2019 17:14:40 +0300 Subject: [PATCH] Small cleanup of EvaluationTrace usage --- .../mps/logic/reactor/core/internal/ControllerImpl.kt | 3 --- .../mps/logic/reactor/evaluation/EvaluationTrace.java | 4 ++-- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/reactor/Core/src/jetbrains/mps/logic/reactor/core/internal/ControllerImpl.kt b/reactor/Core/src/jetbrains/mps/logic/reactor/core/internal/ControllerImpl.kt index b7361c35..9af17de1 100644 --- a/reactor/Core/src/jetbrains/mps/logic/reactor/core/internal/ControllerImpl.kt +++ b/reactor/Core/src/jetbrains/mps/logic/reactor/core/internal/ControllerImpl.kt @@ -94,10 +94,7 @@ internal class ControllerImpl ( } override fun reactivate(occ: Occurrence): FeedbackStatus { - // fixme: leave one of these, ensure impl is present on both reactor & mps levels - trace.activate(occ) trace.reactivateIncremental(occ) - return state.processActivated(this, occ, NORMAL()) } diff --git a/reactor/Core/src/jetbrains/mps/logic/reactor/evaluation/EvaluationTrace.java b/reactor/Core/src/jetbrains/mps/logic/reactor/evaluation/EvaluationTrace.java index 4d06c75b..e4d33c7f 100644 --- a/reactor/Core/src/jetbrains/mps/logic/reactor/evaluation/EvaluationTrace.java +++ b/reactor/Core/src/jetbrains/mps/logic/reactor/evaluation/EvaluationTrace.java @@ -33,6 +33,8 @@ public interface EvaluationTrace { default void reactivate(ConstraintOccurrence occurrence) {} + default void reactivateIncremental(ConstraintOccurrence occurrence) {} + default void suspend(ConstraintOccurrence occurrence) {} default void discard(ConstraintOccurrence occurrence) {} @@ -55,7 +57,5 @@ public interface EvaluationTrace { default void invalidate(RuleMatch ruleMatch) {} - default void reactivateIncremental(ConstraintOccurrence occurrence) {} - default void potentialMatch(ConstraintOccurrence occurrence, Rule rule) {} }