Commit a60ceff

committed

rewrote things using Operational instead of MonadPrompt

1 parent d17fa91 commit a60ceffCopy full SHA for a60ceff

File tree

4 files changed

+17

-44

lines changed

aoc2017.cabal
src/AOC2017
- Day18.hs
- Util.hs
- Util
  - Prompt.hs

4 files changed

+17

-44

lines changed

`‎aoc2017.cabal‎`

Lines changed: 2 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,6 @@ library`
`24`	`24`	`AOC2017.Util`
`25`	`25`	`AOC2017.Util.Accum`
`26`	`26`	`AOC2017.Util.Disjoints`
`27`		`- AOC2017.Util.Prompt`
`28`	`27`	`AOC2017.Util.Tape`
`29`	`28`	`other-modules: AOC2017.Day01`
`30`	`29`	`AOC2017.Day02`
`@@ -52,8 +51,6 @@ library`
`52`	`51`	`AOC2017.Day24`
`53`	`52`	`AOC2017.Day25`
`54`	`53`	`build-depends: base >= 4.7 && < 5`
`55`		`- , MonadPrompt`
`56`		`- , pointedlist`
`57`	`54`	`, aeson`
`58`	`55`	`, arithmoi`
`59`	`56`	`, bytestring`
`@@ -71,6 +68,8 @@ library`
`71`	`68`	`, monad-control`
`72`	`69`	`, monad-loops`
`73`	`70`	`, mtl`
	`71`	`+ , operational`
	`72`	`+ , pointedlist`
`74`	`73`	`, reflection`
`75`	`74`	`, split`
`76`	`75`	`, text`

`‎src/AOC2017/Day18.hs‎`

Lines changed: 15 additions & 15 deletions

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ import Control.Applicative`
`17`	`17`	`import Control.Lens`
`18`	`18`	`import Control.Monad`
`19`	`19`	`import Control.Monad.Fail`
`20`		`-import Control.Monad.Prompt (Prompt, prompt, runPromptM)`
	`20`	`+import Control.Monad.Operational`
`21`	`21`	`import Control.Monad.State (MonadState, StateT(..), State, execStateT, evalState)`
`22`	`22`	`import Control.Monad.Trans.Maybe (MaybeT(..))`
`23`	`23`	`import Control.Monad.Writer`
`@@ -78,20 +78,20 @@ data Command :: Type -> Type where`
`78`	`78`	`CRcv :: Int -> Command Int -- ^ input is current value of buffer`
`79`	`79`	`CSnd :: Int -> Command () -- ^ input is thing being sent`
`80`	`80`
`81`		`-type Machine = Prompt (Memory :\|: Command)`
	`81`	`+type Machine = Program (Memory :\|: Command)`
`82`	`82`
`83`	`83`	`cRcv :: Int -> Machine Int`
`84`		`-cRcv = prompt . R . CRcv`
	`84`	`+cRcv = singleton . R . CRcv`
`85`	`85`	`cSnd :: Int -> Machine ()`
`86`		`-cSnd = prompt . R . CSnd`
	`86`	`+cSnd = singleton . R . CSnd`
`87`	`87`	`cGet :: Char -> Machine Int`
`88`		`-cGet = prompt . L . MGet`
	`88`	`+cGet = singleton . L . MGet`
`89`	`89`	`cSet :: Char -> Int -> Machine ()`
`90`		`-cSet r = prompt . L . MSet r`
	`90`	`+cSet r = singleton . L . MSet r`
`91`	`91`	`cMov :: Int -> Machine ()`
`92`		`-cMov = prompt . L . MMov`
	`92`	`+cMov = singleton . L . MMov`
`93`	`93`	`cPk :: Machine Op`
`94`		`-cPk = prompt $ L MPk`
	`94`	`+cPk = singleton $ L MPk`
`95`	`95`
`96`	`96`	`data ProgState = PS { _psTape :: P.PointedList Op`
`97`	`97`	`, _psRegs :: M.Map Char Int`
`@@ -164,7 +164,7 @@ interpA = \case`
`164`	`164`
`165`	`165`	`day18a :: Challenge`
`166`	`166`	`day18a = show`
`167`		`- . execPartA (many . runPromptM (interpMem >\|< interpA) $ stepTape)`
	`167`	`+ . execPartA (many . interpretWithMonad (interpMem >\|< interpA) $ stepTape)`
`168`	`168`	. (`PS` M.empty)
`169`	`169`	`. parse`
`170`	`170`
`@@ -200,12 +200,12 @@ type MultiState = V.Vector 2 Thread`
`200`	`200`	`stepThreads`
`201`	`201`	`:: MaybeT (State MultiState) Int`
`202`	`202`	`stepThreads = do`
`203`		`- outA <- execWriterT $`
`204`		`- zoom (V.ix 0) .many $ runPromptM (interpMem >\|< interpB) stepTape`
`205`		`- outB <- execWriterT $`
`206`		`- zoom (V.ix 1) .many $ runPromptM (interpMem >\|< interpB) stepTape`
`207`		`- V.ix 0 . tBuffer <>= outB`
`208`		`- V.ix 1 . tBuffer <>= outA`
	`203`	`+ outA <- execWriterT . zoom (V.ix 0) $`
	`204`	`+ many $ interpretWithMonad (interpMem >\|< interpB) stepTape`
	`205`	`+ outB <- execWriterT . zoom (V.ix 1) $`
	`206`	`+ many $ interpretWithMonad (interpMem >\|< interpB) stepTape`
	`207`	`+ V.ix 0 . tBuffer .= outB`
	`208`	`+ V.ix 1 . tBuffer .= outA`
`209`	`209`	`guard . not $ null outA && null outB`
`210`	`210`	`return $ length outB`
`211`	`211`

`‎src/AOC2017/Util.hs‎`

Lines changed: 0 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,6 @@ module AOC2017.Util (`
`8`	`8`	`) where`
`9`	`9`
`10`	`10`	`import Data.List`
`11`		`-import Data.Traversable`
`12`	`11`	`import qualified Data.Text as T`
`13`	`12`
`14`	`13`	`-- \| Strict (!!)`

`‎src/AOC2017/Util/Prompt.hs‎`

Lines changed: 0 additions & 25 deletions

This file was deleted.

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit a60ceff

File tree

4 files changed

4 files changed

`‎aoc2017.cabal‎`

`‎src/AOC2017/Day18.hs‎`

`‎src/AOC2017/Util.hs‎`

`‎src/AOC2017/Util/Prompt.hs‎`

0 commit comments