diff --git a/reactor/API/API.iml b/reactor/API/API.iml deleted file mode 100644 index f4fc1238..00000000 --- a/reactor/API/API.iml +++ /dev/null @@ -1,81 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/reactor/API/pom.xml b/reactor/API/pom.xml deleted file mode 100644 index 12f026e9..00000000 --- a/reactor/API/pom.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - 4.0.0 - - - jetbrains.mps.logic.conreactor - conreactor-main - 0.9.4 - .. - - - conreactor-api - jar - - - ${basedir}/src/ - - - \ No newline at end of file diff --git a/reactor/Core/pom.xml b/reactor/Core/pom.xml index b4634034..bce86597 100644 --- a/reactor/Core/pom.xml +++ b/reactor/Core/pom.xml @@ -15,11 +15,6 @@ jar - - jetbrains.mps.logic.conreactor - conreactor-api - ${project.parent.version} - diff --git a/reactor/Core/src/jetbrains/mps/logic/reactor/core/Controller.kt b/reactor/Core/src/jetbrains/mps/logic/reactor/core/Controller.kt index ff295eb7..b8c6dcec 100644 --- a/reactor/Core/src/jetbrains/mps/logic/reactor/core/Controller.kt +++ b/reactor/Core/src/jetbrains/mps/logic/reactor/core/Controller.kt @@ -16,9 +16,7 @@ package jetbrains.mps.logic.reactor.core -import jetbrains.mps.logic.reactor.evaluation.ConstraintOccurrence import jetbrains.mps.logic.reactor.evaluation.StoreView -import jetbrains.mps.logic.reactor.program.Predicate /** * Allows access to the internal mechanics of the reactor. diff --git a/reactor/Core/src/jetbrains/mps/logic/reactor/core/Dispatcher.kt b/reactor/Core/src/jetbrains/mps/logic/reactor/core/Dispatcher.kt index 9135cf2b..c003f2dc 100644 --- a/reactor/Core/src/jetbrains/mps/logic/reactor/core/Dispatcher.kt +++ b/reactor/Core/src/jetbrains/mps/logic/reactor/core/Dispatcher.kt @@ -18,7 +18,6 @@ package jetbrains.mps.logic.reactor.core import com.github.andrewoma.dexx.collection.Maps import jetbrains.mps.logic.reactor.core.internal.MatchRuleImpl -import jetbrains.mps.logic.reactor.core.internal.RuleMatcherImpl import com.github.andrewoma.dexx.collection.Map as PersMap import jetbrains.mps.logic.reactor.evaluation.MatchRule import jetbrains.mps.logic.reactor.program.Rule diff --git a/reactor/Core/src/jetbrains/mps/logic/reactor/core/Invocation.kt b/reactor/Core/src/jetbrains/mps/logic/reactor/core/Invocation.kt index ae469464..82321381 100644 --- a/reactor/Core/src/jetbrains/mps/logic/reactor/core/Invocation.kt +++ b/reactor/Core/src/jetbrains/mps/logic/reactor/core/Invocation.kt @@ -27,9 +27,9 @@ import jetbrains.mps.logic.reactor.program.Predicate * @author Fedor Isakov */ data class Invocation(val predicate: Predicate, - val invocationArguments: List<*>, - val logicalContext: LogicalContext, - val invocationContext: InvocationContext) : PredicateInvocation + val invocationArguments: List<*>, + val logicalContext: LogicalContext, + val invocationContext: InvocationContext) : PredicateInvocation { override fun predicate(): Predicate = predicate @@ -43,6 +43,6 @@ data class Invocation(val predicate: Predicate, } fun Predicate.invocation(arguments: List<*>, - logicalContext: LogicalContext, - invocationContext: InvocationContext): PredicateInvocation = + logicalContext: LogicalContext, + invocationContext: InvocationContext): PredicateInvocation = Invocation(this, arguments, logicalContext, invocationContext) diff --git a/reactor/Core/src/jetbrains/mps/logic/reactor/core/LogicalObserver.kt b/reactor/Core/src/jetbrains/mps/logic/reactor/core/LogicalObserver.kt index 2017a7a5..e13a1fc5 100644 --- a/reactor/Core/src/jetbrains/mps/logic/reactor/core/LogicalObserver.kt +++ b/reactor/Core/src/jetbrains/mps/logic/reactor/core/LogicalObserver.kt @@ -18,8 +18,6 @@ package jetbrains.mps.logic.reactor.core import jetbrains.mps.logic.reactor.core.internal.LogicalImpl import jetbrains.mps.logic.reactor.logical.Logical -import jetbrains.mps.logic.reactor.logical.MetaLogical -import jetbrains.mps.logic.reactor.logical.JoinableLogical /** * An observer interface of a [Logical] instance. diff --git a/reactor/Core/src/jetbrains/mps/logic/reactor/core/MatchingProbe.kt b/reactor/Core/src/jetbrains/mps/logic/reactor/core/MatchingProbe.kt index c6de0d65..baaa36d4 100644 --- a/reactor/Core/src/jetbrains/mps/logic/reactor/core/MatchingProbe.kt +++ b/reactor/Core/src/jetbrains/mps/logic/reactor/core/MatchingProbe.kt @@ -16,7 +16,6 @@ package jetbrains.mps.logic.reactor.core -import jetbrains.mps.logic.reactor.evaluation.ConstraintOccurrence import jetbrains.mps.logic.reactor.evaluation.MatchRule import jetbrains.mps.logic.reactor.program.Rule diff --git a/reactor/Core/src/jetbrains/mps/logic/reactor/core/Occurrence.kt b/reactor/Core/src/jetbrains/mps/logic/reactor/core/Occurrence.kt index 815d8857..7d9e7107 100644 --- a/reactor/Core/src/jetbrains/mps/logic/reactor/core/Occurrence.kt +++ b/reactor/Core/src/jetbrains/mps/logic/reactor/core/Occurrence.kt @@ -31,9 +31,9 @@ import jetbrains.mps.logic.reactor.program.Constraint * @author Fedor Isakov */ data class Occurrence (val constraint: Constraint, - val logicalContext: LogicalContext, - val arguments: List<*>, - val currentFrame: () -> FrameObservable) : + val logicalContext: LogicalContext, + val arguments: List<*>, + val currentFrame: () -> FrameObservable) : ConstraintOccurrence, LogicalObserver { @@ -82,12 +82,12 @@ data class Occurrence (val constraint: Constraint, } fun Constraint.occurrence(arguments: List<*>, - currentFrame: () -> FrameObservable, - logicalContext: LogicalContext): Occurrence = + currentFrame: () -> FrameObservable, + logicalContext: LogicalContext): Occurrence = Occurrence(this, logicalContext, arguments, currentFrame) fun Constraint.occurrence(arguments: List<*>, - currentFrame: () -> FrameObservable): Occurrence = + currentFrame: () -> FrameObservable): Occurrence = Occurrence(this, noLogicalContext, arguments, currentFrame) private val noLogicalContext: LogicalContext = object: LogicalContext { diff --git a/reactor/Core/src/jetbrains/mps/logic/reactor/core/RuleIndex.kt b/reactor/Core/src/jetbrains/mps/logic/reactor/core/RuleIndex.kt index e596213e..0cc8dca3 100644 --- a/reactor/Core/src/jetbrains/mps/logic/reactor/core/RuleIndex.kt +++ b/reactor/Core/src/jetbrains/mps/logic/reactor/core/RuleIndex.kt @@ -134,7 +134,7 @@ class RuleIndex(handlers: Iterable) : Iterable { for ((idx, arg) in cst.arguments().withIndex()) { val value2indices = anySelectors[idx] when (arg) { - is MetaLogical<*> -> + is MetaLogical<*> -> // all values should be accepted by a meta logical wildcardSelectors[idx].set(ruleBit) is Term -> 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 87109321..a25c79e0 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 @@ -31,9 +31,9 @@ import com.github.andrewoma.dexx.collection.List as PList */ internal class EvaluationSessionImpl private constructor ( - program: Program, - trace: EvaluationTrace, - sessionSolver: SessionSolver? = null) : EvaluationSessionEx(program, trace, sessionSolver) + program: Program, + trace: EvaluationTrace, + sessionSolver: SessionSolver? = null) : EvaluationSessionEx(program, trace, sessionSolver) { lateinit var controller: ControllerImpl diff --git a/reactor/Core/src/jetbrains/mps/logic/reactor/core/internal/OccurrenceMatcherImpl.kt b/reactor/Core/src/jetbrains/mps/logic/reactor/core/internal/OccurrenceMatcherImpl.kt index 24c677fe..25aa7898 100644 --- a/reactor/Core/src/jetbrains/mps/logic/reactor/core/internal/OccurrenceMatcherImpl.kt +++ b/reactor/Core/src/jetbrains/mps/logic/reactor/core/internal/OccurrenceMatcherImpl.kt @@ -83,7 +83,7 @@ internal class OccurrenceMatcherImpl(val contextSubst: Subst? = null) : Occurren } else -> when { - trg is Logical<*> -> ptnMatchAny(ptn, resolve(trg)) + trg is Logical<*> -> ptnMatchAny(ptn, resolve(trg)) else -> // compare two arbitrary values (ptn == trg) @@ -93,7 +93,7 @@ internal class OccurrenceMatcherImpl(val contextSubst: Subst? = null) : Occurren private fun matchAny(left: Any?, right: Any?): Boolean = when (left) { - is Logical<*> -> + is Logical<*> -> // match logical or its value matchLogical(left.findRoot(), right) is Term -> @@ -103,7 +103,7 @@ internal class OccurrenceMatcherImpl(val contextSubst: Subst? = null) : Occurren } else -> when { - right is Logical<*> -> matchAny(left, resolve(right)) + right is Logical<*> -> matchAny(left, resolve(right)) else -> // compare two arbitrary values (left == right) } diff --git a/reactor/Core/src/jetbrains/mps/logic/reactor/core/internal/Store.kt b/reactor/Core/src/jetbrains/mps/logic/reactor/core/internal/Store.kt index 28165dd7..c32097ed 100644 --- a/reactor/Core/src/jetbrains/mps/logic/reactor/core/internal/Store.kt +++ b/reactor/Core/src/jetbrains/mps/logic/reactor/core/internal/Store.kt @@ -64,7 +64,7 @@ internal class Store : LogicalObserver { storeItems.put(occ, item) occ.arguments().forEach { arg -> when (arg) { - is Logical<*> -> { + is Logical<*> -> { l2o = l2o.put(IdWrapper(arg.findRoot()), l2o[IdWrapper(arg.findRoot())]?.add(item) ?: singletonIdSet(item)) } @@ -114,7 +114,7 @@ internal class Store : LogicalObserver { for (arg in occ.arguments()) { val value = if (arg is Logical<*> && arg.isBound) arg.findRoot().value() else arg when (value) { - is Logical<*> -> { + is Logical<*> -> { // free logical val argId = IdWrapper(value.findRoot()) this.logical2occurrences = logical2occurrences.put(argId, @@ -136,7 +136,7 @@ internal class Store : LogicalObserver { for (arg in occ.arguments()) { when (arg) { - is Logical<*> -> { + is Logical<*> -> { val argId = IdWrapper(arg.findRoot()) logical2occurrences[argId]?.remove(occ)?.let { newList -> this.logical2occurrences = if (newList.isEmpty) { diff --git a/reactor/API/src/jetbrains/mps/logic/reactor/evaluation/CompositeFeedback.java b/reactor/Core/src/jetbrains/mps/logic/reactor/evaluation/CompositeFeedback.java similarity index 100% rename from reactor/API/src/jetbrains/mps/logic/reactor/evaluation/CompositeFeedback.java rename to reactor/Core/src/jetbrains/mps/logic/reactor/evaluation/CompositeFeedback.java diff --git a/reactor/API/src/jetbrains/mps/logic/reactor/evaluation/ConstraintOccurrence.java b/reactor/Core/src/jetbrains/mps/logic/reactor/evaluation/ConstraintOccurrence.java similarity index 100% rename from reactor/API/src/jetbrains/mps/logic/reactor/evaluation/ConstraintOccurrence.java rename to reactor/Core/src/jetbrains/mps/logic/reactor/evaluation/ConstraintOccurrence.java diff --git a/reactor/API/src/jetbrains/mps/logic/reactor/evaluation/DetailedFeedback.java b/reactor/Core/src/jetbrains/mps/logic/reactor/evaluation/DetailedFeedback.java similarity index 96% rename from reactor/API/src/jetbrains/mps/logic/reactor/evaluation/DetailedFeedback.java rename to reactor/Core/src/jetbrains/mps/logic/reactor/evaluation/DetailedFeedback.java index 3e72694f..32b807c2 100644 --- a/reactor/API/src/jetbrains/mps/logic/reactor/evaluation/DetailedFeedback.java +++ b/reactor/Core/src/jetbrains/mps/logic/reactor/evaluation/DetailedFeedback.java @@ -16,8 +16,6 @@ package jetbrains.mps.logic.reactor.evaluation; -import jetbrains.mps.logic.reactor.program.Rule; - /** * Encapsulates a detailed report to be provided by the code being evaluated. * Does not affect the evaluation flow. diff --git a/reactor/API/src/jetbrains/mps/logic/reactor/evaluation/EvaluationFailure.java b/reactor/Core/src/jetbrains/mps/logic/reactor/evaluation/EvaluationFailure.java similarity index 96% rename from reactor/API/src/jetbrains/mps/logic/reactor/evaluation/EvaluationFailure.java rename to reactor/Core/src/jetbrains/mps/logic/reactor/evaluation/EvaluationFailure.java index 87395ddc..c2551025 100644 --- a/reactor/API/src/jetbrains/mps/logic/reactor/evaluation/EvaluationFailure.java +++ b/reactor/Core/src/jetbrains/mps/logic/reactor/evaluation/EvaluationFailure.java @@ -1,5 +1,5 @@ /* - * Copyright 2014-2018 JetBrains s.r.o. + * Copyright 2014-2019 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package jetbrains.mps.logic.reactor.evaluation; -import jetbrains.mps.logic.reactor.program.Rule; - import java.util.ArrayList; import java.util.List; diff --git a/reactor/API/src/jetbrains/mps/logic/reactor/evaluation/EvaluationFailureException.java b/reactor/Core/src/jetbrains/mps/logic/reactor/evaluation/EvaluationFailureException.java similarity index 100% rename from reactor/API/src/jetbrains/mps/logic/reactor/evaluation/EvaluationFailureException.java rename to reactor/Core/src/jetbrains/mps/logic/reactor/evaluation/EvaluationFailureException.java diff --git a/reactor/API/src/jetbrains/mps/logic/reactor/evaluation/EvaluationFeedback.java b/reactor/Core/src/jetbrains/mps/logic/reactor/evaluation/EvaluationFeedback.java similarity index 100% rename from reactor/API/src/jetbrains/mps/logic/reactor/evaluation/EvaluationFeedback.java rename to reactor/Core/src/jetbrains/mps/logic/reactor/evaluation/EvaluationFeedback.java diff --git a/reactor/API/src/jetbrains/mps/logic/reactor/evaluation/EvaluationFeedbackHandler.java b/reactor/Core/src/jetbrains/mps/logic/reactor/evaluation/EvaluationFeedbackHandler.java similarity index 100% rename from reactor/API/src/jetbrains/mps/logic/reactor/evaluation/EvaluationFeedbackHandler.java rename to reactor/Core/src/jetbrains/mps/logic/reactor/evaluation/EvaluationFeedbackHandler.java diff --git a/reactor/API/src/jetbrains/mps/logic/reactor/evaluation/EvaluationResult.java b/reactor/Core/src/jetbrains/mps/logic/reactor/evaluation/EvaluationResult.java similarity index 91% rename from reactor/API/src/jetbrains/mps/logic/reactor/evaluation/EvaluationResult.java rename to reactor/Core/src/jetbrains/mps/logic/reactor/evaluation/EvaluationResult.java index bd56b723..ed2723c6 100644 --- a/reactor/API/src/jetbrains/mps/logic/reactor/evaluation/EvaluationResult.java +++ b/reactor/Core/src/jetbrains/mps/logic/reactor/evaluation/EvaluationResult.java @@ -1,5 +1,5 @@ /* - * Copyright 2014-2018 JetBrains s.r.o. + * Copyright 2014-2019 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package jetbrains.mps.logic.reactor.evaluation; -import java.util.Collection; - /** * @author Fedor Isakov */ diff --git a/reactor/API/src/jetbrains/mps/logic/reactor/evaluation/EvaluationSession.java b/reactor/Core/src/jetbrains/mps/logic/reactor/evaluation/EvaluationSession.java similarity index 92% rename from reactor/API/src/jetbrains/mps/logic/reactor/evaluation/EvaluationSession.java rename to reactor/Core/src/jetbrains/mps/logic/reactor/evaluation/EvaluationSession.java index 09fbb3b7..ce542e39 100644 --- a/reactor/API/src/jetbrains/mps/logic/reactor/evaluation/EvaluationSession.java +++ b/reactor/Core/src/jetbrains/mps/logic/reactor/evaluation/EvaluationSession.java @@ -1,5 +1,5 @@ /* - * Copyright 2014-2017 JetBrains s.r.o. + * Copyright 2014-2019 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,10 +17,6 @@ package jetbrains.mps.logic.reactor.evaluation; -import jetbrains.mps.logic.reactor.logical.LogicalContext; -import jetbrains.mps.logic.reactor.program.Constraint; -import jetbrains.mps.logic.reactor.program.Predicate; -import jetbrains.mps.logic.reactor.program.PredicateSymbol; import jetbrains.mps.logic.reactor.program.Program; /** diff --git a/reactor/API/src/jetbrains/mps/logic/reactor/evaluation/EvaluationTrace.java b/reactor/Core/src/jetbrains/mps/logic/reactor/evaluation/EvaluationTrace.java similarity index 100% rename from reactor/API/src/jetbrains/mps/logic/reactor/evaluation/EvaluationTrace.java rename to reactor/Core/src/jetbrains/mps/logic/reactor/evaluation/EvaluationTrace.java diff --git a/reactor/API/src/jetbrains/mps/logic/reactor/evaluation/FailureHandler.java b/reactor/Core/src/jetbrains/mps/logic/reactor/evaluation/FailureHandler.java similarity index 100% rename from reactor/API/src/jetbrains/mps/logic/reactor/evaluation/FailureHandler.java rename to reactor/Core/src/jetbrains/mps/logic/reactor/evaluation/FailureHandler.java diff --git a/reactor/API/src/jetbrains/mps/logic/reactor/evaluation/Instructible.java b/reactor/Core/src/jetbrains/mps/logic/reactor/evaluation/Instructible.java similarity index 100% rename from reactor/API/src/jetbrains/mps/logic/reactor/evaluation/Instructible.java rename to reactor/Core/src/jetbrains/mps/logic/reactor/evaluation/Instructible.java diff --git a/reactor/API/src/jetbrains/mps/logic/reactor/evaluation/InvocationContext.java b/reactor/Core/src/jetbrains/mps/logic/reactor/evaluation/InvocationContext.java similarity index 100% rename from reactor/API/src/jetbrains/mps/logic/reactor/evaluation/InvocationContext.java rename to reactor/Core/src/jetbrains/mps/logic/reactor/evaluation/InvocationContext.java diff --git a/reactor/API/src/jetbrains/mps/logic/reactor/evaluation/MatchRule.java b/reactor/Core/src/jetbrains/mps/logic/reactor/evaluation/MatchRule.java similarity index 100% rename from reactor/API/src/jetbrains/mps/logic/reactor/evaluation/MatchRule.java rename to reactor/Core/src/jetbrains/mps/logic/reactor/evaluation/MatchRule.java diff --git a/reactor/API/src/jetbrains/mps/logic/reactor/evaluation/PredicateInvocation.java b/reactor/Core/src/jetbrains/mps/logic/reactor/evaluation/PredicateInvocation.java similarity index 100% rename from reactor/API/src/jetbrains/mps/logic/reactor/evaluation/PredicateInvocation.java rename to reactor/Core/src/jetbrains/mps/logic/reactor/evaluation/PredicateInvocation.java diff --git a/reactor/API/src/jetbrains/mps/logic/reactor/evaluation/Queryable.java b/reactor/Core/src/jetbrains/mps/logic/reactor/evaluation/Queryable.java similarity index 100% rename from reactor/API/src/jetbrains/mps/logic/reactor/evaluation/Queryable.java rename to reactor/Core/src/jetbrains/mps/logic/reactor/evaluation/Queryable.java diff --git a/reactor/API/src/jetbrains/mps/logic/reactor/evaluation/SessionSolver.java b/reactor/Core/src/jetbrains/mps/logic/reactor/evaluation/SessionSolver.java similarity index 84% rename from reactor/API/src/jetbrains/mps/logic/reactor/evaluation/SessionSolver.java rename to reactor/Core/src/jetbrains/mps/logic/reactor/evaluation/SessionSolver.java index 454c6a1d..1ce8fb10 100644 --- a/reactor/API/src/jetbrains/mps/logic/reactor/evaluation/SessionSolver.java +++ b/reactor/Core/src/jetbrains/mps/logic/reactor/evaluation/SessionSolver.java @@ -1,5 +1,5 @@ /* - * Copyright 2014-2017 JetBrains s.r.o. + * Copyright 2014-2019 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,14 +17,6 @@ package jetbrains.mps.logic.reactor.evaluation; -import jetbrains.mps.logic.reactor.logical.LogicalContext; -import jetbrains.mps.logic.reactor.program.AndItem; -import jetbrains.mps.logic.reactor.program.Predicate; -import jetbrains.mps.logic.reactor.program.PredicateSymbol; - -import java.util.HashMap; -import java.util.Map; - /** * // FIXME to be merged with EvaluationSession * Is used to provide an interface for handlers and solvers working together in a single session. diff --git a/reactor/API/src/jetbrains/mps/logic/reactor/evaluation/Solver.java b/reactor/Core/src/jetbrains/mps/logic/reactor/evaluation/Solver.java similarity index 100% rename from reactor/API/src/jetbrains/mps/logic/reactor/evaluation/Solver.java rename to reactor/Core/src/jetbrains/mps/logic/reactor/evaluation/Solver.java diff --git a/reactor/API/src/jetbrains/mps/logic/reactor/evaluation/StoreView.java b/reactor/Core/src/jetbrains/mps/logic/reactor/evaluation/StoreView.java similarity index 100% rename from reactor/API/src/jetbrains/mps/logic/reactor/evaluation/StoreView.java rename to reactor/Core/src/jetbrains/mps/logic/reactor/evaluation/StoreView.java diff --git a/reactor/API/src/jetbrains/mps/logic/reactor/logical/JoinableLogical.java b/reactor/Core/src/jetbrains/mps/logic/reactor/logical/JoinableLogical.java similarity index 100% rename from reactor/API/src/jetbrains/mps/logic/reactor/logical/JoinableLogical.java rename to reactor/Core/src/jetbrains/mps/logic/reactor/logical/JoinableLogical.java diff --git a/reactor/API/src/jetbrains/mps/logic/reactor/logical/Logical.java b/reactor/Core/src/jetbrains/mps/logic/reactor/logical/Logical.java similarity index 100% rename from reactor/API/src/jetbrains/mps/logic/reactor/logical/Logical.java rename to reactor/Core/src/jetbrains/mps/logic/reactor/logical/Logical.java diff --git a/reactor/API/src/jetbrains/mps/logic/reactor/logical/LogicalContext.java b/reactor/Core/src/jetbrains/mps/logic/reactor/logical/LogicalContext.java similarity index 100% rename from reactor/API/src/jetbrains/mps/logic/reactor/logical/LogicalContext.java rename to reactor/Core/src/jetbrains/mps/logic/reactor/logical/LogicalContext.java diff --git a/reactor/API/src/jetbrains/mps/logic/reactor/logical/LogicalOwner.java b/reactor/Core/src/jetbrains/mps/logic/reactor/logical/LogicalOwner.java similarity index 100% rename from reactor/API/src/jetbrains/mps/logic/reactor/logical/LogicalOwner.java rename to reactor/Core/src/jetbrains/mps/logic/reactor/logical/LogicalOwner.java diff --git a/reactor/API/src/jetbrains/mps/logic/reactor/logical/MetaLogical.java b/reactor/Core/src/jetbrains/mps/logic/reactor/logical/MetaLogical.java similarity index 100% rename from reactor/API/src/jetbrains/mps/logic/reactor/logical/MetaLogical.java rename to reactor/Core/src/jetbrains/mps/logic/reactor/logical/MetaLogical.java diff --git a/reactor/API/src/jetbrains/mps/logic/reactor/logical/MultiMetaLogical.java b/reactor/Core/src/jetbrains/mps/logic/reactor/logical/MultiMetaLogical.java similarity index 100% rename from reactor/API/src/jetbrains/mps/logic/reactor/logical/MultiMetaLogical.java rename to reactor/Core/src/jetbrains/mps/logic/reactor/logical/MultiMetaLogical.java diff --git a/reactor/API/src/jetbrains/mps/logic/reactor/logical/VarSymbol.java b/reactor/Core/src/jetbrains/mps/logic/reactor/logical/VarSymbol.java similarity index 100% rename from reactor/API/src/jetbrains/mps/logic/reactor/logical/VarSymbol.java rename to reactor/Core/src/jetbrains/mps/logic/reactor/logical/VarSymbol.java diff --git a/reactor/API/src/jetbrains/mps/logic/reactor/program/AndItem.java b/reactor/Core/src/jetbrains/mps/logic/reactor/program/AndItem.java similarity index 100% rename from reactor/API/src/jetbrains/mps/logic/reactor/program/AndItem.java rename to reactor/Core/src/jetbrains/mps/logic/reactor/program/AndItem.java diff --git a/reactor/API/src/jetbrains/mps/logic/reactor/program/Constraint.java b/reactor/Core/src/jetbrains/mps/logic/reactor/program/Constraint.java similarity index 100% rename from reactor/API/src/jetbrains/mps/logic/reactor/program/Constraint.java rename to reactor/Core/src/jetbrains/mps/logic/reactor/program/Constraint.java diff --git a/reactor/API/src/jetbrains/mps/logic/reactor/program/ConstraintSymbol.java b/reactor/Core/src/jetbrains/mps/logic/reactor/program/ConstraintSymbol.java similarity index 100% rename from reactor/API/src/jetbrains/mps/logic/reactor/program/ConstraintSymbol.java rename to reactor/Core/src/jetbrains/mps/logic/reactor/program/ConstraintSymbol.java diff --git a/reactor/API/src/jetbrains/mps/logic/reactor/program/Handler.java b/reactor/Core/src/jetbrains/mps/logic/reactor/program/Handler.java similarity index 100% rename from reactor/API/src/jetbrains/mps/logic/reactor/program/Handler.java rename to reactor/Core/src/jetbrains/mps/logic/reactor/program/Handler.java diff --git a/reactor/API/src/jetbrains/mps/logic/reactor/program/InvalidConstraintException.java b/reactor/Core/src/jetbrains/mps/logic/reactor/program/InvalidConstraintException.java similarity index 100% rename from reactor/API/src/jetbrains/mps/logic/reactor/program/InvalidConstraintException.java rename to reactor/Core/src/jetbrains/mps/logic/reactor/program/InvalidConstraintException.java diff --git a/reactor/API/src/jetbrains/mps/logic/reactor/program/InvalidRuleException.java b/reactor/Core/src/jetbrains/mps/logic/reactor/program/InvalidRuleException.java similarity index 100% rename from reactor/API/src/jetbrains/mps/logic/reactor/program/InvalidRuleException.java rename to reactor/Core/src/jetbrains/mps/logic/reactor/program/InvalidRuleException.java diff --git a/reactor/API/src/jetbrains/mps/logic/reactor/program/Predicate.java b/reactor/Core/src/jetbrains/mps/logic/reactor/program/Predicate.java similarity index 100% rename from reactor/API/src/jetbrains/mps/logic/reactor/program/Predicate.java rename to reactor/Core/src/jetbrains/mps/logic/reactor/program/Predicate.java diff --git a/reactor/API/src/jetbrains/mps/logic/reactor/program/PredicateSymbol.java b/reactor/Core/src/jetbrains/mps/logic/reactor/program/PredicateSymbol.java similarity index 100% rename from reactor/API/src/jetbrains/mps/logic/reactor/program/PredicateSymbol.java rename to reactor/Core/src/jetbrains/mps/logic/reactor/program/PredicateSymbol.java diff --git a/reactor/API/src/jetbrains/mps/logic/reactor/program/Program.java b/reactor/Core/src/jetbrains/mps/logic/reactor/program/Program.java similarity index 100% rename from reactor/API/src/jetbrains/mps/logic/reactor/program/Program.java rename to reactor/Core/src/jetbrains/mps/logic/reactor/program/Program.java diff --git a/reactor/API/src/jetbrains/mps/logic/reactor/program/Rule.java b/reactor/Core/src/jetbrains/mps/logic/reactor/program/Rule.java similarity index 100% rename from reactor/API/src/jetbrains/mps/logic/reactor/program/Rule.java rename to reactor/Core/src/jetbrains/mps/logic/reactor/program/Rule.java diff --git a/reactor/API/src/jetbrains/mps/logic/reactor/program/Symbol.java b/reactor/Core/src/jetbrains/mps/logic/reactor/program/Symbol.java similarity index 100% rename from reactor/API/src/jetbrains/mps/logic/reactor/program/Symbol.java rename to reactor/Core/src/jetbrains/mps/logic/reactor/program/Symbol.java diff --git a/reactor/Core/src/jetbrains/mps/unification/TermGraphUnifier.kt b/reactor/Core/src/jetbrains/mps/unification/TermGraphUnifier.kt index 140927ec..9df260ca 100644 --- a/reactor/Core/src/jetbrains/mps/unification/TermGraphUnifier.kt +++ b/reactor/Core/src/jetbrains/mps/unification/TermGraphUnifier.kt @@ -298,7 +298,7 @@ class TermGraphUnifier { private fun idSymbol(symbol: Any): Any = when (symbol) { is String -> symbol.intern() - is Logical<*> -> symbol.findRoot() + is Logical<*> -> symbol.findRoot() else -> symbol } diff --git a/reactor/Test/pom.xml b/reactor/Test/pom.xml index 5ae5312f..3712a896 100644 --- a/reactor/Test/pom.xml +++ b/reactor/Test/pom.xml @@ -15,11 +15,6 @@ jar - - jetbrains.mps.logic.conreactor - conreactor-api - ${project.parent.version} - jetbrains.mps.logic.conreactor conreactor-core diff --git a/reactor/Test/src/jetbrains/mps/unification/test/MockTerm.java b/reactor/Test/src/jetbrains/mps/unification/test/MockTerm.java index ae6c4d88..681e4530 100644 --- a/reactor/Test/src/jetbrains/mps/unification/test/MockTerm.java +++ b/reactor/Test/src/jetbrains/mps/unification/test/MockTerm.java @@ -19,9 +19,11 @@ package jetbrains.mps.unification.test; import jetbrains.mps.logic.reactor.logical.Logical; import jetbrains.mps.logic.reactor.logical.LogicalOwner; import jetbrains.mps.unification.Term; -import sun.rmi.log.LogOutputStream; -import java.util.*; +import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; +import java.util.List; /** * Created by fyodor on 09.06.2014. diff --git a/reactor/Test/src/program/MockConstraint.kt b/reactor/Test/src/program/MockConstraint.kt index 94d7a3e3..3db32b7f 100644 --- a/reactor/Test/src/program/MockConstraint.kt +++ b/reactor/Test/src/program/MockConstraint.kt @@ -1,12 +1,8 @@ package program -import jetbrains.mps.logic.reactor.evaluation.ConstraintOccurrence -import jetbrains.mps.logic.reactor.logical.LogicalContext -import jetbrains.mps.logic.reactor.logical.MetaLogical import jetbrains.mps.logic.reactor.program.Constraint import jetbrains.mps.logic.reactor.program.ConstraintSymbol import jetbrains.mps.logic.reactor.program.Predicate -import java.util.* /** * @author Fedor Isakov diff --git a/reactor/Test/src/program/MockProgram.kt b/reactor/Test/src/program/MockProgram.kt index a5dfcbc4..266c3780 100644 --- a/reactor/Test/src/program/MockProgram.kt +++ b/reactor/Test/src/program/MockProgram.kt @@ -2,7 +2,6 @@ * @author Fedor Isakov */ -import jetbrains.mps.logic.reactor.evaluation.SessionSolver import jetbrains.mps.logic.reactor.logical.LogicalContext import jetbrains.mps.logic.reactor.logical.MetaLogical import jetbrains.mps.logic.reactor.program.* diff --git a/reactor/Test/test/RulesHelper.kt b/reactor/Test/test/RulesHelper.kt index b55b2f2f..a82f2303 100644 --- a/reactor/Test/test/RulesHelper.kt +++ b/reactor/Test/test/RulesHelper.kt @@ -2,9 +2,7 @@ import jetbrains.mps.logic.reactor.core.FrameObservable import jetbrains.mps.logic.reactor.core.LogicalObserver import jetbrains.mps.logic.reactor.core.Occurrence import jetbrains.mps.logic.reactor.core.occurrence -import jetbrains.mps.logic.reactor.evaluation.ConstraintOccurrence import jetbrains.mps.logic.reactor.logical.Logical -import jetbrains.mps.logic.reactor.logical.LogicalContext import jetbrains.mps.logic.reactor.program.* import program.MockConstraint import solver.TestEqPredicate diff --git a/reactor/Test/test/TestProgram.kt b/reactor/Test/test/TestProgram.kt index ee6b43f9..14c1d81c 100644 --- a/reactor/Test/test/TestProgram.kt +++ b/reactor/Test/test/TestProgram.kt @@ -1,6 +1,5 @@ import jetbrains.mps.logic.reactor.core.ReactorLifecycle import jetbrains.mps.logic.reactor.evaluation.EvaluationSession -import jetbrains.mps.logic.reactor.evaluation.SessionSolver import jetbrains.mps.logic.reactor.evaluation.StoreView import jetbrains.mps.logic.reactor.logical.Logical import jetbrains.mps.logic.reactor.program.ConstraintSymbol diff --git a/reactor/Test/test/jetbrains/mps/unification/test/SolverTests.java b/reactor/Test/test/jetbrains/mps/unification/test/SolverTests.java index d76afab2..b483270f 100644 --- a/reactor/Test/test/jetbrains/mps/unification/test/SolverTests.java +++ b/reactor/Test/test/jetbrains/mps/unification/test/SolverTests.java @@ -16,7 +16,6 @@ package jetbrains.mps.unification.test; -import jetbrains.mps.logic.reactor.core.LogicalObserverKt; import jetbrains.mps.logic.reactor.core.internal.LogicalImplKt; import jetbrains.mps.logic.reactor.logical.JoinableLogical; import jetbrains.mps.logic.reactor.logical.MetaLogical; diff --git a/reactor/pom.xml b/reactor/pom.xml index 12d02842..93ffc24a 100644 --- a/reactor/pom.xml +++ b/reactor/pom.xml @@ -96,7 +96,6 @@ - API Core Test