@@ -318,8 +318,8 @@ identifier :: (MonadicParsing m) => m (String, FC)
318identifier = P.try $ do
318identifier = P.try $ do
319 (FC f (l, c) _) <- getFC
319 (FC f (l, c) _) <- getFC
320 ident <- identifierOrReserved
320 ident <- identifierOrReserved
321− when (ident `HS.member` reservedIdentifiers) $ P.unexpected undefined --FIXME: $ "reserved " ++ ident
321+ when (ident `HS.member` reservedIdentifiers) $ P.unexpected . P.Label . fromList $ "reserved " ++ ident
322− when (ident == "_") $ P.unexpected undefined --FIXME: "wildcard"
322+ when (ident == "_") $ P.unexpected . P.Label . fromList $ "wildcard"
323 return (ident, FC f (l, c) (l, c + length ident))
323 return (ident, FC f (l, c) (l, c + length ident))
325-- | Parses an identifier with possible namespace as a name
325-- | Parses an identifier with possible namespace as a name
@@ -331,7 +331,7 @@ maybeWithNS :: (MonadicParsing m) => m (String, FC) -> Bool -> [String] -> m (Na
331maybeWithNS parser ascend bad = do
331maybeWithNS parser ascend bad = do
332 fc <- getFC
332 fc <- getFC
333 i <- P.option "" (P.lookAhead (fst <$> identifier))
333 i <- P.option "" (P.lookAhead (fst <$> identifier))
334− when (i `elem` bad) $ P.unexpected undefined --FIXME: "reserved identifier"
334+ when (i `elem` bad) $ P.unexpected . P.Label . fromList $ "reserved identifier"
335 let transf = if ascend then id else reverse
335 let transf = if ascend then id else reverse
336 (x, xs, fc) <- P.choice (transf (parserNoNS parser : parsersNS parser i))
336 (x, xs, fc) <- P.choice (transf (parserNoNS parser : parsersNS parser i))
337 return (mkName (x, xs), fc)
337 return (mkName (x, xs), fc)