Cleared up a problem where passes from the Rain list could be enabled in occam and vice versa

2009-03-20 15:16:20 +00:00 · 2009-03-20 15:16:20 +00:00 · 88077ce755
commit 88077ce755
parent b6b0577ecd
1 changed files with 4 additions and 3 deletions
--- a/pass/PassList.hs
+++ b/pass/PassList.hs
@ -59,7 +59,6 @@ commonPasses opts = concat $
  , enablePassesWhen (not . csUsageChecking)
    [pass "Usage checking turned OFF" Prop.agg_namesDone [Prop.parUsageChecked]
      return]
-    -- TODO add an implicit mobility pass after these two:
  , enablePassesWhen csClassicOccamMobility [mobiliseArrays, inferDeref, implicitMobility]
  , simplifyAbbrevs
  , simplifyComms
@ -100,8 +99,10 @@ nullStateBodies = Pass
 getPassList :: CompState -> [Pass]
 getPassList optsPS = checkList $ filterPasses optsPS $ concat
                                [ [nullStateBodies]
-                                , occamPasses
-                                , rainPasses
+                                , enablePassesWhen ((== FrontendOccam) . csFrontend)
+                                    occamPasses
+                                , enablePassesWhen ((== FrontendRain) . csFrontend)
+                                    rainPasses
                                , commonPasses optsPS
                                , genCPasses
                                , genCPPCSPPasses