diff --git a/Makefile.am b/Makefile.am index 84041a2..c4d5773 100644 --- a/Makefile.am +++ b/Makefile.am @@ -164,7 +164,6 @@ tock_SOURCES_hs += checks/UsageCheckUtils.hs tock_SOURCES_hs += common/Errors.hs tock_SOURCES_hs += common/EvalConstants.hs tock_SOURCES_hs += common/EvalLiterals.hs -tock_SOURCES_hs += common/GenericUtils.hs tock_SOURCES_hs += common/Intrinsics.hs tock_SOURCES_hs += common/Pattern.hs tock_SOURCES_hs += common/PrettyShow.hs diff --git a/checks/CheckFramework.hs b/checks/CheckFramework.hs index cb77a4f..ced3d2b 100644 --- a/checks/CheckFramework.hs +++ b/checks/CheckFramework.hs @@ -42,7 +42,6 @@ import Errors import FlowAlgorithms import FlowGraph import FlowUtils -import GenericUtils import Metadata import Pass import Traversal diff --git a/common/CommonTest.hs b/common/CommonTest.hs index abaa3f6..4582623 100644 --- a/common/CommonTest.hs +++ b/common/CommonTest.hs @@ -25,7 +25,6 @@ import Data.Generics import Test.HUnit hiding (State) import qualified AST as A -import GenericUtils import Metadata import TreeUtils import Types @@ -125,34 +124,10 @@ testDecomp = TestList data NotPartOfAST = NotPartOfAST Int deriving (Show, Typeable, Data) --- | Test 'typeContains'. -testTypeContains :: Test -testTypeContains = TestList - [ - -- AST elements that it should know about - test 0 True (undefined :: A.AST) (undefined :: Meta) - , test 1 False (undefined :: Meta) (undefined :: A.AST) - , test 2 True (undefined :: A.Process) (undefined :: A.Name) - , test 3 False (undefined :: A.AbbrevMode) (undefined :: A.Formal) - , test 4 False (undefined :: String) (undefined :: Meta) - , test 5 True (undefined :: String) (undefined :: Char) - - -- Things outside the AST - , test 100 True (NotPartOfAST 42) (undefined :: String) - , test 101 False (undefined :: String) (NotPartOfAST 42) - ] - where - test :: (Show a, Data a, Typeable a, Show b, Data b, Typeable b) => - Int -> Bool -> a -> b -> Test - test n exp start find - = TestCase $ assertEqual ("testTypeContains " ++ show n) - exp (containsTypes start [typeKey find]) - --Returns the list of tests: tests :: Test tests = TestLabel "CommonTest" $ TestList [ testIsSafeConversion , testCheckTreeForConstr , testDecomp - , testTypeContains ] diff --git a/flow/FlowGraphTest.hs b/flow/FlowGraphTest.hs index 5e2a2d1..ea3d9f9 100644 --- a/flow/FlowGraphTest.hs +++ b/flow/FlowGraphTest.hs @@ -35,7 +35,6 @@ import Test.QuickCheck import qualified AST as A import FlowGraph -import GenericUtils import Metadata import PrettyShow import TestFramework diff --git a/flow/FlowUtils.hs b/flow/FlowUtils.hs index 65420d5..3e86be5 100644 --- a/flow/FlowUtils.hs +++ b/flow/FlowUtils.hs @@ -26,7 +26,6 @@ import Data.Graph.Inductive hiding (run) import qualified AST as A import Data.Generics.Polyplate.Route -import GenericUtils import Metadata import TreeUtils import Utils diff --git a/pass/Traversal.hs b/pass/Traversal.hs index 9d58b3c..356d42e 100644 --- a/pass/Traversal.hs +++ b/pass/Traversal.hs @@ -34,7 +34,6 @@ import Data.Generics.Polyplate.Schemes import qualified AST as A -import GenericUtils import NavAST() import NavASTSpine() import Pass diff --git a/transformations/ImplicitMobility.hs b/transformations/ImplicitMobility.hs index 77f9e3d..f13d89d 100644 --- a/transformations/ImplicitMobility.hs +++ b/transformations/ImplicitMobility.hs @@ -34,7 +34,6 @@ import FlowAlgorithms import FlowGraph import FlowUtils import GenericUtils -import Intrinsics import Metadata import Pass import ShowCode