Briefly fixed CheckFramework (and Checks) to compile, but not yet switched them over to using the Polyplate traversal mechanisms
This commit is contained in:
parent
2349474ba6
commit
754bb7f023
|
@ -448,7 +448,7 @@ showCodeExSet (NormalSet s)
|
||||||
= do ss <- mapM showCode (Set.toList s)
|
= do ss <- mapM showCode (Set.toList s)
|
||||||
return $ "{" ++ joinWith ", " ss ++ "}"
|
return $ "{" ++ joinWith ", " ss ++ "}"
|
||||||
|
|
||||||
checkInitVarPass :: Pass
|
checkInitVarPass :: Pass A.AST
|
||||||
checkInitVarPass = pass "checkInitVar" [] []
|
checkInitVarPass = pass "checkInitVar" [] []
|
||||||
(passOnlyOnAST "checkInitVar" $ runChecks checkInitVar)
|
(passOnlyOnAST "checkInitVar" $ runChecks checkInitVar)
|
||||||
|
|
||||||
|
|
|
@ -421,7 +421,7 @@ applyAccum (accEmpty, accOneF, accJoinF) typeKeysGiven = applyAccum'
|
||||||
f' (x, route, acc) = do
|
f' (x, route, acc) = do
|
||||||
x' <- f (x, route, acc)
|
x' <- f (x, route, acc)
|
||||||
case x' of
|
case x' of
|
||||||
Left y -> f' (y, route, foldl (flip accOneF) accEmpty (fastListify (const True) y))
|
Left y -> f' (y, route, foldl (flip accOneF) accEmpty (listify {-TODO-} (const True) y))
|
||||||
Right y -> return y
|
Right y -> return y
|
||||||
|
|
||||||
applyTopDown :: TypeSet -> (forall a. Data a => TransFunc a) ->
|
applyTopDown :: TypeSet -> (forall a. Data a => TransFunc a) ->
|
||||||
|
@ -465,7 +465,7 @@ runChecks :: CheckOptM () -> A.AST -> PassM A.AST
|
||||||
runChecks (CheckOptM m) x = execStateT m (CheckOptData {ast = x, parItems = Nothing,
|
runChecks (CheckOptM m) x = execStateT m (CheckOptData {ast = x, parItems = Nothing,
|
||||||
nextVarsTouched = Map.empty, flowGraphRootsTerms = Nothing, lastValidMeta = emptyMeta}) >>* ast
|
nextVarsTouched = Map.empty, flowGraphRootsTerms = Nothing, lastValidMeta = emptyMeta}) >>* ast
|
||||||
|
|
||||||
runChecksPass :: CheckOptM () -> Pass
|
runChecksPass :: CheckOptM () -> Pass A.AST
|
||||||
runChecksPass c = pass "<Check>" [] [] (mkM (runChecks c))
|
runChecksPass c = pass "<Check>" [] [] (mkM (runChecks c))
|
||||||
|
|
||||||
--getParItems :: CheckOptM (ParItems ())
|
--getParItems :: CheckOptM (ParItems ())
|
||||||
|
|
Loading…
Reference in New Issue
Block a user