X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=Adders.hs;h=71d38dc4197293febaaca3917998fc8cf94841e2;hb=1e7d79de8b34aca4bf0f63d3822dd0b018356038;hp=03f04101ff9c72612bea6e4ab5030bc8b9fc2eda;hpb=55dbd3dcc8a8e6b9b5718be9e4da61a8ab031a72;p=matthijs%2Fmaster-project%2Fc%CE%BBash.git diff --git a/Adders.hs b/Adders.hs index 03f0410..71d38dc 100644 --- a/Adders.hs +++ b/Adders.hs @@ -42,8 +42,9 @@ half_adder (a, b) = full_adder :: (Bit, Bit, Bit) -> (Bit, Bit) full_adder (a, b, cin) = (s, c) where - s = a `hwxor` b `hwxor` cin - c = a `hwand` b `hwor` (cin `hwand` (a `hwxor` b)) + x = a `hwxor` b + s = x `hwxor` cin + c = a `hwand` b `hwor` (cin `hwand` x) -- Four bit adder -- Explicit version