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

Errors record the symbol of the current node (if any).

Browse Source
This commit is contained in:
Rob Rix 2017-04-28 15:49:00 -04:00
parent 0168773814
commit 8872a7ec6a
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -81,7 +81,11 @@ type AST grammar = Rose (Node grammar)
data Result symbol a = Result [Error symbol] (Maybe a) data Result symbol a = Result [Error symbol] (Maybe a)
deriving (Eq, Foldable, Functor, Traversable) deriving (Eq, Foldable, Functor, Traversable)
data Error symbol = Error { errorPos :: Info.SourcePos, errorSymbols :: [symbol] } data Error symbol = Error
{ errorPos :: Info.SourcePos
, errorExpected :: [symbol]
, errorActual :: Maybe symbol
}
deriving (Eq, Show) deriving (Eq, Show)
-- | Run an assignment of nodes in a grammar onto terms in a syntax, discarding any unparsed nodes. -- | Run an assignment of nodes in a grammar onto terms in a syntax, discarding any unparsed nodes.
@ -92,7 +96,7 @@ assignAllFrom :: (Symbol grammar, Enum grammar, Eq grammar, Show grammar) => Ass
assignAllFrom assignment state = case runAssignment assignment state of assignAllFrom assignment state = case runAssignment assignment state of
Result es (Just (state, a)) -> case stateNodes (dropAnonymous state) of Result es (Just (state, a)) -> case stateNodes (dropAnonymous state) of
[] -> Result [] (Just (state, a)) [] -> Result [] (Just (state, a))
_:_ -> Result (Error (statePos state) [] : es) Nothing Rose (s :. _) _ :_ -> Result (Error (statePos state) [] (Just s) : es) Nothing
r -> r r -> r
-- | Run an assignment of nodes in a grammar onto terms in a syntax. -- | Run an assignment of nodes in a grammar onto terms in a syntax.
@ -109,7 +113,7 @@ runAssignment = iterFreer run . fmap (\ a state -> Result [] (Just (state, a)))
(Choose choices, Rose (symbol :. _) _ : _) | Just a <- IntMap.lookup (fromEnum symbol) choices -> yield a state (Choose choices, Rose (symbol :. _) _ : _) | Just a <- IntMap.lookup (fromEnum symbol) choices -> yield a state
-- Nullability: some rules, e.g. 'pure a' and 'many a', should match at the end of input. Either side of an alternation may be nullable, ergo Alt can match at the end of input. -- Nullability: some rules, e.g. 'pure a' and 'many a', should match at the end of input. Either side of an alternation may be nullable, ergo Alt can match at the end of input.
(Alt a b, _) -> yield a state <|> yield b state (Alt a b, _) -> yield a state <|> yield b state
_ -> Result [ Error statePos expectedSymbols ] Nothing _ -> Result [ Error statePos expectedSymbols (rhead . roseValue <$> listToMaybe stateNodes) ] Nothing
where state@AssignmentState{..} = dropAnonymous initialState where state@AssignmentState{..} = dropAnonymous initialState
expectedSymbols = case assignment of expectedSymbols = case assignment of
Choose choices -> ((toEnum :: Int -> grammar) <$> IntMap.keys choices) Choose choices -> ((toEnum :: Int -> grammar) <$> IntMap.keys choices)
@ -165,7 +169,9 @@ instance (Show symbol, Show a) => Show (Result symbol a) where
showsPrec = showsPrec2 showsPrec = showsPrec2
instance Show1 Error where instance Show1 Error where
liftShowsPrec sp sl d (Error p s) = showsBinaryWith showsPrec (liftShowsPrec sp sl) "Error" d p s liftShowsPrec sp sl d (Error p e a) = showsTernaryWith showsPrec (liftShowsPrec sp sl) (liftShowsPrec sp sl) "Error" d p e a
where showsTernaryWith sp1 sp2 sp3 name d x y z = showParen (d > 10) $
showString name . showChar ' ' . sp1 11 x . showChar ' ' . sp2 11 y . showChar ' ' . sp3 11 z
instance Applicative (Result symbol) where instance Applicative (Result symbol) where
pure = Result [] . Just pure = Result [] . Just