@@ -154,12 +154,6 @@ parseTac i = runParser (do t <- pTactic defaultSyntax
155 return t) i "(proof)"
155 return t) i "(proof)"
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
163parseImports :: FilePath -> String -> Idris ([String], [String], String, SourcePos)
157parseImports :: FilePath -> String -> Idris ([String], [String], String, SourcePos)
164parseImports fname input
158parseImports fname input
165 = do i <- get
159 = do i <- get
@@ -169,7 +163,7 @@ parseImports fname input
169 rest <- getInput
163 rest <- getInput
170 pos <- getPosition
164 pos <- getPosition
171 return ((mname, ps, rest, pos), i)) i fname input of
165 return ((mname, ps, rest, pos), i)) i fname input of
172− Left err -> fail (iShowError fname err)
166+ Left err -> fail (show err)
173 Right (x, i) -> do put i
167 Right (x, i) -> do put i
@@ -286,7 +280,7 @@ parseProg syn fname input pos
287 i' <- getState
281 i' <- getState
288 return (concat ps, i')) i fname input of
282 return (concat ps, i')) i fname input of
289− Left err -> fail (iShowError fname err)
283+ Left err -> fail (show err)
290 Right (x, i) -> do put i
284 Right (x, i) -> do put i
291 return (collect x)
285 return (collect x)
@@ -357,10 +351,10 @@ pFunDecl syn
357pDecl' :: SyntaxInfo -> IParser PDecl
351pDecl' :: SyntaxInfo -> IParser PDecl
358pDecl' syn
352pDecl' syn
359 = try pFixity
353 = try pFixity
360− <|> pFunDecl' syn
354+ <|> try (pFunDecl' syn)
361 <|> try (pData syn)
355 <|> try (pData syn)
362 <|> try (pRecord syn)
356 <|> try (pRecord syn)
363− <|> pSyntaxDecl syn
357+ <|> try (pSyntaxDecl syn)
365pSyntaxDecl :: SyntaxInfo -> IParser PDecl
359pSyntaxDecl :: SyntaxInfo -> IParser PDecl
366pSyntaxDecl syn
360pSyntaxDecl syn