Add separate CFG.Types module

src/CFG/Graph.hs

 {-# LANGUAGE DuplicateRecordFields #-}
 module CFG.Graph
-       ( CFG(..)
-       , P.Block(..)
-       , graphify
+       ( graphify
        ) where
 
 import Data.Graph
-import qualified CFG.Parser as P
 import Data.Text (Text)
 
-data CFG = CFG
-  { graph :: Graph
-  , getBlock :: Vertex -> (P.Block, Text, [Text])
-  , getVertex :: Text -> Maybe Vertex
-  }
+import CFG.Types
 
-instance Show CFG where
-  show = show . graph
-
-graphify :: P.Function -> CFG
+graphify :: Function -> CFG
 graphify function = CFG g ver2node key2vert
   where (g, ver2node, key2vert) = graphFromEdges $ graphList function
 
-graphList :: P.Function -> [(P.Block, Text, [Text])]
-graphList = map iter . P.blocks
-  where iter b = (b, P.name (b :: P.Block), P.successors b)
+graphList :: Function -> [(Block, Text, [Text])]
+graphList = map iter . funBlocks
+  where iter b = (b, blkName (b :: Block), blkSuccessors b)

src/CFG/IR.hs

@@ -13,7 +13,7 @@ import Data.Text (Text)
 import Data.Graph
 import Data.Array
 
-import CFG.Graph
+import CFG.Types
 
 -- | Identifier, used for labels and function names
 type Ident = Text
@@ -35,7 +35,7 @@ flattenCFG :: Vertex -- ^ Start node
            -> [Instr]
 flattenCFG startNode cfg =
   Goto (vertexToIdent cfg startNode)
-  : concatMap (compileBlock cfg) (vertices $ graph cfg)
+  : concatMap (compileBlock cfg) (vertices $ cfgGraph cfg)
   -- TODO Better (unambiguous) name for the out label
   ++ [Label "out"]
 
@@ -48,7 +48,7 @@ compileBlock cfg vertex =
   where ident = vertexToIdent cfg vertex
         call = [] -- TODO
 
-        gotoSuccs = case graph cfg ! vertex of
+        gotoSuccs = case cfgGraph cfg ! vertex of
           [] -> Goto "out" -- no successors
           [successor] -> Goto (vertexToIdent cfg successor)
           [left, right] -> IfThanElse vertex
@@ -59,4 +59,4 @@ compileBlock cfg vertex =
 
 vertexToIdent :: CFG -> Vertex -> Ident
 vertexToIdent cfg vertex = key
-  where (_, key, _) = getBlock cfg vertex
+  where (_, key, _) = cfgGetBlock cfg vertex

src/CFG/Parser.hs

@@ -2,10 +2,6 @@
 module CFG.Parser
        ( parseFile
        , file
-       , Function(..)
-       , FunctionKind(..)
-       , Block(..)
-       , CallInfo(..)
        ) where
 
 import Text.Megaparsec
@@ -13,31 +9,11 @@ import Text.Megaparsec.Text
 import Data.Text (Text)
 import qualified Data.Text as T
 
+import CFG.Types
+
 parseFile :: FilePath -> Text -> Either (ParseError Char Dec) [Function]
 parseFile = parse file
 
-data Function = Function
-  { kind :: FunctionKind
-  , name :: Text
-  , subtask :: Text
-  , entryNode :: Text
-  , blocks :: [Block]
-  }
-  deriving (Show, Eq)
-
-data FunctionKind = KindFunction | KindSubtask
-  deriving (Show, Eq)
-
-data Block = Block
-  { name :: Text
-  , successors :: [Text]
-  , callInfo :: Maybe CallInfo
-  }
-  deriving (Show, Eq)
-
-data CallInfo = FunctionCall Text | SystemCall Text
-  deriving (Show, Eq)
-
 file :: Parser [Function]
 file = many function
 

src/CFG/Types.hs

+module CFG.Types where
+
+import Data.Text (Text)
+import Data.Graph
+
+data Function = Function
+  { funKind :: FunctionKind
+  , funName :: Text
+  , funSubtask :: Text
+  , funEntryNode :: Text
+  , funBlocks :: [Block]
+  }
+  deriving (Show, Eq)
+
+data FunctionKind = KindFunction | KindSubtask
+  deriving (Show, Eq)
+
+data Block = Block
+  { blkName :: Text
+  , blkSuccessors :: [Text]
+  , blkCallInfo :: Maybe CallInfo
+  }
+  deriving (Show, Eq)
+
+data CallInfo = FunctionCall Text | SystemCall Text
+  deriving (Show, Eq)
+
+data CFG = CFG
+  { cfgGraph :: Graph
+  , cfgGetBlock :: Vertex -> (Block, Text, [Text])
+  , cfgGetVertex :: Text -> Maybe Vertex
+  }
+
+instance Show CFG where
+  show = show . cfgGraph

stub-generator.cabal

@@ -17,6 +17,7 @@ library
                      , CFG.Graph
                      , CFG.IR
                      , CFG.C
+                     , CFG.Types
   hs-source-dirs:      src
   build-depends:       base >=4.8 && <4.10
                      , megaparsec >= 5 && <5.1