A peer-to-peer stack for code collaboration
radicle binary can read program from stdin
Thomas Scholtes9cc07dd0d831
diff --git a/exe/RadicleExe.hs b/exe/RadicleExe.hsindex fd0d3fc..dbb2602 100644--- a/exe/RadicleExe.hs+++ b/exe/RadicleExe.hs@@ -11,7 +11,6 @@ import Prelude (String)import Protolude hiding (TypeError, option, sourceFile)import Radicleimport Servant.Client-import System.Console.Haskeline (InputT)import System.Directory (doesFileExist)import qualified Radicle.Internal.Number as Num@@ -20,16 +19,24 @@ import qualified Radicle.Internal.PrimFns as PrimFnsmain :: IO ()main = doopts' <- execParser allOpts- src <- do- exists <- doesFileExist (sourceFile opts')- if exists- then readFile (sourceFile opts')- else die $ "Could not find file: " <> toS (sourceFile opts')- hist <- case histFile opts' of- Nothing -> getHistoryFile- Just h -> pure h- mgr <- newManager defaultManagerSettings- repl (Just hist) (toS $ sourceFile opts') src (bindings mgr)+ if sourceFile opts' == "-"+ then do+ src <- getContents+ mgr <- newManager defaultManagerSettings+ let prog = interpretMany (toS $ sourceFile opts') src+ (result, _state) <- runLang (bindings mgr) prog+ case result of+ Left (LangError _ Exit) -> pure ()+ Left e -> do putStrLn $ renderPrettyDef e+ exitWith (ExitFailure 1)+ Right v -> putStrLn $ renderPrettyDef v+ else do+ src <- readSource (sourceFile opts')+ hist <- case histFile opts' of+ Nothing -> getHistoryFile+ Just h -> pure h+ mgr <- newManager defaultManagerSettings+ repl (Just hist) (toS $ sourceFile opts') src (bindings mgr)whereallOpts = info (opts <**> helper)( fullDesc@@ -37,6 +44,13 @@ main = do<> header "The radicle intepreter")+readSource :: String -> IO Text+readSource file = do+ exists <- doesFileExist file+ if exists+ then readFile file+ else die $ "Could not find file: " <> toS file+radDesc :: StringradDesc= "Interprets a radicle program.\n"@@ -56,7 +70,7 @@ opts :: Parser Optsopts = Opts<$> strArgument( metavar "FILE"- <> help "File to interpret."+ <> help "File to interpret. Use - to read the code from stdin.")<*> optional (strOption( long "histfile"@@ -72,10 +86,10 @@ opts = Opts-- * Primops-bindings :: HttpClient.Manager -> Bindings (PrimFns (InputT IO))+bindings :: (MonadIO m, ReplM m) => HttpClient.Manager -> Bindings (PrimFns m)bindings mgr = addPrimFns (replPrimFns <> clientPrimFns mgr) pureEnv-clientPrimFns :: HttpClient.Manager -> PrimFns (InputT IO)+clientPrimFns :: MonadIO m => HttpClient.Manager -> PrimFns mclientPrimFns mgr = fromList . PrimFns.allDocs $ [sendPrimop, receivePrimop]wheresendPrimop =diff --git a/src/Radicle/Internal/Effects/Capabilities.hs b/src/Radicle/Internal/Effects/Capabilities.hsindex f053461..c4f6ef8 100644--- a/src/Radicle/Internal/Effects/Capabilities.hs+++ b/src/Radicle/Internal/Effects/Capabilities.hs@@ -48,6 +48,8 @@ instance Exit m => Exit (Lang m) whereclass Monad m => CurrentTime m wherecurrentTime :: m UTCTime+instance CurrentTime IO where+ currentTime = getCurrentTimeinstance CurrentTime (InputT IO) wherecurrentTime = liftIO getCurrentTimeinstance CurrentTime m => CurrentTime (Lang m) where