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

Pull the Source case up a level.

Browse Source
This commit is contained in:
Rob Rix 2017-04-26 13:33:52 -04:00
parent f781118abb
commit a6b5fa0634
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

@ -102,8 +102,9 @@ runAssignment = iterFreer run . fmap (\ a state -> Result (state, a))
(Alt a b, _) -> yield a state <|> yield b state (Alt a b, _) -> yield a state <|> yield b state
(Location, Rose (_ :. location) _ : _) -> yield location state (Location, Rose (_ :. location) _ : _) -> yield location state
(Location, []) -> yield (Info.Range stateOffset stateOffset :. Info.SourceSpan statePos statePos :. Nil) state (Location, []) -> yield (Info.Range stateOffset stateOffset :. Info.SourceSpan statePos statePos :. Nil) state
(assignment, subtree@(Rose (symbol :. range :. _ :. Nil) children) : _) -> case assignment of (Source, Rose (_ :. range :. _) _ : _) -> yield (Source.sourceText (Source.slice (offsetRange range (negate stateOffset)) stateSource)) (advanceState state)
Source -> yield (Source.sourceText (Source.slice (offsetRange range (negate stateOffset)) stateSource)) (advanceState state) (Source, []) -> Error [ "Expected leaf node but got end of input." ]
(assignment, subtree@(Rose (symbol :. _) children) : _) -> case assignment of
Children childAssignment -> do Children childAssignment -> do
c <- assignAllFrom childAssignment state { stateNodes = children } c <- assignAllFrom childAssignment state { stateNodes = children }
yield c (advanceState state) yield c (advanceState state)
@ -111,7 +112,6 @@ runAssignment = iterFreer run . fmap (\ a state -> Result (state, a))
Just a -> yield a state Just a -> yield a state
Nothing -> Error ["Expected one of " <> showChoices choices <> " but got " <> show symbol] Nothing -> Error ["Expected one of " <> showChoices choices <> " but got " <> show symbol]
_ -> Error ["No rule to match " <> show subtree] _ -> Error ["No rule to match " <> show subtree]
(Source, []) -> Error [ "Expected leaf node but got end of input." ]
(Children _, []) -> Error [ "Expected branch node but got end of input." ] (Children _, []) -> Error [ "Expected branch node but got end of input." ]
(Choose choices, []) -> Error [ "Expected one of " <> showChoices choices <> " but got end of input." ] (Choose choices, []) -> Error [ "Expected one of " <> showChoices choices <> " but got end of input." ]
_ -> Error ["No rule to match at end of input."] _ -> Error ["No rule to match at end of input."]