SCP-1731 - Static analysis checks choice bounds after picking a branc…

…h in Choice (instead of before) (#2635)
IntersectMBO · Jan 20, 2021 · 84f537f · 84f537f
1 parent 42f4fd4
commit 84f537f
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/marlowe/src/Language/Marlowe/Analysis/FSSemantics.hs b/marlowe/src/Language/Marlowe/Analysis/FSSemantics.hs
@@ -435,8 +435,8 @@ isValidAndFailsWhen oa hasErr (Case (Choice choId bnds) cont:rest)
                                        hasErr (Just symInput) timeout sState pos cont
      contTrace <- isValidAndFailsWhen oa hasErr rest timeout timCont
                                       newPreviousMatch sState (pos + 1)
-     return (ite (newCond .&& sNot clashResult)
-                 (ensureBounds concVal bnds .&& newTrace)
+     return (ite (newCond .&& sNot clashResult .&& ensureBounds concVal bnds)
+                 newTrace
                  contTrace)
 isValidAndFailsWhen oa hasErr (Case (Notify obs) cont:rest)
                     timeout timCont previousMatch sState pos =