on master help sign in
Merge pull request #946 from trofi/master
f596a36Edwin Brady
src/Idris/ParseHelpers.hs+4−1
@@ -1,4 +1,5 @@
1{-# LANGUAGE GeneralizedNewtypeDeriving, ConstraintKinds, PatternGuards #-}
1{-# LANGUAGE GeneralizedNewtypeDeriving, ConstraintKinds, PatternGuards #-}
2+{-# LANGUAGE StandaloneDeriving #-}
2module Idris.ParseHelpers where
3module Idris.ParseHelpers where
3
4
4import Prelude hiding (pi)
5import Prelude hiding (pi)
@@ -41,7 +42,9 @@ import Debug.Trace
41type IdrisParser = StateT IState IdrisInnerParser
42type IdrisParser = StateT IState IdrisInnerParser
42
43
43newtype IdrisInnerParser a = IdrisInnerParser { runInnerParser :: Parser a }
44newtype IdrisInnerParser a = IdrisInnerParser { runInnerParser :: Parser a }
44− deriving (Monad, Functor, MonadPlus, Applicative, Alternative, CharParsing, LookAheadParsing, Parsing, DeltaParsing, MarkParsing Delta, Monoid)
45+ deriving (Monad, Functor, MonadPlus, Applicative, Alternative, CharParsing, LookAheadParsing{-, Parsing-}, DeltaParsing, MarkParsing Delta, Monoid)
46+
47+deriving instance Parsing IdrisInnerParser
45
48
46instance TokenParsing IdrisInnerParser where
49instance TokenParsing IdrisInnerParser where
47 someSpace = many (simpleWhiteSpace <|> singleLineComment <|> multiLineComment) *> pure ()
50 someSpace = many (simpleWhiteSpace <|> singleLineComment <|> multiLineComment) *> pure ()