@@ -140,14 +140,12 @@ repl orig mods
140140 showM c thm n = if c then colouriseFun thm (show n)
141141 else show n
142142
143−-- | Run the REPL server
144−startServer :: IState -> [FilePath] -> Idris ()
145−startServer orig fn_in = do tid <- runIO $ forkOS serverLoop
146− return ()
147− where serverLoop :: IO ()
148− -- TODO: option for port number
149− serverLoop = withSocketsDo $
150− do sock <- listenOnLocalhost $ PortNumber 4294
143+-- | Run the REPL seDver
144+startServer :: PortID -> IState -> [FilePath] -> Idris ()
145+startServer port orig fn_in = do tid <- runIO $ forkOS (serverLoop port)
146+ return ()
147+ where serverLoop port = withSocketsDo $
148+ do sock <- listenOnLocalhost port
151149 loop fn orig { idris_colourRepl = False } sock
152150
153151 fn = case fn_in of
@@ -201,9 +199,9 @@ processNetCmd orig i h fn cmd
201199 IdeSlave n _ -> ist {idris_outputmode = IdeSlave n h}
202200
203201-- | Run a command on the server on localhost
204−runClient :: String -> IO ()
205−runClient str = withSocketsDo $ do
206− h <- connectTo "localhost" (PortNumber 4294)
202+runClient :: PortID -> String -> IO ()
203+runClient port str = withSocketsDo $ do
204+ h <- connectTo "localhost" port
207205 hSetEncoding h utf8
208206 hPutStrLn h str
209207 resp <- hGetResp "" h
@@ -1428,6 +1426,7 @@ idrisMain opts =
14281426 runIO $ exitWith (ExitFailure 1)
14291427 [expr] -> return (Just expr)
14301428 let immediate = opt getEvalExpr opts
1429+ let port = getPort opts
14311430
14321431 when (DefaultTotal `elem` opts) $ do i <- getIState
14331432 putIState (i { default_total = True })
@@ -1516,7 +1515,7 @@ idrisMain opts =
15161515
15171516 when (runrepl && not idesl) $ do
15181517-- clearOrigPats
1519− startServer orig inputs
1518+ startServer port orig inputs
15201519 runInputT (replSettings (Just historyFile)) $ repl orig inputs
15211520 let idesock = IdeslaveSocket `elem` opts
15221521 when (idesl) $ ideslaveStart idesock orig inputs
@@ -1679,11 +1678,26 @@ getColour :: Opt -> Maybe Bool
16791678getColour (ColourREPL b) = Just b
16801679getColour _ = Nothing
16811680
1681+getClient :: Opt -> Maybe String
1682+getClient (Client x) = Just x
1683+getClient _ = Nothing
1684+
1685+-- Get the first valid port
1686+getPort :: [Opt] -> PortID
1687+getPort [] = defaultPort
1688+getPort (Port p:xs)
1689+ | all (`elem` ['0'..'9']) p = PortNumber $ fromIntegral (read p)
1690+ | otherwise = getPort xs
1691+getPort (_:xs) = getPort xs
1692+
16821693opt :: (Opt -> Maybe a) -> [Opt] -> [a]
16831694opt = mapMaybe
16841695
16851696ver = showVersion version ++ gitHash
16861697
1698+defaultPort :: PortID
1699+defaultPort = PortNumber (fromIntegral 4294)
1700+
16871701banner = " ____ __ _ \n" ++
16881702 " / _/___/ /____(_)____ \n" ++
16891703 " / // __ / ___/ / ___/ Version " ++ ver ++ "\n" ++