ilyakooo0/urbit
1
0
Fork 0
mirror of https://github.com/ilyakooo0/urbit.git synced 2024-11-29 04:04:02 +03:00
Code Issues Packages Projects Releases Wiki Activity

king: Remove GoodParse hack in newRunCompute.

Browse Source
This commit is contained in:
~siprel 2020-05-31 22:04:56 +00:00
parent fd72424b12
commit 2f852c2e9f
3 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/hs/TODO.md
View File

@ -7,7 +7,7 @@ Stubbed out:
- [ ] PlayBail should be an exception for now.
- [ ] Write haddock docs for `Urbit.Vere.Serf.IPC`.
- [x] Unstub slog/stder/dead callbacks on serf config.
- [ ] GoodParse hack in newRunCompute.
- [x] Remove GoodParse hack in newRunCompute.
- [ ] Bring back tank printing.
- [ ] Bring back code for handling serf stderr messages.

8
pkg/hs/urbit-king/lib/Urbit/Vere/Pier.hs
View File

@ -28,9 +28,7 @@ import Urbit.Vere.Pier.Types
import Data.Text (append)
import System.Posix.Files (ownerModes, setFileMode)
import Urbit.King.App (HasPierEnv(..))
-- ort Urbit.Time (Wen)
import Urbit.King.App (HasKingEnv, HasPierEnv, PierEnv)
import Urbit.King.App (HasKingEnv, HasPierEnv(..), PierEnv)
import Urbit.Vere.Ames (ames)
import Urbit.Vere.Behn (behn)
import Urbit.Vere.Clay (clay)
@ -38,7 +36,7 @@ import Urbit.Vere.Eyre (eyre)
import Urbit.Vere.Eyre.Multi (MultiEyreApi)
import Urbit.Vere.Http.Client (client)
import Urbit.Vere.Log (EventLog)
import Urbit.Vere.Serf (Serf, ComputeRequest(..), SpinState, EvErr(..))
import Urbit.Vere.Serf (ComputeRequest(..), EvErr(..), Serf, SpinState)
import qualified System.Entropy as Ent
import qualified Urbit.King.API as King
@ -446,7 +444,7 @@ runCompute serf ComputeConfig {..} = do
let onOutput :: Serf.RunOutput -> STM ()
onOutput (Serf.RunOutput e m w nounEv fx) = do
ccPutResult (Fact e m w nounEv, GoodParse <$> fx) -- TODO GoodParse
ccPutResult (Fact e m w nounEv, fx)
let onSpin :: SpinState -> STM ()
onSpin Nothing = ccHideSpinner

8
pkg/hs/urbit-king/lib/Urbit/Vere/Serf/IPC.hs
View File

@ -97,8 +97,8 @@ data Play
deriving (Show)
data Work
= WDone EventId Mug [Ef]
| WSwap EventId Mug (Wen, Noun) [Ef]
= WDone EventId Mug FX
| WSwap EventId Mug (Wen, Noun) FX
| WBail [Goof]
deriving (Show)
@ -182,7 +182,7 @@ data Config = Config
data RunError
= RunBail [Goof]
| RunSwap EventId Mug Wen Noun [Ef]
| RunSwap EventId Mug Wen Noun FX
data RunInput
= RunSnap (EventId -> STM ())
@ -190,7 +190,7 @@ data RunInput
| RunPeek Wen Gang Path (Maybe (Term, Noun) -> IO ())
| RunWork Ev (RunError -> IO ())
data RunOutput = RunOutput EventId Mug Wen Noun [Ef]
data RunOutput = RunOutput EventId Mug Wen Noun FX
data EvErr = EvErr Ev (RunError -> IO ())