github/semantic
1
1
Fork 0
mirror of https://github.com/github/semantic.git synced 2025-01-06 06:46:07 +03:00
Code Issues Projects Releases Wiki Activity

Bounds-check before getting the (k ± 1)th diagonal.

Browse Source
This commit is contained in:
Rob Rix 2017-03-20 10:35:10 -04:00
parent 4e42d96e0c
commit d4b00fa24a
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/SES/Myers.hs
View File

@ -134,11 +134,19 @@ decompose myers = let ?callStack = popCallStack callStack in case myers of
continue
FindDPath graph (Distance d) dir (Diagonal k) -> do
(prev, prevScript) <- getK graph dir (Diagonal (pred k))
(next, nextScript) <- getK graph dir (Diagonal (succ k))
let (fromX, fromScript) = if k == negate d || k /= d && prev < next
then (next, addInBounds bs (next - succ k) That nextScript) -- downward (insertion)
else (succ prev, addInBounds as prev This prevScript) -- rightward (deletion)
(fromX, fromScript) <- if k == negate d then do
(next, nextScript) <- getK graph dir (Diagonal (succ k))
return (next, addInBounds bs (next - succ k) That nextScript) -- downward (insertion)
else if k /= d then do
(prev, prevScript) <- getK graph dir (Diagonal (pred k))
(next, nextScript) <- getK graph dir (Diagonal (succ k))
return $ if prev < next then
(next, addInBounds bs (next - succ k) That nextScript) -- downward (insertion)
else
(succ prev, addInBounds as prev This prevScript) -- rightward (deletion)
else do
(prev, prevScript) <- getK graph dir (Diagonal (pred k))
return (succ prev, addInBounds as prev This prevScript) -- rightward (deletion)
(endpoint, script) <- slide graph dir (Endpoint fromX (fromX - k)) fromScript
setK graph dir (Diagonal k) (x endpoint) script
return (direction dir endpoint (Endpoint (n - x endpoint) (m - y endpoint)))