comp: remove most imports of Data.Generics

src/comp/Backend.hs

@@ -4,14 +4,16 @@ module Backend (
                 backendMatches
                 ) where
 
-import qualified Data.Generics as Generic
+import Data.Data
+import Data.Typeable
+
 import PPrint
 import Eval
 
 -- ===============
 
 data Backend = Bluesim | Verilog
-             deriving (Eq, Ord, Show, Generic.Data, Generic.Typeable)
+             deriving (Eq, Ord, Show, Data, Typeable)
 
 instance PPrint Backend where
     pPrint _ _ Bluesim = text "Bluesim"
@@ -29,4 +31,3 @@ backendMatches Nothing _ = True
 backendMatches (Just expected) (Just actual) = (expected == actual)
 
 -- ===============
-

src/comp/CType.hs

@@ -55,10 +55,10 @@ module CType(
 import Prelude hiding ((<>))
 #endif
 
+import Data.Data (Data, Typeable)
 import Data.Char(isDigit, chr)
 import Data.List(union)
 import Data.Maybe
-import qualified Data.Generics as Generic
 
 import Eval
 import PPrint
@@ -83,14 +83,14 @@ data Type = TVar TyVar         -- ^ type variable
           | TAp Type Type      -- ^ type-level application
           | TGen Position Int  -- ^ quantified type variable used in type schemes
           | TDefMonad Position -- ^ not used after CVParserImperative
-    deriving (Show, Generic.Data, Generic.Typeable)
+    deriving (Show, Data, Typeable)
 
 -- | Representation of a type variable
 data TyVar = TyVar { tv_name :: Id    -- ^ name of the type variable
                    , tv_num  :: Int   -- ^ number for a generated type variable
                    , tv_kind :: Kind  -- ^ kind of the type variable
                    }
-    deriving (Show, Generic.Data, Generic.Typeable)
+    deriving (Show, Data, Typeable)
 
 
 -- | Representation of a type constructor
@@ -107,7 +107,7 @@ data TyCon = -- | A constructor for a type of value kind
            | TyStr { tystr_value :: FString  -- ^ type-level string value
                    , tystr_pos   :: Position -- ^ position of introduction
                    }
-    deriving (Show, Generic.Data, Generic.Typeable)
+    deriving (Show, Data, Typeable)
 
 data TISort
         = -- type synonym
@@ -119,7 +119,7 @@ data TISort
           -- primitive abstract type
           -- e.g. Integer, Bit, Module, etc.
         | TIabstract
-        deriving (Eq, Ord, Show, Generic.Data, Generic.Typeable)
+        deriving (Eq, Ord, Show, Data, Typeable)
 
 
 data StructSubType
@@ -133,7 +133,7 @@ data StructSubType
                     , spolywrap_ctor :: Maybe Id -- ^ name of the data constructor
                     , spolywrap_field :: Id      -- ^ name of the wrapped field
                     }
-        deriving (Eq, Ord, Show, Generic.Data, Generic.Typeable)
+        deriving (Eq, Ord, Show, Data, Typeable)
 
 type CType = Type
 
@@ -143,7 +143,7 @@ data Kind = KStar           -- ^ kind of a simple value type
           | KStr            -- ^ kind of a simple string type
           | Kfun Kind Kind  -- ^ kind of type constructors (type-level function)
           | KVar Int        -- ^ generated kind variable (used only during kind inference)
-    deriving (Eq, Ord, Show, Generic.Data, Generic.Typeable)
+    deriving (Eq, Ord, Show, Data, Typeable)
 
 -- Used for providing partial Kind information
 data PartialKind

src/comp/ConTagInfo.hs

