Keys for typemap can now deal with vector lengths based on type operators

[matthijs/master-project/cλash.git] / Adders.hs

diff --git a/Adders.hs b/Adders.hs
index 3afb82fae22e6ecebd6349ac23da944ebbec95f5..9e78fcf87dd6a0b4c431133b5e6ad5bbfb9b918e 100644 (file)
--- a/Adders.hs
+++ b/Adders.hs
@@ -172,8 +172,10 @@ highordtest = \x ->
              in
                 \c d -> op' d c
 
-functiontest :: TFVec D4 Bit -> TFVec D5 Bit -> RangedWord D3 -> RangedWord D4 -> (Bit, Bit)
-functiontest = \v1 v2 i1 i2 -> let r1 = v1!i1 ; r2 = v2!i2 in (r1,r2)
+xand a b = hwand a b
+
+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