From 78deea3df27a1e9efdd9dd033b70f2bc53e057c5 Mon Sep 17 00:00:00 2001 From: Fedor Isakov Date: Fri, 4 Oct 2024 10:40:44 +0200 Subject: [PATCH] Drop obsolete interface --- .../mps/logic/reactor/core/RuleIndex.kt | 4 +-- .../mps/logic/reactor/core/RuleLookup.kt | 31 ------------------- .../core/internal/ReteRuleMatcherImpl.kt | 4 --- reactor/Test/test/RulesHelper.kt | 4 +-- 4 files changed, 2 insertions(+), 41 deletions(-) delete mode 100644 reactor/Core/src/jetbrains/mps/logic/reactor/core/RuleLookup.kt 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 63441125..6f34686f 100644 --- a/reactor/Core/src/jetbrains/mps/logic/reactor/core/RuleIndex.kt +++ b/reactor/Core/src/jetbrains/mps/logic/reactor/core/RuleIndex.kt @@ -41,7 +41,7 @@ fun emptyHeadBits() = BitSet() * * @author Fedor Isakov */ -class RuleIndex(rules: Iterable, profiler: Profiler? = null) : RuleLookup +class RuleIndex(rules: Iterable, profiler: Profiler? = null) { private class OrderedRule(var order: Int, val rule: Rule) @@ -64,8 +64,6 @@ class RuleIndex(rules: Iterable, profiler: Profiler? = null) : RuleLookup } } - override fun lookupRuleByTag(tag: Any): Rule? = tag2rule[tag] - /** * Returns instances of [Rule] that can potentially match the specified [ConstraintOccurrence]. */ diff --git a/reactor/Core/src/jetbrains/mps/logic/reactor/core/RuleLookup.kt b/reactor/Core/src/jetbrains/mps/logic/reactor/core/RuleLookup.kt deleted file mode 100644 index dfc8fa31..00000000 --- a/reactor/Core/src/jetbrains/mps/logic/reactor/core/RuleLookup.kt +++ /dev/null @@ -1,31 +0,0 @@ -/* - * 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package jetbrains.mps.logic.reactor.core - -import jetbrains.mps.logic.reactor.program.Rule - -/** - * Enables to lookup a rule by the tag, which uniquely identifies the rule. - * - * @author Fedor Isakov - */ - -interface RuleLookup { - - fun lookupRuleByTag(tag: Any): Rule? - -} diff --git a/reactor/Core/src/jetbrains/mps/logic/reactor/core/internal/ReteRuleMatcherImpl.kt b/reactor/Core/src/jetbrains/mps/logic/reactor/core/internal/ReteRuleMatcherImpl.kt index d3cfd8f5..73a9b5a5 100644 --- a/reactor/Core/src/jetbrains/mps/logic/reactor/core/internal/ReteRuleMatcherImpl.kt +++ b/reactor/Core/src/jetbrains/mps/logic/reactor/core/internal/ReteRuleMatcherImpl.kt @@ -55,10 +55,6 @@ internal class ReteRuleMatcherImpl(private val rule: Rule) : RuleMatcher override fun rule() = lookupRule() -// override fun setRuleLookup(ruleLookup: RuleLookup) { this.ruleLookup = ruleLookup } -// -// override fun resetRuleLookup() { this.ruleLookup = null } - override fun newProbe(): RuleMatchingProbe = ReteNetwork(head.size).also { probe = it } override fun probe(): RuleMatchingProbe = probe ?: newProbe() diff --git a/reactor/Test/test/RulesHelper.kt b/reactor/Test/test/RulesHelper.kt index df5d2b94..bf50116c 100644 --- a/reactor/Test/test/RulesHelper.kt +++ b/reactor/Test/test/RulesHelper.kt @@ -12,7 +12,7 @@ import java.util.* * @author Fedor Isakov */ -class Builder(var rulesList: List) : RuleLookup { +class Builder(var rulesList: List) { val tag2rule = LinkedHashMap() @@ -26,8 +26,6 @@ class Builder(var rulesList: List) : RuleLookup { val rules: List get() = tag2rule.values.toList() - override fun lookupRuleByTag(tag: Any): Rule? = tag2rule[tag] - fun ruleMatcher(): RuleMatcher = createRuleMatcher(rules.first()) fun program(name: String): Program = programBuilder.program(name, rulesList)