37b4861 · Idris-dev · git.iko.soy

git.iko.soy/Idris-dev

Rename to emitWarning

commit37b4861748e1845077b35d7f4f40dfddfeb2e730 authorJason Felice <jason.m.felice@gmail.com> dateThu 21 Dec 2017, 15:40 (9 years ago) parentfd63a9d

4 files changed+15−14

compare with master

unifiedsplit

src/Idris/Main.hs+3−3 src/Idris/Output.hs+10−9 src/Idris/Parser.hs+1−1 src/Idris/REPL.hs+1−1

src/Idris/Main.hs+3−3

@@ -195,7 +195,7 @@ idrisMain opts =

195195 mapM_ (\str -> do ist <- getIState

196196 c <- colourise

197197 case parseExpr ist str of

198− Left err -> do emit err

198+ Left err -> do emitWarning err

199199 runIO $ exitWith (ExitFailure 1)

200200 Right e -> process "" (Eval e))

201201 exprs

@@ -272,7 +272,7 @@ execScript :: String -> Idris ()

272272execScript expr = do i <- getIState

273273 c <- colourise

274274 case parseExpr i expr of

275− Left err -> do emit err

275+ Left err -> do emitWarning err

276276 runIO $ exitWith (ExitFailure 1)

277277 Right term -> do ctxt <- getContext

278278 (tm, _) <- elabVal (recinfo (fileFC "toplevel")) ERHS term

@@ -299,7 +299,7 @@ initScript = do script <- runIO $ getIdrisInitScript

299299 runInit h

300300 processLine i cmd input clr =

301301 case parseCmd i input cmd of

302− Left err -> emit err

302+ Left err -> emitWarning err

303303 Right (Right Reload) -> iPrintError "Init scripts cannot reload the file"

304304 Right (Right (Load f _)) -> iPrintError "Init scripts cannot load files"

305305 Right (Right (ModImport f)) -> iPrintError "Init scripts cannot import modules"

src/Idris/Output.hs+10−9

@@ -9,12 +9,13 @@ Maintainer : The Idris Community.

99{-# LANGUAGE FlexibleInstances #-}

1010{-# OPTIONS_GHC -fwarn-incomplete-patterns #-}

1111

12−module Idris.Output (clearHighlights, emit, formatMessage, idemodePutSExp, iPrintError, iPrintFunTypes,

13− iPrintResult, iPrintTermWithType, iputGoal, iputStr, iputStrLn,

14− iRender, iRenderError, iRenderOutput, iRenderResult, iWarn,

15− prettyDocumentedIst, printUndefinedNames, pshow, renderExternal,

16− sendHighlighting, sendParserHighlighting, warnTotality,

17− writeHighlights, OutputDoc(..), Message(..)) where

12+module Idris.Output (clearHighlights, emitWarning, formatMessage, idemodePutSExp,

13+ iPrintError, iPrintFunTypes, iPrintResult, iPrintTermWithType,

14+ iputGoal, iputStr, iputStrLn, iRender, iRenderError,

15+ iRenderOutput, iRenderResult, iWarn, prettyDocumentedIst,

16+ printUndefinedNames, pshow, renderExternal, sendHighlighting,

17+ sendParserHighlighting, warnTotality, writeHighlights,

18+ OutputDoc(..), Message(..)) where

1819

1920import Idris.AbsSyntax

2021import Idris.Colours (hEndColourise, hStartColourise)

@@ -173,10 +174,10 @@ formatMessage w = do

173174 layoutMessage loc Nothing err = loc </> err

174175

175176iWarn :: FC -> OutputDoc -> Idris ()

176−iWarn fc err = emit $ SimpleWarning fc err

177+iWarn fc err = emitWarning $ SimpleWarning fc err

177178

178−emit :: Message w => w -> Idris ()

179−emit w =

179+emitWarning :: Message w => w -> Idris ()

180+emitWarning w =

180181 do i <- getIState

181182 case idris_outputmode i of

182183 RawOutput h ->

src/Idris/Parser.hs+1−1

@@ -1525,7 +1525,7 @@ parseProg :: SyntaxInfo -> FilePath -> String -> Maybe Mark -> Idris [PDecl]

15251525parseProg syn fname input mrk

15261526 = do i <- getIState

15271527 case runparser mainProg i fname input of

1528− Left err -> do emit err

1528+ Left err -> do emitWarning err

15291529 i <- getIState

15301530 putIState (i { errSpan = Just (messageExtent err) })

15311531 return []

src/Idris/REPL.hs+1−1

@@ -726,7 +726,7 @@ processInput cmd orig inputs efile

726726 let quiet = opt_quiet opts

727727 let fn = fromMaybe "" (listToMaybe inputs)

728728 case parseCmd i "(input)" cmd of

729− Left err -> Just inputs <$ emit err

729+ Left err -> Just inputs <$ emitWarning err

730730 Right (Right Reload) ->

731731 reload orig inputs

732732 Right (Right Watch) ->