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

Define dropAnonymous closed over the projection.

Browse Source
This commit is contained in:
Rob Rix 2017-07-22 14:24:43 -04:00
parent 8404b320b6
commit 8be255dfd7
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -270,7 +270,7 @@ runAssignment toNode source assignment state = go assignment state >>= requireEx
(Catch during handler, _) -> either (flip yield state . handler) Right (yield during state)
(_, []) -> Left (Error (statePos state) (UnexpectedEndOfInput expectedSymbols))
(_, ast:_) -> let Node symbol _ (Info.Span spanStart _) = toNode (F.project ast) in Left (Error spanStart (UnexpectedSymbol expectedSymbols symbol))
where state | any ((/= Regular) . symbolType) expectedSymbols = dropAnonymous toNode initialState
where state | any ((/= Regular) . symbolType) expectedSymbols = dropAnonymous initialState
| otherwise = initialState
expectedSymbols | Choose choices <- assignment = choiceSymbols choices
| otherwise = []
@ -285,14 +285,12 @@ runAssignment toNode source assignment state = go assignment state >>= requireEx
| otherwise -> ([a], state')
{-# INLINE runMany #-}
requireExhaustive :: forall a. (a, AssignmentState ast grammar) -> Either (Error grammar) (a, AssignmentState ast grammar)
requireExhaustive (a, state) = case stateNodes (dropAnonymous toNode state) of
requireExhaustive (a, state) = case stateNodes (dropAnonymous state) of
[] -> Right (a, state)
node : _ | Node nodeSymbol _ (Info.Span spanStart _) <- toNode (F.project node) ->
Left $ fromMaybe (Error spanStart (UnexpectedSymbol [] nodeSymbol)) (stateError state)
dropAnonymous :: (Symbol grammar, Recursive ast) => (forall x. Base ast x -> Node grammar) -> AssignmentState ast grammar -> AssignmentState ast grammar
dropAnonymous toNode state = state { stateNodes = dropWhile ((/= Regular) . symbolType . nodeSymbol . toNode . F.project) (stateNodes state) }
dropAnonymous state = state { stateNodes = dropWhile ((/= Regular) . symbolType . nodeSymbol . toNode . F.project) (stateNodes state) }
-- | Advances the state past the current (head) node (if any), dropping it off
-- stateNodes & its corresponding bytes off of source, and updating stateOffset &