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

Sort the End case to the top.

Browse Source
This commit is contained in:
Rob Rix 2017-08-06 11:55:48 -04:00
parent 3ab717f18f
commit a31e1ce086
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -297,6 +297,8 @@ runAssignment toNode source = (\ assignment state -> go assignment state >>= req
_ -> anywhere (Just node) _ -> anywhere (Just node)
anywhere node = case assignment of anywhere node = case assignment of
End | Nothing <- node -> yield () state
| otherwise -> Left (makeError node, state)
Location -> yield (Info.Range stateOffset stateOffset :. Info.Span statePos statePos :. Nil) state Location -> yield (Info.Range stateOffset stateOffset :. Info.Span statePos statePos :. Nil) state
Many rule -> fix (\ recur state -> (go rule state >>= \ (a, state') -> first (a:) <$> if state == state' then pure ([], state') else recur state') `catchError` const (pure ([], state))) state >>= uncurry yield Many rule -> fix (\ recur state -> (go rule state >>= \ (a, state') -> first (a:) <$> if state == state' then pure ([], state') else recur state') `catchError` const (pure ([], state))) state >>= uncurry yield
Alt as -> sconcat (flip yield state <$> as) Alt as -> sconcat (flip yield state <$> as)
@ -306,8 +308,6 @@ runAssignment toNode source = (\ assignment state -> go assignment state >>= req
Project{} -> Left (makeError node, state) Project{} -> Left (makeError node, state)
Children{} -> Left (makeError node, state) Children{} -> Left (makeError node, state)
Source -> Left (makeError node, state) Source -> Left (makeError node, state)
End | Nothing <- node -> yield () state
| otherwise -> Left (makeError node, state)
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 dropAnonymous initialState else initialState
expectedSymbols = firstSet (assignment `Then` return) expectedSymbols = firstSet (assignment `Then` return)