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

Don't clear Dispatcher state for discarded match heads: it's unnecessary

This commit is contained in:
Grigorii Kirgizov 2020-07-14 15:35:55 +03:00
parent 53d0bd2060
commit f402ce33c8
2 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
reactor/Core/src/jetbrains/mps/logic/reactor/core/internal/ConstraintsProcessing.kt
View File

@ -106,19 +106,16 @@ internal class ConstraintsProcessing(private var dispatchingFront: Dispatcher.Di
dispatchingFront = dispatchingFront.forget(chunk.match as RuleMatchEx) dispatchingFront = dispatchingFront.forget(chunk.match as RuleMatchEx)
// Need to 'cancel' discarding. // Valid head occurrences could match more rules
// These nodes may become valid and will be processed due to reactivation of needed occurrences. // without this match, so need to reactivate them.
chunk.match.matchHeadReplaced().forEach { // E.g. occurrences discarded in this match on
dispatchingFront = dispatchingFront.forget(it as Occurrence) // previous run but revived here can match more rules.
}
// We removed the match, so need to reactivate all still valid occurrences from the head.
val matchedOccs = chunk.match.allHeads().asIterable() val matchedOccs = chunk.match.allHeads().asIterable()
val validOccs = matchedOccs.filter { occ -> val validOccs = matchedOccs.filter { occ ->
!occ.justifiedByAny(justificationRoots) !occ.justifiedByAny(justificationRoots)
} }
// By definition of Chunk and principal rule, all occurrences from the head are principal // By definition of Chunk and principal rule, all occurrences from the head are principal
assert(matchedOccs.all { it.isPrincipal() }) assert(chunk.match.allHeads().all { it.isPrincipal() })
execQueue.offerAll(validOccs) execQueue.offerAll(validOccs)
} }

3
reactor/Core/src/jetbrains/mps/logic/reactor/core/internal/ExecutionQueue.kt
View File

@ -126,9 +126,6 @@ internal class ExecutionQueue(
return (childChunksEnded || placeToInsertFound) return (childChunksEnded || placeToInsertFound)
} }
// todo: do need to reactivate only the main, matching~activating match?
// (i.e. don't reactivate additional, inactive heads that only completed the match?)
fun offerAll(occs: Iterable<Occurrence>): Boolean = fun offerAll(occs: Iterable<Occurrence>): Boolean =
execQueue.addAll(occs.mapNotNull { occ -> execQueue.addAll(occs.mapNotNull { occ ->
journalIndex.activatingChunkOf(occ)?.let { occChunk -> journalIndex.activatingChunkOf(occ)?.let { occChunk ->