github/semantic
1
1
Fork 0
mirror of https://github.com/github/semantic.git synced 2024-12-21 13:51:44 +03:00
Code Issues Projects Releases Wiki Activity

Pull requireExhaustive out to the top level.

Browse Source
This commit is contained in:
Rob Rix 2017-08-16 12:36:32 -04:00
parent b14ec8b99a
commit 1f36dc6136
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Data/Syntax/Assignment.hs
View File

@ -280,10 +280,10 @@ runAssignment source = \ assignment state -> go assignment state >>= requireExha
makeError :: HasCallStack => Maybe (Node grammar) -> Error (Either String grammar) makeError :: HasCallStack => Maybe (Node grammar) -> Error (Either String grammar)
makeError = maybe (Error (Info.Span statePos statePos) (fmap Right expectedSymbols) Nothing) (nodeError (fmap Right expectedSymbols)) makeError = maybe (Error (Info.Span statePos statePos) (fmap Right expectedSymbols) Nothing) (nodeError (fmap Right expectedSymbols))
requireExhaustive :: HasCallStack => (result, State ast grammar) -> Either (Error (Either String grammar)) (result, State ast grammar) requireExhaustive :: (Symbol grammar, HasCallStack) => (result, State ast grammar) -> Either (Error (Either String grammar)) (result, State ast grammar)
requireExhaustive (a, state) = let state' = skipTokens state in case stateNodes state' of requireExhaustive (a, state) = let state' = skipTokens state in case stateNodes state' of
[] -> Right (a, state') [] -> Right (a, state')
node : _ -> Left (nodeError [] (headF (runCofree node))) node : _ -> Left (nodeError [] (headF (runCofree node)))
skipTokens :: Symbol grammar => State ast grammar -> State ast grammar skipTokens :: Symbol grammar => State ast grammar -> State ast grammar
skipTokens state = state { stateNodes = dropWhile ((/= Regular) . symbolType . nodeSymbol . headF . runCofree) (stateNodes state) } skipTokens state = state { stateNodes = dropWhile ((/= Regular) . symbolType . nodeSymbol . headF . runCofree) (stateNodes state) }