X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=FlattenTypes.hs;h=f20fbc30f11f0c9bc8ac0379fa63d3b0d7af3c78;hb=56b747a9e1101368dd8d497879d6dfd213555055;hp=ecad1badaa754382bc9c51b16b08f2532004d7a0;hpb=b5e1819dbcab2d7e356c2db77b22ba8edef91ddd;p=matthijs%2Fmaster-project%2Fc%CE%BBash.git diff --git a/FlattenTypes.hs b/FlattenTypes.hs index ecad1ba..f20fbc3 100644 --- a/FlattenTypes.hs +++ b/FlattenTypes.hs @@ -3,12 +3,13 @@ module FlattenTypes where import qualified Maybe import Data.Traversable import qualified Data.Foldable as Foldable -import qualified Control.Monad.State as State +import qualified Control.Monad.Trans.State as State import CoreSyn import qualified Type import HsValueMap +import CoreShow -- | A signal identifier type SignalId = Int @@ -135,6 +136,7 @@ data SigUse = | SigStateOld StateId -- | Use as the current internal state | SigStateNew StateId -- | Use as the new internal state | SigSubState -- | Do not use, state variable is used in a subcircuit + deriving (Show) -- | Is this a port signal use? isPortSigUse :: SigUse -> Bool @@ -167,7 +169,7 @@ data SignalInfo = SignalInfo { sigUse :: SigUse, sigTy :: Type.Type, nameHints :: [String] -} +} deriving (Show) -- | A flattened function data FlatFunction = FlatFunction { @@ -175,7 +177,7 @@ data FlatFunction = FlatFunction { flat_res :: SignalMap, flat_defs :: [SigDef], flat_sigs :: [(SignalId, SignalInfo)] -} +} deriving (Show) -- | Lookup a given signal id in a signal map, and return the associated -- SignalInfo. Errors out if the signal was not found.