Extracted some utility function from CreatedBySpec to Test/Util

Author: Anabra

grin/src/Test/ExtendedSyntax/Util.hs

@@ -5,11 +5,19 @@ module Test.ExtendedSyntax.Util where
 
 import System.FilePath
 
+import Data.Set (Set)
+import Data.Map (Map)
+import Data.Vector (Vector)
 import Data.Text (Text)
+
+import qualified Data.Set as Set
+import qualified Data.Map as Map
+import qualified Data.Vector as V
 import qualified Data.Text.IO as T (readFile)
 
 import Grin.ExtendedSyntax.Grin
 import Grin.ExtendedSyntax.Parse
+import AbstractInterpretation.ExtendedSyntax.HeapPointsTo.Result as HPT
 
 import Test.Hspec
 import Test.ExtendedSyntax.Assertions
@@ -56,6 +64,30 @@ cNope = Tag C "Nope"
 cNopeH :: Tag
 cNopeH = Tag C "NopeH"
 
+loc :: HPT.Loc -> TypeSet
+loc = tySetFromTypes . pure . HPT.T_Location
+
+unspecLoc :: TypeSet
+unspecLoc = tySetFromTypes [HPT.T_UnspecifiedLocation]
+
+mkNode :: [[HPT.SimpleType]] -> Vector (Set HPT.SimpleType)
+mkNode = V.fromList . map Set.fromList
+
+mkNodeSet :: [(Tag, [[HPT.SimpleType]])] -> NodeSet
+mkNodeSet = HPT.NodeSet . Map.fromList . map (\(t,v) -> (t,mkNode v))
+
+mkTySet :: [(Tag, [[HPT.SimpleType]])] -> TypeSet
+mkTySet = tySetFromNodeSet . mkNodeSet
+
+tySetFromNodeSet :: NodeSet -> TypeSet
+tySetFromNodeSet = TypeSet mempty
+
+tySetFromTypes :: [HPT.SimpleType] -> TypeSet
+tySetFromTypes = flip TypeSet mempty . Set.fromList
+
+mkSimpleMain :: HPT.SimpleType -> (TypeSet, Vector TypeSet)
+mkSimpleMain t = (tySetFromTypes [t], mempty)
+
 -- name ~ name of the test case, and also the grin source file
 mkBeforeAfterTestCase :: String ->
                          FilePath ->

grin/test/AbstractInterpretation/ExtendedSyntax/CreatedBySpec.hs

@@ -36,14 +36,6 @@ spec = do
       calcHPTResultWithCBy = _hptResult . calcCByResult
       mkProducerSet = ProducerSet . M.fromList . map (\(t,xs) -> (t,S.fromList xs))
       emptyProducerSet = mkProducerSet []
-      unspecLoc = tySetFromTypes [T_UnspecifiedLocation]
-      loc = tySetFromTypes . pure . T_Location
-      mkNode = V.fromList . map S.fromList
-      mkNodeSet = HPT.NodeSet . M.fromList . map (\(t,v) -> (t,mkNode v))
-      mkTySet = tySetFromNodeSet . mkNodeSet
-      tySetFromNodeSet = TypeSet mempty
-      tySetFromTypes = flip TypeSet mempty . S.fromList
-      mkSimpleMain t = (tySetFromTypes [t], mempty)
 
   describe "Created-By producers are calculated correctly for" $ do
     it "pures" $ do