1
1
mirror of https://github.com/github/semantic.git synced 2024-12-22 22:31:36 +03:00

Don’t backtrack for Alt.

This commit is contained in:
Rob Rix 2017-08-06 05:49:22 -04:00
parent 07e26d03e2
commit 697ccf1154

View File

@ -293,7 +293,9 @@ runAssignment toNode source = (\ assignment state -> disamb Left (Right . minimu
Location -> yield (Info.Range stateOffset stateOffset :. Info.Span statePos statePos :. Nil) state Location -> yield (Info.Range stateOffset stateOffset :. Info.Span statePos statePos :. Nil) state
Choose _ _ (Just atEnd) -> yield atEnd state Choose _ _ (Just atEnd) -> yield atEnd state
Many rule -> fix (\ recur state -> (go rule state >>= \ (a, state') -> first (a:) <$> if state == state' then pure ([], state') else recur state') <> 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') <> pure ([], state)) state >>= uncurry yield
Alt as -> Some as >>= flip yield state Alt as -> foldr (\ each next -> case yield each state of
None (err, state') -> if state == state' then next else None (err, state')
Some as -> Some as) (None (makeError node, state)) as
Throw e -> None (e, state) Throw e -> None (e, state)
Catch during handler -> go during state `catchError` (flip go state { stateErrorCounter = succ stateErrorCounter } . handler . fst) >>= uncurry yield Catch during handler -> go during state `catchError` (flip go state { stateErrorCounter = succ stateErrorCounter } . handler . fst) >>= uncurry yield
Choose{} -> None (makeError node, state) Choose{} -> None (makeError node, state)