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

Properly process failed guard

This commit is contained in:
Fedor Isakov 2018-12-28 11:47:11 +01:00
parent d61e8e1370
commit 6c0a9d404b
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -91,7 +91,6 @@ class Controller(
var state : ProcessingState = instate
// for (match in matcher.matches(active, frameStack.current.store)) {
for (match in dispatchFringe.matches().toList()) {
if (!state.operational) break
@ -108,15 +107,18 @@ class Controller(
state = match.patternPredicates().fold(state, { st, prd ->
st.eval { tellPredicate(prd, match.logicalContext(), it) } })
// if (st.operational) tellPredicate(prd, match.logicalContext(), st) else st })
state = state.eval { match.rule().checkGuard(match.logicalContext(), it) }
// if (state.operational) match.rule().checkGuard(match.logicalContext(), state) else state
if (state is ABORTED) {
if (state is ABORTED) { // guard is not satisfied
trace.reject(match)
state = state.reset()
continue
} else if (state is FAILED) { // guard failed
trace.failure(state.failure)
state = state.reset()
continue
}
trace.trigger(match)