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

Decompose controller's processing of constraints for better separation of concerns. 

Restructure the code in controller to enable being called from an
external component.
This commit is contained in:
Fedor Isakov 2019-05-13 15:30:03 +02:00
parent bfc4b641bb
commit 11a9505ee9
5 changed files with 123 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -16,6 +16,8 @@
package jetbrains.mps.logic.reactor.core
import jetbrains.mps.logic.reactor.core.internal.FeedbackStatus
import jetbrains.mps.logic.reactor.core.internal.RuleMatchImpl
import jetbrains.mps.logic.reactor.evaluation.PredicateInvocation
import jetbrains.mps.logic.reactor.evaluation.StoreView
@ -40,4 +42,19 @@ interface Controller {
/** For tests only */
fun storeView(): StoreView
/**
* Applies necessary predicates implied by the match.
* Checks the guard.
* The returned status indicates whether the match can be processed.
*/
fun offerMatch(match: RuleMatchEx, inStatus: FeedbackStatus): FeedbackStatus
/**
* Evaluates the rule's body.
* The caller must ensure that [offerMatch] has been called before and
* its status allowed the operation.
* The returned status captures the result of evaluating the rule's body.
*/
fun processBody(match: RuleMatchEx, inStatus: FeedbackStatus): FeedbackStatus
}

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

@ -31,4 +31,6 @@ interface RuleMatchEx : RuleMatch {
*/
fun signature(): ArrayList<Id<Occurrence>?>
// TODO better be an inline extension fun
fun forEachReplaced(action: (Occurrence) -> Unit)
}

159
reactor/Core/src/jetbrains/mps/logic/reactor/core/internal/ControllerImpl.kt
View File

