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

Experimentally switch to the new matching algorithm

This commit is contained in:
Fedor Isakov 2018-08-01 19:42:43 +02:00
parent 74402a8a1c
commit 44b2004091
1 changed files with 28 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
reactor/Core/src/jetbrains/mps/logic/reactor/core/Controller.kt
View File

@ -43,6 +43,8 @@ class Controller(
private val matcher = Matcher(ruleIndex, profiler) private val matcher = Matcher(ruleIndex, profiler)
private var dispatchFringe = Dispatcher(ruleIndex).fringe()
// persistent (functional) object. reassigned on update // persistent (functional) object. reassigned on update
private var propHistory = PropagationHistory() private var propHistory = PropagationHistory()
@ -86,35 +88,43 @@ class Controller(
trace.reactivate(active) trace.reactivate(active)
} }
for (match in matcher.matches(active, frameStack.current.store)) { val activatedDF = dispatchFringe.activated(active)
this.dispatchFringe = activatedDF
// for (match in matcher.matches(active, frameStack.current.store)) {
for(match in dispatchFringe.allMatches.toList()) {
// TODO: paranoid check. should be isAlive() instead // TODO: paranoid check. should be isAlive() instead
if (!active.isStored()) break if (!active.isStored()) break
if (!match.successful) continue // if (!match.successful) continue
// FIXME: move this check elsewhere // FIXME: move this check elsewhere
if ((match.keptOccurrences + match.discardedOccurrences).any { co -> !co.isStored() }) continue if ((match.matchHeadKept() + match.matchHeadReplaced()).any { co -> !co.isStored() }) continue
if (propHistory.isRecorded(match)) continue
// TODO: prophistory
// if (propHistory.isRecorded(match)) continue
trace.trying(match) trace.trying(match)
for (prd in match.patternPredicates) { for (prd in match.patternPredicates()) {
tellPredicate(prd, match.logicalContext, trace) tellPredicate(prd, match.logicalContext(), trace)
} }
if (!match.rule.checkGuard(match.logicalContext, trace)) { if (!match.rule().checkGuard(match.logicalContext(), trace)) {
trace.reject(match) trace.reject(match)
continue continue
} }
trace.trigger(match) trace.trigger(match)
for (occ in match.discardedOccurrences) { for (occ in match.matchHeadReplaced()) {
this.dispatchFringe = dispatchFringe.discarded(occ)
frameStack.current.store.discard(occ) frameStack.current.store.discard(occ)
trace.discard(occ) trace.discard(occ)
} }
var failure: EvaluationFailureException? = null var failure: EvaluationFailureException? = null
for (body in match.rule.bodyAlternation()) { for (body in match.rule().bodyAlternation()) {
if (failure != null) { if (failure != null) {
trace.failure(failure) trace.failure(failure)
trace.retry(match) trace.retry(match)
@ -125,7 +135,8 @@ class Controller(
// we must reassign the field on every rule triggering // we must reassign the field on every rule triggering
// and store on the stack the last value before rule activation in order to undo in case of failure // and store on the stack the last value before rule activation in order to undo in case of failure
val savedPropHistory = propHistory val savedPropHistory = propHistory
this.propHistory = propHistory.record(match) // TODO: prophistory
// this.propHistory = propHistory.record(match)
val savedFrame = frameStack.current val savedFrame = frameStack.current
frameStack.push() frameStack.push()
@ -133,8 +144,8 @@ class Controller(
try { try {
for (item in body) { for (item in body) {
when (item) { when (item) {
is Constraint -> process(session.occurrence(item, match.logicalContext)) is Constraint -> process(session.occurrence(item, match.logicalContext()))
is Predicate -> tellPredicate(item, match.logicalContext, trace) is Predicate -> tellPredicate(item, match.logicalContext(), trace)
else -> throw IllegalArgumentException("unknown item ${item}") else -> throw IllegalArgumentException("unknown item ${item}")
} }
} }
@ -195,3 +206,8 @@ class Controller(
private val noLogicalContext: LogicalContext = object: LogicalContext { private val noLogicalContext: LogicalContext = object: LogicalContext {
override fun <V : Any> variable(metaLogical: MetaLogical<V>): Logical<V> = TODO() override fun <V : Any> variable(metaLogical: MetaLogical<V>): Logical<V> = TODO()
} }
fun MatchRule.patternPredicates() =
(rule().headKept() + rule().headReplaced()).zip(matchHeadKept() + matchHeadReplaced()).flatMap {
it.first.patternPredicates(it.second.arguments())
}.toList()