7c86659 · Idris-dev · git.iko.soy

git.iko.soy/Idris-dev

Remove 'catch' round server

It's not backward compatible, and the error message is probably better than silently failing anyway.

commit7c866596b4ca64d76c43adc3219f269788e714fe authorEdwin Brady <ecb10@st-andrews.ac.uk> dateMon 28 Oct 2013, 20:24 (13 years ago) parentf34f0af

2 files changed+4−10

unifiedsplit

src/Idris/REPL.hs+4−6

@@ -1,5 +1,5 @@

11{-# LANGUAGE MultiParamTypeClasses, FlexibleInstances, DeriveFunctor,

2− PatternGuards, ScopedTypeVariables, CPP #-}

2+ PatternGuards, CPP #-}

44module Idris.REPL where

@@ -111,11 +111,9 @@ startServer orig stvar fn_in = do tid <- runIO $ forkOS serverLoop

111111 where serverLoop :: IO ()

112112 -- TODO: option for port number

113113 serverLoop = withSocketsDo $

114− catch (do sock <- listenOn $ PortNumber 4294

115− i <- readMVar stvar

116− loop i sock)

117− (\(e :: IOException) -> return ()) -- silently fail

118− -- TODO: allow multiple instances somehow

114+ do sock <- listenOn $ PortNumber 4294

115+ i <- readMVar stvar

116+ loop i sock

119117

120118 fn = case fn_in of

121119 (f:_) -> f

src/Idris/REPLParser.hs−4

@@ -70,10 +70,6 @@ pCmd = do P.whiteSpace; try (do cmd ["q", "quit"]; eof; return Quit)

7070 upd <- option False (do P.lchar '!'; return True)

7171 l <- P.natural; n <- P.name;

7272 return (CaseSplitAt upd (fromInteger l) n))

73− <|> try (do cmd ["cs", "casesplit"]; P.whiteSpace;

74− n <- P.name;

75− t <- P.fullExpr defaultSyntax;

76− return (CaseSplit n t))

7773 <|> try (do cmd ["ac", "addclause"]; P.whiteSpace;

7874 upd <- option False (do P.lchar '!'; return True)

7975 l <- P.natural; n <- P.name;