on master help sign in
Make --quiet imply --nocolour
52073d1David Christiansen
src/Idris/AbsSyntax.hs+4
@@ -485,6 +485,10 @@ colourise :: Idris Bool
485colourise = do i <- getIState
485colourise = do i <- getIState
486 return $ idris_colourRepl i
486 return $ idris_colourRepl i
487
487
488+setColourise :: Bool -> Idris ()
489+setColourise b = do i <- getIState
490+ putIState $ i { idris_colourRepl = b }
491+
488impShow :: Idris Bool
492impShow :: Idris Bool
489impShow = do i <- getIState
493impShow = do i <- getIState
490 return (opt_showimp (idris_options i))
494 return (opt_showimp (idris_options i))
src/Idris/REPL.hs+1−4
@@ -750,10 +750,7 @@ idrisMain opts =
750 [expr] -> return (Just expr)
750 [expr] -> return (Just expr)
751 when (DefaultTotal `elem` opts) $ do i <- getIState
751 when (DefaultTotal `elem` opts) $ do i <- getIState
752 putIState (i { default_total = True })
752 putIState (i { default_total = True })
753− case opt getColour opts of
753+ setColourise $ not quiet && last (True : opt getColour opts)
754− [] -> return ()
755− xs -> do i <- getIState
756− putIState (i { idris_colourRepl = last xs })
757 mapM_ addLangExt (opt getLanguageExt opts)
754 mapM_ addLangExt (opt getLanguageExt opts)
758 setREPL runrepl
755 setREPL runrepl
759 setQuiet (quiet || isJust script)
756 setQuiet (quiet || isJust script)