Day 7: Go back to case of

Looks prettier, and is what I had initially when it was still monads
This commit is contained in:
shu 2019-12-08 19:51:54 +01:00
parent 02a14fcfb2
commit 0b720099a3

View File

@ -52,22 +52,22 @@ getOpModes opvec = (op_dedup,parsed_modes)
op_dedup = if L.last op == '0' then [L.head op] else op
step :: TapeSection -> (TuringMachine, [Int], [Int]) -> (TuringMachine, OutAction, [Int], [Int])
step opvec ((t,p),input,val)
| op=="1" = (tm_binop (+),Continue,input,val)
| op=="2" = (tm_binop (*),Continue,input,val)
| op=="3" = (new_tm t (L.head input),Continue,L.tail input,val)
| op=="4" = ((t,p),Output,input,V.last params:val)
| op=="5" = ((t, if params ! 0/=0 then params ! 1 else p),Continue,input,val)
| op=="6" = ((t, if params ! 0==0 then params ! 1 else p),Continue,input,val)
| op=="7" = (new_tm t (if (params ! 0)<(params ! 1)
step opvec ((t,p),input,val) = case op of
"1" -> (tm_binop (+),Continue,input,val)
"2" -> (tm_binop (*),Continue,input,val)
"3" -> (new_tm t (L.head input),Continue,L.tail input,val)
"4" -> ((t,p),Output,input,V.last params:val)
"5" -> ((t, if params ! 0/=0 then params ! 1 else p),Continue,input,val)
"6" -> ((t, if params ! 0==0 then params ! 1 else p),Continue,input,val)
"7" -> (new_tm t (if (params ! 0)<(params ! 1)
then 1 else 0),Continue,input,val)
| op=="8" = (new_tm t (if (params ! 0)==(params ! 1)
"8" -> (new_tm t (if (params ! 0)==(params ! 1)
then 1 else 0),Continue,input,val)
| op=="99" = ((t,p),Halt,input,val)
where (op,m) = getOpModes opvec
params = paramChange m opvec t
tm_binop x = new_tm t ((params ! 0) `x` (params ! 1))
new_tm t x = (t // [(V.last opvec, x)],p)
"99" -> ((t,p),Halt,input,val)
where (op,m) = getOpModes opvec
params = paramChange m opvec t
tm_binop x = new_tm t ((params ! 0) `x` (params ! 1))
new_tm t x = (t // [(V.last opvec, x)],p)
execSteps :: (TuringMachine, [Int], [Int], OutAction) -> (TuringMachine, [Int], [Int], OutAction)
execSteps ((t,p),input,output,halt) =