github/semantic
1
1
Fork 0
mirror of https://github.com/github/semantic.git synced 2024-12-11 08:45:48 +03:00
Code Issues Projects Releases Wiki Activity

Bounds-check insertions/deletions.

Browse Source
This commit is contained in:
Rob Rix 2017-03-22 16:18:49 -04:00
parent bd766c70d6
commit aa4aa4438f
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/SES/Myers.hs
View File

@ -122,17 +122,17 @@ decompose myers = let ?callStack = popCallStack callStack in case myers of
return (Endpoint 0 0, []) return (Endpoint 0 0, [])
else if k == negate d then do else if k == negate d then do
(Endpoint nextX nextY, nextScript) <- getK graph (Diagonal (succ k)) (Endpoint nextX nextY, nextScript) <- getK graph (Diagonal (succ k))
return (Endpoint nextX (succ nextY), That (bs Vector.! nextY) : nextScript) -- downward (insertion) return (Endpoint nextX (succ nextY), if nextY < m then That (bs ! nextY) : nextScript else nextScript) -- downward (insertion)
else if k /= d then do else if k /= d then do
(Endpoint prevX prevY, prevScript) <- getK graph (Diagonal (pred k)) (Endpoint prevX prevY, prevScript) <- getK graph (Diagonal (pred k))
(Endpoint nextX nextY, nextScript) <- getK graph (Diagonal (succ k)) (Endpoint nextX nextY, nextScript) <- getK graph (Diagonal (succ k))
return $ if prevX < nextX then return $ if prevX < nextX then
(Endpoint nextX (succ nextY), That (bs Vector.! nextY) : nextScript) -- downward (insertion) (Endpoint nextX (succ nextY), if nextY < m then That (bs ! nextY) : nextScript else nextScript) -- downward (insertion)
else else
(Endpoint (succ prevX) prevY, This (as Vector.! prevX) : prevScript) -- rightward (deletion) (Endpoint (succ prevX) prevY, if prevX < n then This (as ! prevX) : prevScript else prevScript) -- rightward (deletion)
else do else do
(Endpoint prevX prevY, prevScript) <- getK graph (Diagonal (pred k)) (Endpoint prevX prevY, prevScript) <- getK graph (Diagonal (pred k))
return (Endpoint (succ prevX) prevY, This (as Vector.! prevX) : prevScript) -- rightward (deletion) return (Endpoint (succ prevX) prevY, if prevX < n then This (as ! prevX) : prevScript else prevScript) -- rightward (deletion)
(endpoint, script) <- slide graph from fromScript (endpoint, script) <- slide graph from fromScript
setK graph (Diagonal k) (x endpoint) script setK graph (Diagonal k) (x endpoint) script
return endpoint return endpoint
@ -164,6 +164,11 @@ decompose myers = let ?callStack = popCallStack callStack in case myers of
where (EditGraph as bs, n, m) = editGraph myers where (EditGraph as bs, n, m) = editGraph myers
(!) :: HasCallStack => Vector.Vector a -> Int -> a
v ! i | i < length v = v Vector.! i
| otherwise = let ?callStack = fromCallSiteList (filter ((/= "M") . fst) (getCallStack callStack)) in
throw (MyersException ("index " <> show i <> " out of bounds") callStack)
fail :: (HasCallStack, Monad m) => String -> m a fail :: (HasCallStack, Monad m) => String -> m a
fail s = let ?callStack = fromCallSiteList (filter ((/= "M") . fst) (getCallStack callStack)) in fail s = let ?callStack = fromCallSiteList (filter ((/= "M") . fst) (getCallStack callStack)) in
throw (MyersException s callStack) throw (MyersException s callStack)