@@ -1,9 +1,10 @@
 {-# LANGUAGE DeriveDataTypeable #-}
 module ConTagInfo(ConTagInfo(..)) where
 
+import Data.Data
+
 import Eval
 import PPrint
-import Data.Generics
 
 -- Collects constructor and tag metadata for use in the symbol table and ISyntax.
 --  e.g., data T = A T1 | B T2

src/comp/FStringCompat.hs

@@ -8,13 +8,13 @@ module FStringCompat(FString, getFString,
 -- wrapper to make SStrings look like FStrings
 
 import Prelude hiding((++))
+import Data.Data
+
 import qualified SpeedyString as S
 import PPrint(PPrint(..), text)
 import Util(itos)
-import qualified Data.Generics as Generic
-
 
-newtype FString = FString S.SString deriving (Eq,Ord,Generic.Data, Generic.Typeable)
+newtype FString = FString S.SString deriving (Eq, Ord, Data, Typeable)
 
 fromString :: String -> FString
 fromString = FString . S.fromString

src/comp/IExpand.hs

@@ -17,25 +17,25 @@ module IExpand(iExpand) where
 import Prelude hiding ((<>))
 #endif
 
+import qualified Data.Array as Array
+import qualified Data.IntMap as IM
+import qualified Data.Map as M
+import qualified Data.Set as S
+import Data.Char(intToDigit, ord, chr)
 import Data.List
 import Data.Maybe
 import Data.Foldable(foldrM)
+import Debug.Trace(traceM)
 import Numeric(showIntAtBase)
-import Data.Char(intToDigit, ord, chr)
 import Control.Monad(when, foldM, zipWithM, mapAndUnzipM)
 import Control.Monad.Fix(mfix)
---import Control.Monad.Fix
-import Control.Monad.State(State, evalState, liftIO, get, put)
-import Data.Graph
-import qualified Data.Generics as Generic
 import System.IO(Handle, BufferMode(..), IOMode(..), stdout, stderr,
                  hSetBuffering, hIsOpen, hIsClosed)
 import System.FilePath(isRelative)
-import qualified Data.Array as Array
-import qualified Data.IntMap as IM
-import qualified Data.Map as M
-import qualified Data.Set as S
-import Debug.Trace(traceM)
+
+import qualified Data.Generics as Generic
+import Data.Graph
+import Control.Monad.State(State, evalState, liftIO, get, put)
 
 import FileIOUtil(openFileCatch, hCloseCatch, hFlushCatch, hGetBufferingCatch,
                   hSetBufferingCatch, hPutStrCatch, hGetLineCatch,

src/comp/IExpandUtils.hs

@@ -65,6 +65,7 @@ module IExpandUtils(
 import Control.Monad(when, liftM)
 import Control.Monad.State(StateT, runStateT, evalStateT, lift, liftIO,
                            gets, get, put, modify)
+import Data.Data
 import Data.IORef
 import System.IO.Unsafe
 import Data.List
@@ -254,7 +255,7 @@ pTermToIExpr (PSel idx idx_sz es) =
 
 -- An expression with an implicit condition.
 data PExpr = P HPred HExpr
-        deriving (Eq, Ord, Show, Generic.Data, Generic.Typeable)
+        deriving (Eq, Ord, Show, Data, Typeable)
 
 instance PPrint PExpr where
     pPrint d prec (P p e) = pPrint d prec (iePrimWhen (iGetType e) (predToIExpr p) e)
@@ -385,7 +386,7 @@ data HeapCell = HUnev { hc_hexpr :: HExpr, hc_name :: NameInfo }
               | HNF { hc_pexpr :: PExpr, hc_wire_set :: HWireSet,
                       hc_name :: NameInfo }
               | HLoop { hc_name :: NameInfo }
-        deriving (Show, Eq, Ord, Generic.Data, Generic.Typeable)
+        deriving (Show, Eq, Ord, Data, Typeable)
 
 -- should I drop the predicate for better printing of error messages?
 heapCellToHExpr :: HeapCell -> HExpr
@@ -414,7 +415,7 @@ instance PPrint HeapCell where
             text "HLoop" <+> pPrint d 0 name
 
 newtype HeapData = HeapData (IORef (HeapCell))
-  deriving (Generic.Data, Generic.Typeable)
+  deriving (Data, Typeable)
 
 {-
 instance Eq HeapData where

src/comp/IStateLoc.hs

@@ -18,20 +18,21 @@ module IStateLoc (
   ,newIStateLocTop
   ) where
 
+import Data.Char(isAlphaNum)
+import Data.Data
+import Data.List(isPrefixOf,tails)
+
+import qualified Data.Map as M
+
 import IType
 import Id
-import qualified Data.Generics as Generic
 import Eval(Hyper(..))
-import Data.Char(isAlphaNum)
-
 import Position
 import PreStrings(fsUnderscore,fsElements, fsvElements)
 import FStringCompat
 import PPrint
 import PFPrint(pfpString)
 import PreStrings(fs_unnamed, fsAddRules, fsLoop, fsBody, fsC)
-import qualified Data.Map as M
-import Data.List(isPrefixOf,tails)
 import Error(internalError)
 import IOUtil(progArgs)
 import Util(traces)
@@ -71,7 +72,7 @@ data IStateLocPathComponent = IStateLocPathComponent {
   -- Name generation
   isl_prefix                 :: NameGenerate, -- currently computed hierarchical prefix
   isl_loop_suffix         :: NameGenerate  -- loop indexes to add once a "real" name is found.
-  } deriving (Eq, Show, Generic.Data, Generic.Typeable)
+  } deriving (Eq, Show, Data, Typeable)
 
 
 -- ---------------------------------------
@@ -124,7 +125,7 @@ mkISLPC inst_id ifc_id ifc_type = islpc
 data NameGenerate = NameEmpty             -- No name so far
                     | NameIndex [Integer] -- loop indexes
                     | Name Id             -- a real name
-                    deriving (Eq, Show, Generic.Data, Generic.Typeable)
+                    deriving (Eq, Show, Data, Typeable)
 
 --
 instance Hyper NameGenerate where