@ -57,7 +57,9 @@ internal class ControllerImpl (
fun activate(constraint: Constraint) : FeedbackStatus {
// FIXME noLogicalContext
val context = Context(NORMAL(), noLogicalContext)
activateConstraint(constraint, context)
return context.currentStatus()
}
@ -79,98 +81,70 @@ internal class ControllerImpl (
override fun reactivate(occ: Occurrence) {
// FIXME propagate the status further up the call stack
// TODO: introduce status to solver API?
// TODO update the stack
val status = process(occ, NORMAL())
if (status is FAILED) {
throw status.failure.failureCause()
}
}
private fun process(active: Occurrence, inStatus: FeedbackStatus) : FeedbackStatus {
assert(active.alive)
private fun processMatch(match: RuleMatchEx, inStatus: FeedbackStatus) : FeedbackStatus =
offerMatch(match, inStatus)
.let { when (it) {
is ABORTED -> { // guard is not satisfied
trace.reject(match)
return it.recover() // return from the enclosing method
return profiler.profile<FeedbackStatus>("process_${active.constraint().symbol()}") {
} is FAILED -> { // guard failed
trace.feedback(it.failure)
return it.recover() // return from the enclosing method
if (!active.stored) {
frameStack.current.store.store(active)
trace.activate(active)
} else {
trace.reactivate(active)
}
} else -> it
} }
.also { consumeMatch(match) }
.also { trace.trigger(match) }
.also { processDiscarded(match) }
.then { processBody(match, it) }
.also { trace.finish(match) }
val activatedFront = dispatchFront.expand(active)
this.dispatchFront = activatedFront
override fun offerMatch(match: RuleMatchEx, inStatus: FeedbackStatus) : FeedbackStatus =
inStatus.then { checkMatchPreconditions(match, it) }
.also { trace.trying(match) }
.then { processGuard(match, it) }
val outStatus = activatedFront.matches().toList().fold(inStatus) { status, match ->
// TODO: paranoid check. should be isAlive() instead
// FIXME: move this check elsewhere
if (status.operational && active.stored && match.allStored())
processMatch(status, match as RuleMatchImpl)
else
status
}
// TODO: should be isAlive()
if (active.stored) {
trace.suspend(active)
}
outStatus
}
}
private fun processMatch(inStatus: FeedbackStatus, match: RuleMatchImpl) : FeedbackStatus {
private fun checkMatchPreconditions(match: RuleMatchEx, inStatus: FeedbackStatus) : FeedbackStatus {
val context = Context(inStatus, match.logicalContext())
// invoke matched pattern predicates
for (prd in match.patternPredicates()) {
// normally these are safe, but unification can fail
if (!tellPredicate(prd, context)) break
}
trace.trying(match)
return context.currentStatus()
}
private fun processGuard(match: RuleMatchEx, inStatus: FeedbackStatus) : FeedbackStatus {
val context = Context(inStatus, match.logicalContext())
// check guard
for (gprd in match.rule().guard()) {
if (!askPredicate(gprd, context)) break
}
context.updateStatus { status ->
when (status) {
is ABORTED -> { // guard is not satisfied
trace.reject(match)
return status.recover()
}
is FAILED -> { // guard failed
trace.feedback(status.failure)
return status.recover()
}
else -> status
}
}
this.dispatchFront = dispatchFront.consume(match)
trace.trigger(match)
match.forEachReplaced {occ ->
this.dispatchFront = dispatchFront.contract(occ)
frameStack.current.store.discard(occ)
trace.discard(occ)
}
processBody(match, context)
trace.finish(match)
return context.currentStatus()
}
private fun processBody(match: RuleMatchImpl, context: Context) {
override fun processBody(match: RuleMatchEx, inStatus: FeedbackStatus) : FeedbackStatus {
val context = Context(inStatus, match.logicalContext())
val altIt = match.rule().bodyAlternation().iterator()
while (altIt.hasNext()) {
val body = altIt.next()
context.updateStatus { status ->
context.eval { status ->
if (status is FAILED) {
trace.retry(match)
status.recover()
@ -203,7 +177,7 @@ internal class ControllerImpl (
}
}
val altOk = context.updateStatus { status ->
val altOk = context.eval { status ->
if (status is FAILED) {
trace.feedback(status.failure)
@ -234,13 +208,65 @@ internal class ControllerImpl (
break
}
}
return context.currentStatus()
}
private fun process(active: Occurrence, inStatus: FeedbackStatus) : FeedbackStatus {
assert(active.alive)
return profiler.profile<FeedbackStatus>("process_${active.constraint().symbol()}") {
if (!active.stored) {
frameStack.current.store.store(active)
trace.activate(active)
} else {
trace.reactivate(active)
}
val activatedFront = dispatchFront.expand(active)
this.dispatchFront = activatedFront
val outStatus = activatedFront.matches().toList().fold(inStatus) { status, match ->
// TODO: paranoid check. should be isAlive() instead
// FIXME: move this check elsewhere
if (status.operational && active.stored && match.allStored())
processMatch(match as RuleMatchImpl, status)
else
status
}
// TODO: should be isAlive()
if (active.stored) {
trace.suspend(active)
}
outStatus
}
}
private fun consumeMatch(match: RuleMatchEx) {
this.dispatchFront = dispatchFront.consume(match)
}
private fun processDiscarded (match: RuleMatchEx) {
match.forEachReplaced { occ ->
this.dispatchFront = dispatchFront.contract(occ)
frameStack.current.store.discard(occ)
trace.discard(occ)
}
}
private fun activateConstraint(constraint: Constraint, context: Context) : Boolean {
val args = supervisor.instantiateArguments(constraint.arguments(), context.logicalContext, context)
return context.updateStatus { status ->
return context.eval { status ->
// TODO update the state stack
val active = constraint.occurrence(this, args, context.logicalContext)
process(active, status)
}
}
@ -271,6 +297,9 @@ internal class ControllerImpl (
override fun <V : Any> variable(metaLogical: MetaLogical<V>): Logical<V>? = null
}
private inline fun FeedbackStatus.then(action: (FeedbackStatus) -> FeedbackStatus) : FeedbackStatus =
if (operational) action(this) else this
private fun RuleMatch.patternPredicates() =
(rule().headKept() + rule().headReplaced()).zip(matchHeadKept() + matchHeadReplaced()).flatMap {
it.first.patternPredicates(it.second.arguments())
@ -296,7 +325,7 @@ internal class ControllerImpl (
block.invoke(status)
}
inline fun updateStatus(block: (FeedbackStatus) -> FeedbackStatus) : Boolean {
inline fun eval(block: (FeedbackStatus) -> FeedbackStatus) : Boolean {
this.status = block.invoke(status)
return status.operational
}

2
reactor/Core/src/jetbrains/mps/logic/reactor/core/internal/RuleMatchImpl.kt
View File

@ -48,7 +48,7 @@ internal class RuleMatchImpl(private val rule: Rule,
}
inline fun forEachReplaced(action: (Occurrence) -> Unit) =
override fun forEachReplaced(action: (Occurrence) -> Unit) =
headReplaced.forEach(action)
override fun signature(): ArrayList<Id<Occurrence>?> =

9
reactor/Test/test/RulesHelper.kt
View File

@ -1,4 +1,5 @@
import jetbrains.mps.logic.reactor.core.*
import jetbrains.mps.logic.reactor.core.internal.FeedbackStatus
import jetbrains.mps.logic.reactor.evaluation.PredicateInvocation
import jetbrains.mps.logic.reactor.evaluation.StoreView
import jetbrains.mps.logic.reactor.logical.Logical
@ -159,6 +160,14 @@ class MockController : Controller {
override fun storeView(): StoreView {
TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
}
override fun offerMatch(match: RuleMatchEx, inStatus: FeedbackStatus): FeedbackStatus {
TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
}
override fun processBody(match: RuleMatchEx, inStatus: FeedbackStatus): FeedbackStatus {
TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
}
}
class ConjBuilder(val type: Class<out AndItem>) {