Merge branch 'cλash' of http://git.stderr.nl/matthijs/projects/master-project

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

diff --git a/Bits.hs b/Bits.hs
index 50f6aa4c3f6766749e0a6e590080f62437c78591..435b04e1efc5cb0292b345111f5584a694cf2521 100644 (file)
--- a/Bits.hs
+++ b/Bits.hs
@@ -1,9 +1,10 @@
-{-# LANGUAGE FlexibleContexts,GADTs,ExistentialQuantification,LiberalTypeSynonyms #-}
+{-# LANGUAGE FlexibleContexts,GADTs,ExistentialQuantification,LiberalTypeSynonyms,TemplateHaskell #-}
 
 module Bits where
 
-import qualified Data.Param.FSVec as FSVec
-import qualified Data.TypeLevel as TypeLevel
+import qualified Data.Param.TFVec as TFVec
+import qualified Types
+import Language.Haskell.TH.Lift
 
 --class Signal a where
 --     hwand :: a -> a -> a
@@ -46,6 +47,8 @@ displaysig Low  = "0"
 data Bit = High | Low
   deriving (Show, Eq, Read)
 
+$(deriveLift1 ''Bit)
+
 -- A function to prettyprint a bitvector
 
 --displaysigs :: (Signal s) => [s] -> String
@@ -58,8 +61,6 @@ type Stream a = [a]
 lows  = Low : lows
 highs = High : highs
 
-dontcare = undefined
-
-type BitVec len = FSVec.FSVec len Bit
+type BitVec len = TFVec.TFVec len Bit
 
 -- vim: set ts=8 sw=2 sts=2 expandtab: