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

Rename dropAnonymous to skipTokens.

Browse Source
This commit is contained in:
Rob Rix 2017-08-16 12:35:44 -04:00
parent b0f3d967c5
commit 35c69f6ba1
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -275,17 +275,17 @@ runAssignment source = \ assignment state -> go assignment state >>= requireExha
Source -> Left (makeError node) Source -> Left (makeError node)
Label child label -> go child state `catchError` (\ err -> throwError err { errorExpected = [Left label] }) >>= uncurry yield Label child label -> go child state `catchError` (\ err -> throwError err { errorExpected = [Left label] }) >>= uncurry yield
state@State{..} = if not (null expectedSymbols) && all ((== Regular) . symbolType) expectedSymbols then dropAnonymous initialState else initialState state@State{..} = if not (null expectedSymbols) && all ((== Regular) . symbolType) expectedSymbols then skipTokens initialState else initialState
expectedSymbols = firstSet (assignment `Then` return) expectedSymbols = firstSet (assignment `Then` return)
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 :: HasCallStack => (result, State ast grammar) -> Either (Error (Either String grammar)) (result, State ast grammar)
requireExhaustive (a, state) = let state' = dropAnonymous 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)))
dropAnonymous state = state { stateNodes = dropWhile ((/= Regular) . symbolType . nodeSymbol . headF . runCofree) (stateNodes state) } skipTokens state = state { stateNodes = dropWhile ((/= Regular) . symbolType . nodeSymbol . headF . runCofree) (stateNodes state) }
-- | Advances the state past the current (head) node (if any), dropping it off stateNodes, and updating stateOffset & statePos to its end; or else returns the state unchanged. -- | Advances the state past the current (head) node (if any), dropping it off stateNodes, and updating stateOffset & statePos to its end; or else returns the state unchanged.
advanceState :: State ast grammar -> State ast grammar advanceState :: State ast grammar -> State ast grammar