natas_hw
/
mps-coderules
mirror of https://github.com/JetBrains/mps-coderules
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "Add ReactivateBlock in Rete Matcher to correctly handle reactivation. Fixes MPSCR-17" 

This reverts commit f96155496f.
I need to revert this commit to avoid merging problems. Going to reapply
it later if necessary.
This commit is contained in:
Fedor Isakov 2019-11-24 13:34:07 +01:00
parent f96155496f
commit 65f7b493be
1 changed files with 3 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
reactor/Core/src/jetbrains/mps/logic/reactor/core/internal/ReteRuleMatcherImpl.kt
View File

@ -291,24 +291,6 @@ internal class ReteRuleMatcherImpl(private var ruleLookup: RuleLookup,
occurrence !== occ && from.containsOccurrence(occ) // reference neq!
}
inner class ReactivateBlock (occurrence: Occurrence, val from: Layer) : DelayedBlock(occurrence) {
override fun proto(): Layer? = null
override fun complete(droppedFootprint: Footprint?, sink: (ReteNode) -> Unit) {
if (droppedFootprint?.contains(occurrence.identity) ?: false) return
for (n in from.allNodes(droppedFootprint)) {
if (n.containsOccurrence(occurrence)) {
sink(n)
}
}
}
override fun containsOccurrence(occ: Occurrence): Boolean =
occurrence === occ || from.containsOccurrence(occ) // reference eq!
}
/**
* Collection of [Layer] instances.
* The new layers are prepended to the [layers] list.
@ -333,18 +315,14 @@ internal class ReteRuleMatcherImpl(private var ruleLookup: RuleLookup,
var lastLayer: Layer? = null
for (currLayer in layers) {
// `!reactivated` is to avoid adding new IntroBlock for InitialNode-s on reactivated
if (!currLayer.final && !reactivated) {
if (!currLayer.final) {
newLayers.add(Layer(
currLayer.vacancies - 1,
IntroBlock(occurrence, headPosMask, currLayer),
lastLayer))
} else if (currLayer.final && reactivated) {
newLayers.add(Layer(
currLayer.vacancies, // == 0
ReactivateBlock(occurrence, currLayer),
lastLayer))
} else if (reactivated) {
newLayers.add(currLayer)
}
lastLayer = currLayer