git.iko.soy/Idris-dev
on master help sign in
Instance docs: hide conflicting Err import
7733fbaAdam Sandberg Eriksson
src/Idris/Parser.hs+4−4
compare with master
unifiedsplit
@@ -9,7 +9,7 @@ module Idris.Parser(module Idris.Parser,
9import Prelude hiding (pi)
9import Prelude hiding (pi)
10
10
11import Text.Trifecta.Delta
11import Text.Trifecta.Delta
12−import Text.Trifecta hiding (span, stringLiteral, charLiteral, natural, symbol, char, string, whiteSpace)
12+import Text.Trifecta hiding (span, stringLiteral, charLiteral, natural, symbol, char, string, whiteSpace, Err)
13import Text.Parser.LookAhead
13import Text.Parser.LookAhead
14import Text.Parser.Expression
14import Text.Parser.Expression
15import qualified Text.Parser.Token as Tok
15import qualified Text.Parser.Token as Tok
@@ -45,7 +45,7 @@ import Paths_idris
45import Util.DynamicLinker
45import Util.DynamicLinker
46import qualified Util.Pretty as P
46import qualified Util.Pretty as P
47
47
48−import Idris.Core.TT as TT
48+import Idris.Core.TT
49import Idris.Core.Evaluate
49import Idris.Core.Evaluate
50
50
51import Control.Applicative hiding (Const)
51import Control.Applicative hiding (Const)
@@ -657,8 +657,8 @@ instance_ syn = do (doc, _)
657
657
658-- | Parse a docstring
658-- | Parse a docstring
659docstring :: SyntaxInfo
659docstring :: SyntaxInfo
660− -> IdrisParser (Docstring (Either TT.Err PTerm),
660+ -> IdrisParser (Docstring (Either Err PTerm),
661− [(Name,Docstring (Either TT.Err PTerm))])
661+ [(Name,Docstring (Either Err PTerm))])
662docstring syn = do (doc, argDocs) <- option noDocs docComment
662docstring syn = do (doc, argDocs) <- option noDocs docComment
663 ist <- get
663 ist <- get
664 let doc' = annotCode (tryFullExpr syn ist) doc
664 let doc' = annotCode (tryFullExpr syn ist) doc