From c3fa0485dc0ad3374c6a0775b3d11b3ba88d815d Mon Sep 17 00:00:00 2001 From: alex Date: Mon, 27 Dec 2021 20:21:02 +0000 Subject: [PATCH 1/4] tweaks --- main/Main.hs | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/main/Main.hs b/main/Main.hs index 49373c526..5981fe9b9 100644 --- a/main/Main.hs +++ b/main/Main.hs @@ -49,8 +49,9 @@ main = do $ catch (core tidal) $ \ (e :: SomeException) -> message stderr $ show e +core :: C.Stream -> I.InterpreterT IO () core tidal = do - message stdout "safe-tidal-cli starts" + message stdout "[tidal] starting..." -- more settings at -- https://github.com/tidalcycles/tidali/blob/master/src/Main.hs I.set [ I.languageExtensions @@ -63,19 +64,20 @@ core tidal = do , "Sound.Tidal.Safe.Boot" ] -- FIXME: replace lazy IO by some streaming mechanism? - message stdout "safe-tidal-cli has loaded modules" + message stdout "[tidal] modules loaded..." input <- liftIO getContents - message stdout "safe-tidal-cli has acquired input" + message stdout "[tidal] ready" mapM_ (work tidal . unlines) $ blocks $ lines input message stdout "safe-tidal-cli is done" +second :: Int second = 10^6 :: Int -- | will show at most 10 lines, at most 80 chars per line, -- and run (evaluation and print) for at most 1 second message :: Handle -> String -> I.InterpreterT IO () message h s = do - let safe = unlines . safe_list 10 ["..."] . map (safe_list 120 "...") . lines + let safe = unlines . safe_list 20 ["..."] . map (safe_list 120 "...") . lines liftIO $ void $ timeout (1 * second) $ do hPutStrLn h (safe s) ; hFlush h @@ -89,7 +91,7 @@ safe_list n msg xs = work :: C.Stream -> String -> I.InterpreterT IO () work tidal contents = - ( if take 2 contents `elem` [ ":t", ":i", ":d" ] + ( if take 2 contents `elem` [ ":t", ":i", ":d", ":s" ] then do -- https://github.com/haskell-hint/hint/issues/101 message stderr $ "not implemented " <> contents From 3442e15860909e3604c63e4517c7b4859e503601 Mon Sep 17 00:00:00 2001 From: alex Date: Mon, 27 Dec 2021 21:28:24 +0000 Subject: [PATCH 2/4] try to add drop-in ghci replacement to build --- .github/workflows/listener-build-linux.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/listener-build-linux.yml b/.github/workflows/listener-build-linux.yml index be249501d..513e2e404 100644 --- a/.github/workflows/listener-build-linux.yml +++ b/.github/workflows/listener-build-linux.yml @@ -38,6 +38,7 @@ jobs: run: | cabal update cabal build --enable-tests tidal-listener + cabal build - name: move GHC libs and configs run: | @@ -104,12 +105,14 @@ jobs: - name: fake gcc run: | mkdir -p tidal-listener/binary/haskell-libs/bin/ - cp -r tidal-listener/fake_gcc.sh tidal-listener/binary/haskell-libs/bin/fake_gcc.sh + cp tidal-listener/fake_gcc.sh tidal-listener/binary/haskell-libs/bin/fake_gcc.sh sed -i 's/cc/bin\/fake_gcc.sh/g' tidal-listener/binary/haskell-libs/settings chmod 755 tidal-listener/binary/haskell-libs/bin/fake_gcc.sh - name: move executable - run: cp -r dist-newstyle/build/x86_64-linux/ghc-${{ matrix.ghc }}/tidal-listener-0.1.0.0/x/tidal-listener/build/tidal-listener/tidal-listener tidal-listener/binary/tidal-listener + run: | + cp dist-newstyle/build/x86_64-linux/ghc-${{ matrix.ghc }}/tidal-listener-0.1.0.0/x/tidal-listener/build/tidal-listener/tidal-listener tidal-listener/binary/tidal-listener + cp dist-newstyle/build/x86_64-linux/ghc-${{ matrix.ghc }}/tidal-1.7.10/x/tidal/build/tidal/tidal tidal-listener/binary/tidal - name: zip files run: | From 105ec8150bb416b1332473f36f3cb2ba9738455e Mon Sep 17 00:00:00 2001 From: alex Date: Mon, 27 Dec 2021 21:30:50 +0000 Subject: [PATCH 3/4] fix tab --- .github/workflows/listener-build-linux.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/listener-build-linux.yml b/.github/workflows/listener-build-linux.yml index 513e2e404..b62e94c41 100644 --- a/.github/workflows/listener-build-linux.yml +++ b/.github/workflows/listener-build-linux.yml @@ -38,7 +38,7 @@ jobs: run: | cabal update cabal build --enable-tests tidal-listener - cabal build + cabal build - name: move GHC libs and configs run: | From 71362d2caad9b8238596ee5e8b7551bb75eec294 Mon Sep 17 00:00:00 2001 From: alex Date: Mon, 27 Dec 2021 21:35:39 +0000 Subject: [PATCH 4/4] fix another tab --- .github/workflows/listener-build-linux.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/listener-build-linux.yml b/.github/workflows/listener-build-linux.yml index b62e94c41..7241d6f8b 100644 --- a/.github/workflows/listener-build-linux.yml +++ b/.github/workflows/listener-build-linux.yml @@ -111,8 +111,8 @@ jobs: - name: move executable run: | - cp dist-newstyle/build/x86_64-linux/ghc-${{ matrix.ghc }}/tidal-listener-0.1.0.0/x/tidal-listener/build/tidal-listener/tidal-listener tidal-listener/binary/tidal-listener - cp dist-newstyle/build/x86_64-linux/ghc-${{ matrix.ghc }}/tidal-1.7.10/x/tidal/build/tidal/tidal tidal-listener/binary/tidal + cp dist-newstyle/build/x86_64-linux/ghc-${{ matrix.ghc }}/tidal-listener-0.1.0.0/x/tidal-listener/build/tidal-listener/tidal-listener tidal-listener/binary/tidal-listener + cp dist-newstyle/build/x86_64-linux/ghc-${{ matrix.ghc }}/tidal-1.7.10/x/tidal/build/tidal/tidal tidal-listener/binary/tidal - name: zip files run: |