Really revert all of the recent rotating changes.

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

diff --git a/Bits.hs b/Bits.hs
index c0717bff475bf107e5117c5e9cb6f441787e144d..558a12b1f24b5b7465baecda7cc402eeabd84c30 100644 (file)
--- a/Bits.hs
+++ b/Bits.hs
@@ -1,5 +1,13 @@
+{-# LANGUAGE FlexibleContexts,GADTs,ExistentialQuantification,LiberalTypeSynonyms,TemplateHaskell, DeriveDataTypeable #-}
+
 module Bits where
 
+-- import qualified Data.Param.TFVec as TFVec
+-- import qualified Types
+import Language.Haskell.TH.Lift
+
+import Data.Typeable
+
 --class Signal a where
 --     hwand :: a -> a -> a
 --     hwor  :: a -> a -> a
@@ -38,19 +46,23 @@ displaysig High = "1"
 displaysig Low  = "0"
 
 -- The plain Bit type
-data Bit = High | Low | DontCare
-  deriving (Show, Eq, Read)
+data Bit = High | Low
+  deriving (Show, Eq, Read, Typeable)
+
+$(deriveLift1 ''Bit)
 
 -- A function to prettyprint a bitvector
 
 --displaysigs :: (Signal s) => [s] -> String
-displaysigs :: [Bit] -> String
-displaysigs = (foldl (++) "") . (map displaysig)
+-- displaysigs :: [Bit] -> String
+-- displaysigs = (foldl (++) "") . (map displaysig)
 
-type Stream a = [a]
+-- type Stream a = [a]
 
 -- An infinite streams of highs or lows
-lows  = Low : lows
-highs = High : highs
+-- lows  = Low : lows
+-- highs = High : highs
+-- 
+-- type BitVec len = TFVec.TFVec len Bit
 
 -- vim: set ts=8 sw=2 sts=2 expandtab: