projects
/
matthijs
/
master-project
/
cλash.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://github.com/darchon/clash into cλash
[matthijs/master-project/cλash.git]
/
Adders.hs
diff --git
a/Adders.hs
b/Adders.hs
index d64331f0499f899f715a4a0464c722b7c7685b2a..9e78fcf87dd6a0b4c431133b5e6ad5bbfb9b918e 100644
(file)
--- a/
Adders.hs
+++ b/
Adders.hs
@@
-174,8
+174,8
@@
highordtest = \x ->
xand a b = hwand a b
xand a b = hwand a b
-functiontest :: TFVec D4
Bit -> Bit -> Bit
-functiontest = \v
s -> let r = foldl xand s v
in r
+functiontest :: TFVec D4
(TFVec D3 Bit) -> (TFVec D12 Bit, TFVec D3 Bit, TFVec D3 (TFVec D3 Bit))
+functiontest = \v
-> let r = (concat v, head v, tail v)
in r
xhwnot x = hwnot x
xhwnot x = hwnot x