From e270655a7fcb88b03c1b47cbd765780d76937d36 Mon Sep 17 00:00:00 2001 From: Fedor Isakov Date: Thu, 2 May 2019 11:59:50 +0200 Subject: [PATCH] Drop deprecated stuff in reactor. --- .../core/internal/EvaluationSessionImpl.kt | 5 ----- .../reactor/evaluation/EvaluationSession.java | 3 --- .../reactor/evaluation/EvaluationTrace.java | 10 ++------- .../mps/logic/reactor/program/Program.java | 21 ------------------- .../mps/logic/reactor/program/Rule.java | 5 ----- reactor/Test/src/program/MockProgram.kt | 12 +---------- reactor/Test/test/TestProgram.kt | 5 ++++- 7 files changed, 7 insertions(+), 54 deletions(-) diff --git a/reactor/Core/src/jetbrains/mps/logic/reactor/core/internal/EvaluationSessionImpl.kt b/reactor/Core/src/jetbrains/mps/logic/reactor/core/internal/EvaluationSessionImpl.kt index 3f81fbde..b5f9e05e 100644 --- a/reactor/Core/src/jetbrains/mps/logic/reactor/core/internal/EvaluationSessionImpl.kt +++ b/reactor/Core/src/jetbrains/mps/logic/reactor/core/internal/EvaluationSessionImpl.kt @@ -70,11 +70,6 @@ internal class EvaluationSessionImpl private constructor ( return this } - override fun withParam(key: String, param: Any): EvaluationSession.Config { - this.parameters.put(ParameterKey.of(key, Any::class.java), param) - return this - } - override fun withParameter(key: ParameterKey, value: T): EvaluationSession.Config { this.parameters.put(key, value as Any) return this 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 6c01a66a..e9908627 100644 --- a/reactor/Core/src/jetbrains/mps/logic/reactor/evaluation/EvaluationSession.java +++ b/reactor/Core/src/jetbrains/mps/logic/reactor/evaluation/EvaluationSession.java @@ -90,9 +90,6 @@ public abstract class EvaluationSession { public abstract Config withFeedbackHandler(EvaluationFeedbackHandler handler); - @Deprecated - public abstract Config withParam(String key, Object param); - public abstract EvaluationResult start(); } 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 a4c1888f..3a7388a2 100644 --- a/reactor/Core/src/jetbrains/mps/logic/reactor/evaluation/EvaluationTrace.java +++ b/reactor/Core/src/jetbrains/mps/logic/reactor/evaluation/EvaluationTrace.java @@ -58,10 +58,7 @@ public interface EvaluationTrace { public void ask(boolean result, PredicateInvocation invocation) { } - - public void failure(EvaluationFailureException fail) { - } - + public void failure(EvaluationFailure failure) { } @@ -88,9 +85,6 @@ public interface EvaluationTrace { void tell(PredicateInvocation invocation); void ask(boolean result, PredicateInvocation invocation); - - @Deprecated - void failure(EvaluationFailureException fail); - + void failure(EvaluationFailure failure); } diff --git a/reactor/Core/src/jetbrains/mps/logic/reactor/program/Program.java b/reactor/Core/src/jetbrains/mps/logic/reactor/program/Program.java index 943a51da..7f4d0388 100644 --- a/reactor/Core/src/jetbrains/mps/logic/reactor/program/Program.java +++ b/reactor/Core/src/jetbrains/mps/logic/reactor/program/Program.java @@ -32,27 +32,6 @@ public abstract class Program { public abstract String name(); - /** - * @deprecated no usages - * @return - */ - @Deprecated - public Iterable constraintSymbols() { throw new UnsupportedOperationException (); } - - /** - * @deprecated no usages - * @return - */ - @Deprecated - public List> constraintArgumentTypes(ConstraintSymbol constraintSymbol) { throw new UnsupportedOperationException (); } - - /** - * @deprecated no usages - * @return - */ - @Deprecated - public Iterable predicateSymbols() { throw new UnsupportedOperationException (); } - public abstract Iterable handlers(); public abstract List instantiateArguments(List arguments, LogicalContext logicalContext, InvocationContext invocationContext); diff --git a/reactor/Core/src/jetbrains/mps/logic/reactor/program/Rule.java b/reactor/Core/src/jetbrains/mps/logic/reactor/program/Rule.java index 25e4b79f..3456f359 100644 --- a/reactor/Core/src/jetbrains/mps/logic/reactor/program/Rule.java +++ b/reactor/Core/src/jetbrains/mps/logic/reactor/program/Rule.java @@ -42,11 +42,6 @@ public abstract class Rule { public abstract Iterable guard(); - @Deprecated - public Iterable body() { - throw new UnsupportedOperationException(); - } - public abstract Iterable> bodyAlternation(); public abstract Iterable all(); diff --git a/reactor/Test/src/program/MockProgram.kt b/reactor/Test/src/program/MockProgram.kt index 8c4c7418..7dae7afc 100644 --- a/reactor/Test/src/program/MockProgram.kt +++ b/reactor/Test/src/program/MockProgram.kt @@ -96,17 +96,7 @@ class MockRule( class MockProgram(val name: String, val handlers: List, val registry: MockConstraintRegistry) : Program() { override fun name(): String = name - - - override fun constraintSymbols(): Iterable = - registry.constraintSymbols() - - override fun constraintArgumentTypes(constraintSymbol: ConstraintSymbol): List> = - registry.constraintArgTypes(constraintSymbol) - - override fun predicateSymbols(): Iterable = - registry.predicateSymbols() - + override fun instantiateArguments(arguments: List<*>, logicalContext: LogicalContext, invocationContext: InvocationContext): List<*> = arguments.map { a -> if (a is MetaLogical<*>) logicalContext.variable(a) diff --git a/reactor/Test/test/TestProgram.kt b/reactor/Test/test/TestProgram.kt index 14c1d81c..21610319 100644 --- a/reactor/Test/test/TestProgram.kt +++ b/reactor/Test/test/TestProgram.kt @@ -2,6 +2,7 @@ import jetbrains.mps.logic.reactor.core.ReactorLifecycle import jetbrains.mps.logic.reactor.evaluation.EvaluationSession import jetbrains.mps.logic.reactor.evaluation.StoreView import jetbrains.mps.logic.reactor.logical.Logical +import jetbrains.mps.logic.reactor.program.Constraint import jetbrains.mps.logic.reactor.program.ConstraintSymbol import org.junit.AfterClass import org.junit.Assert.assertEquals @@ -35,7 +36,9 @@ class TestProgram { for (h in handlers) { programBuilder.addHandler(h) } - val session = EvaluationSession.newSession(programBuilder.program(name)).withParam("main", MockConstraint(ConstraintSymbol("main", 0))).start() + val session = EvaluationSession.newSession(programBuilder.program(name)) + .withParameter(EvaluationSession.ParameterKey.of("main", Constraint::class.java), MockConstraint(ConstraintSymbol("main", 0))) + .start() return session.storeView() }