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

minor refactorings in engine (some moves & renames)

This commit is contained in:
Grigorii Kirgizov 2020-07-15 18:09:18 +03:00
parent 3bdc1123ad
commit 8cb6aa72d3
4 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
reactor/Core/src/jetbrains/mps/logic/reactor/core/RuleMatchEx.kt
View File

@ -16,6 +16,7 @@
package jetbrains.mps.logic.reactor.core
import jetbrains.mps.logic.reactor.evaluation.ConstraintOccurrence
import jetbrains.mps.logic.reactor.evaluation.RuleMatch
import jetbrains.mps.logic.reactor.program.Constraint
import jetbrains.mps.logic.reactor.program.Rule
@ -44,6 +45,9 @@ interface RuleMatchEx : RuleMatch {
inline fun RuleMatchEx.forEachReplaced(action: (Occurrence) -> Unit) =
this.matchHeadReplaced().forEach(action)
fun RuleMatch.discards(occurrence: ConstraintOccurrence): Boolean =
this.matchHeadReplaced().contains(occurrence)
fun Rule.allHeads() = (headKept().asSequence() + headReplaced().asSequence())
fun RuleMatch.allHeads() = (matchHeadKept().asSequence() + matchHeadReplaced().asSequence()) as Sequence<Occurrence>

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

@ -19,7 +19,6 @@ package jetbrains.mps.logic.reactor.core.internal
import jetbrains.mps.logic.reactor.core.*
import jetbrains.mps.logic.reactor.evaluation.EvaluationTrace
import jetbrains.mps.logic.reactor.program.IncrementalProgramSpec
import jetbrains.mps.logic.reactor.evaluation.RuleMatch
import jetbrains.mps.logic.reactor.evaluation.SessionToken
import jetbrains.mps.logic.reactor.program.Rule
import jetbrains.mps.logic.reactor.util.Profiler
@ -48,7 +47,7 @@ internal class ConstraintsProcessing(private var dispatchingFront: Dispatcher.Di
{
private val journalIndex: MatchJournal.Index = journal.index()
private val execQueue: ExecutionQueue = ExecutionQueue(journalIndex, RuleOrdering(ruleIndex))
private val activationQueue: ContinuedActivationQueue = ContinuedActivationQueue(journalIndex, RuleOrdering(ruleIndex))
private val invalidatedRulesTags: MutableSet<Any> = mutableSetOf<Any>()
@ -118,7 +117,7 @@ internal class ConstraintsProcessing(private var dispatchingFront: Dispatcher.Di
// all occurrences from the head are principal.
assert(chunk.match.allHeads().all { it.isPrincipal })
execQueue.offerAll(lastValidChunk.toPos(), validOccs.asIterable())
activationQueue.offerAll(lastValidChunk.toPos(), validOccs.asIterable())
}
} else {
lastValidChunk = chunk
@ -158,7 +157,7 @@ internal class ConstraintsProcessing(private var dispatchingFront: Dispatcher.Di
val (candRule, occChunk) = aIt.next()
val pos =
if (execQueue.canBeInserted(candRule, occChunk, chunk))
if (activationQueue.canBeInserted(candRule, occChunk, chunk))
// We need the previous chunk as pos here (i.e. adding after it).
prevChunk.toPos()
else if (!it.hasNext())
@ -167,7 +166,7 @@ internal class ConstraintsProcessing(private var dispatchingFront: Dispatcher.Di
else
continue
execQueue.offer(pos, occChunk)
activationQueue.offer(pos, occChunk)
trace.potentialMatch(occChunk.occ, candRule)
// Drop the candidate if appropriate activation place is found.
aIt.remove()
@ -180,7 +179,7 @@ internal class ConstraintsProcessing(private var dispatchingFront: Dispatcher.Di
}
fun launchQueue(controller: Controller): FeedbackStatus =
execQueue.run(controller, this)
activationQueue.run(controller, this)
/**
* Clears state unneeded between incremental sessions
@ -230,13 +229,12 @@ internal class ConstraintsProcessing(private var dispatchingFront: Dispatcher.Di
if (isFront() || !active.isPrincipal) {
matches
} else {
execQueue.postponeFutureMatches(matches)
activationQueue.postponeFutureMatches(matches)
}
val outStatus = currentMatches.fold(inStatus) { status, match ->
if (activationChunk != null && !isFront()) {
val discards = match.matchHeadReplaced().contains(active)
if (discards) {
if (match.discards(active)) {
dropDiscardingMatchesFor(activationChunk, invalidatedRulesTags)
}
}
@ -259,10 +257,7 @@ internal class ConstraintsProcessing(private var dispatchingFront: Dispatcher.Di
private fun dropDiscardingMatchesFor(ancestor: MatchJournal.OccChunk, droppedRuleTags: MutableSet<Any>) =
this.dropDescendantsWhile(ancestor) { chunk ->
if (chunk is MatchJournal.MatchChunk
&& chunk.match.matchHeadReplaced().contains(ancestor.occ))
{
if (chunk is MatchJournal.MatchChunk && chunk.match.discards(ancestor.occ)) {
droppedRuleTags.add(chunk.ruleUniqueTag)
true
} else false

2
reactor/Core/src/jetbrains/mps/logic/reactor/core/internal/ExecutionQueue.kt → reactor/Core/src/jetbrains/mps/logic/reactor/core/internal/ContinuedActivationQueue.kt
View File

@ -20,7 +20,7 @@ import jetbrains.mps.logic.reactor.core.*
import jetbrains.mps.logic.reactor.program.Rule
import java.util.*
internal class ExecutionQueue(
internal class ContinuedActivationQueue(
private val journalIndex: MatchJournal.Index,
private val ruleOrdering: RuleOrdering
) {

4
reactor/Core/src/jetbrains/mps/logic/reactor/core/internal/MatchJournalImpl.kt
View File

@ -245,7 +245,7 @@ internal open class MatchJournalImpl(
* while applying [action] to each visited [Chunk].
* No journal state is changed during operation (except by [action] effects).
*/
private fun forEachChunkFrom(from: Pos, action: (Chunk) -> Unit) {
private inline fun forEachChunkFrom(from: Pos, action: (Chunk) -> Unit) {
val to = current
do {
// there's always at least initial chunk
@ -260,7 +260,7 @@ internal open class MatchJournalImpl(
override fun replay(futurePos: Pos) = replayWith(futurePos, {})
private fun replayWith(futurePos: MatchJournal.Pos, action: (Chunk) -> Unit) {
private inline fun replayWith(futurePos: MatchJournal.Pos, action: (Chunk) -> Unit) {
do {
if (futurePos.chunk === current) {
replayOccurrences(current.entries.take(futurePos.entriesCount))