@@ -73,12 +73,6 @@ instance {-# OVERLAPPING #-} Tok.TokenParsing IdrisParser where
7373-- | Generalized monadic parsing constraint type
7474type MonadicParsing m = (P.DeltaParsing m, LookAheadParsing m, Monad m)
7575
76−class HasLastTokenSpan m where
77− getLastTokenSpan :: m (Maybe FC)
78−
79−instance HasLastTokenSpan IdrisParser where
80− getLastTokenSpan = lastTokenSpan <$> get
81−
8276newtype ParseError = ParseError { parseErrorDoc :: PP.Doc }
8377
8478-- | Helper to run Idris inner parser based stateT parsers
@@ -223,31 +217,31 @@ whiteSpace :: MonadicParsing m => m ()
223217whiteSpace = Tok.whiteSpace
224218
225219-- | Parses a string literal
226−stringLiteral :: (MonadicParsing m, HasLastTokenSpan m) => m (String, FC)
220+stringLiteral :: IdrisParser (String, FC)
227221stringLiteral = do str <- Tok.stringLiteral
228− fc <- getLastTokenSpan
222+ fc <- lastTokenSpan <$> get
229223 return (str, fromMaybe NoFC fc)
230224
231225-- | Parses a char literal
232−charLiteral :: (MonadicParsing m, HasLastTokenSpan m) => m (Char, FC)
226+charLiteral :: IdrisParser (Char, FC)
233227charLiteral = do ch <- Tok.charLiteral
234− fc <- getLastTokenSpan
228+ fc <- lastTokenSpan <$> get
235229 return (ch, fromMaybe NoFC fc)
236230
237231-- | Parses a natural number
238−natural :: (MonadicParsing m, HasLastTokenSpan m) => m (Integer, FC)
232+natural :: IdrisParser (Integer, FC)
239233natural = do n <- Tok.natural
240− fc <- getLastTokenSpan
234+ fc <- lastTokenSpan <$> get
241235 return (n, fromMaybe NoFC fc)
242236
243237-- | Parses an integral number
244−integer :: MonadicParsing m => m Integer
238+integer :: IdrisParser Integer
245239integer = Tok.integer
246240
247241-- | Parses a floating point number
248−float :: (MonadicParsing m, HasLastTokenSpan m) => m (Double, FC)
242+float :: IdrisParser (Double, FC)
249243float = do f <- Tok.double
250− fc <- getLastTokenSpan
244+ fc <- lastTokenSpan <$> get
251245 return (f, fromMaybe NoFC fc)
252246
253247{- * Symbols, identifiers, names and operators -}