From: Matthijs Kooijman Date: Mon, 2 Feb 2009 13:54:28 +0000 (+0100) Subject: Add a full_adder version with stateful interface. X-Git-Url: https://git.stderr.nl/gitweb?a=commitdiff_plain;ds=sidebyside;h=c31e721d3b194f19140ffb55fdfc8d00368a6dbd;p=matthijs%2Fmaster-project%2Fc%CE%BBash.git Add a full_adder version with stateful interface. The state itself is still empty, this uses the (yank-pasted) stateless function from Sim.hs to reuse the existing full_adder. --- diff --git a/Adders.hs b/Adders.hs index f32f5d4..b09b98f 100644 --- a/Adders.hs +++ b/Adders.hs @@ -5,6 +5,10 @@ import Language.Haskell.Syntax mainIO f = Sim.simulateIO (Sim.stateless f) () +-- This function is from Sim.hs, but we redefine it here so it can get inlined +-- by default. +stateless f = \i s -> (s, f i) + show_add f = do print ("Sum: " ++ (displaysigs s)); print ("Carry: " ++ (displaysig c)) where a = [High, High, High, High] @@ -47,6 +51,8 @@ full_adder (a, b, cin) = (s, c) (s, c2) = half_adder(s1, cin) c = c1 `hwor` c2 +sfull_adder = stateless full_adder + -- Four bit adder -- Explicit version -- [a] -> [b] -> ([s], cout)