X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=Adders.hs;h=6529642f4758ad640b1b93e736ef566e4b1f63eb;hb=adf357ab8731531dfea0a21254cfc613031e083a;hp=67d7d95e9fa3a7e3c5d693c2bf1980bb24900155;hpb=8d8e5446f4558cd5bfbd78f3378e6cf96a9c3fc8;p=matthijs%2Fmaster-project%2Fc%CE%BBash.git

diff --git a/Adders.hs b/Adders.hs
index 67d7d95..6529642 100644
--- a/Adders.hs
+++ b/Adders.hs
@@ -13,6 +13,8 @@ import Language.Haskell.Syntax
 import Types
 import Data.Param.TFVec
 import Data.RangedWord
+import Data.SizedInt
+import Data.SizedWord
 
 mainIO f = Sim.simulateIO (Sim.stateless f) ()
 
@@ -176,8 +178,11 @@ highordtest = \x ->
 
 xand a b = hwand a b
 
-functiontest :: TFVec D4 Bit -> TFVec D8 Bit
-functiontest = \v -> let r = v ++ $(vectorTH ([High,Low,High,Low] :: [Bit])) in r
+functiontest :: TFVec D3 (TFVec D4 Bit) -> TFVec D12 Bit
+functiontest = \v -> let r = concat v in r
+
+functiontest2 :: SizedInt D8 -> SizedInt D7
+functiontest2 = \a -> let r = Data.SizedInt.resize a in r
 
 xhwnot x = hwnot x