@@ -154,12 +154,6 @@ parseTac i = runParser (do t <- pTactic defaultSyntax
154154 eof
155155 return t) i "(proof)"
156156
157−iShowError fname err = let ln = sourceLine (errorPos err)
158− clm = sourceColumn (errorPos err)
159− msg = map messageString (errorMessages err) in
160− fname ++ ":" ++ show ln ++ ":parse error"
161− ++ " at column " ++ show clm -- ++ " with error:\n\t" ++ show msg
162−
163157parseImports :: FilePath -> String -> Idris ([String], [String], String, SourcePos)
164158parseImports fname input
165159 = do i <- get
@@ -169,7 +163,7 @@ parseImports fname input
169163 rest <- getInput
170164 pos <- getPosition
171165 return ((mname, ps, rest, pos), i)) i fname input of
172− Left err -> fail (iShowError fname err)
166+ Left err -> fail (show err)
173167 Right (x, i) -> do put i
174168 return x
175169
@@ -286,7 +280,7 @@ parseProg syn fname input pos
286280 eof
287281 i' <- getState
288282 return (concat ps, i')) i fname input of
289− Left err -> fail (iShowError fname err)
283+ Left err -> fail (show err)
290284 Right (x, i) -> do put i
291285 return (collect x)
292286
@@ -357,10 +351,10 @@ pFunDecl syn
357351pDecl' :: SyntaxInfo -> IParser PDecl
358352pDecl' syn
359353 = try pFixity
360− <|> pFunDecl' syn
354+ <|> try (pFunDecl' syn)
361355 <|> try (pData syn)
362356 <|> try (pRecord syn)
363− <|> pSyntaxDecl syn
357+ <|> try (pSyntaxDecl syn)
364358
365359pSyntaxDecl :: SyntaxInfo -> IParser PDecl
366360pSyntaxDecl syn