[clean up printing of core passes and steps some more
John Meacham <john@repetae.net>**20060420023054] hunk ./Main.hs 193
+coreMini = dump FD.CoreMini
+corePass = dump FD.CorePass
+coreSteps = dump FD.CoreSteps
+miniCorePass = coreMini && corePass
+miniCoreSteps = coreMini && coreSteps
+
hunk ./Main.hs 290
-        when (dump FD.Lambdacube || dump FD.CorePass) $ putErrLn ("----\n" ++ pprint names)
+        when coreMini $ putErrLn ("----\n" ++ pprint names)
hunk ./Main.hs 300
-        mprog <- simplifyProgram sopt "SuperSimplify" False mprog
+        mprog <- simplifyProgram sopt "SuperSimplify" (dump FD.CoreMini) mprog
hunk ./Main.hs 302
-        mprog <- transformProgram "floatOutward" DontIterate (dump FD.CorePass) floatOutward mprog
+        mprog <- transformProgram "floatOutward" DontIterate (dump FD.CoreMini) floatOutward mprog
hunk ./Main.hs 304
-        mprog <- transformProgram "float inward" DontIterate (dump FD.CorePass) (programMapBodies (return . floatInward allRules)) mprog
+        mprog <- transformProgram "float inward" DontIterate (dump FD.CoreMini) (programMapBodies (return . floatInward allRules)) mprog
hunk ./Main.hs 313
-        when (dump FD.CoreMini && dump FD.CorePass) $ mapM_ (\ (v,lc) -> printCheckName'' fullDataTable v lc) (programDs mprog)
-        when (dump FD.CoreMini && dump FD.CoreSteps) $ Stats.print ("InitialOptimize:" ++ pprint names) mstats
+        when miniCorePass $ mapM_ (\ (v,lc) -> printCheckName'' fullDataTable v lc) (programDs mprog)
+        when miniCoreSteps $ Stats.print ("InitialOptimize:" ++ pprint names) mstats
hunk ./Main.hs 344
-        when (dump FD.Lambdacube || dump FD.CorePass) $ putErrLn ("----\n" ++ pprint names)
+        when coreMini $ putErrLn ("----\n" ++ pprint names)
hunk ./Main.hs 347
-        wdump FD.Lambdacube $ mapM_ (\ (v,lc) -> printCheckName'' fullDataTable v lc) cds
+        when miniCorePass $ mapM_ (\ (v,lc) -> printCheckName'' fullDataTable v lc) cds
hunk ./Main.hs 352
-            wdump FD.CorePass $ printCheckName fullDataTable e''
+            when miniCorePass  $ printCheckName fullDataTable e''
hunk ./Main.hs 359
-            lc <- doopt mangle False stats ("SuperSimplify 1: " ++ pprint v) cm lc
-            lc <- mangle (return ()) False ("Barendregt: " ++ pprint v) (return . barendregt) lc
-            lc <- doopt mangle False stats "Float Inward..." (\stats x -> return (floatInward allRules x)) lc
+            lc <- doopt mangle coreMini stats ("SuperSimplify 1: " ++ pprint v) cm lc
+            lc <- mangle (return ()) coreMini ("Barendregt: " ++ pprint v) (return . barendregt) lc
+            lc <- doopt mangle coreMini stats "Float Inward..." (\stats x -> return (floatInward allRules x)) lc
hunk ./Main.hs 369
-            lc <- doopt mangle False stats ("SuperSimplify 2: " ++ pprint v) cm lc
-            lc <- mangle (return ()) False ("Barendregt: " ++ pprint v) (return . barendregt) lc
+            lc <- doopt mangle coreMini stats ("SuperSimplify 2: " ++ pprint v) cm lc
+            lc <- mangle (return ()) coreMini ("Barendregt: " ++ pprint v) (return . barendregt) lc
hunk ./Main.hs 377
-        wdump FD.Lambdacube $ mapM_ (\ (v,lc) -> printCheckName' fullDataTable v lc) cds
+        when miniCorePass  $ mapM_ (\ (v,lc) -> printCheckName' fullDataTable v lc) cds
hunk ./Main.hs 397
-                    wdump FD.CorePass $ printCheckName fullDataTable e''
+                    when miniCorePass  $ printCheckName fullDataTable e''
hunk ./Main.hs 456
-programPrune prog = transformProgram "Prune Unreachable" DontIterate (dump FD.CorePass) (return . programPruneUnreachable) prog
+programPrune prog = transformProgram "Prune Unreachable" DontIterate (dump FD.CorePass || coreMini) (return . programPruneUnreachable) prog
hunk ./Main.hs 461
-    transformProgram "eta expansion" DontIterate (dump FD.CorePass) (const $ return prog' { progStats = progStats prog' `mappend` stats }) prog
+    transformProgram "eta expansion" DontIterate (dump FD.CorePass || coreMini) (const $ return prog' { progStats = progStats prog' `mappend` stats }) prog
hunk ./Main.hs 719
-    when ((dodump && dump FD.Progress) || dump FD.CorePass) $ Stats.printStat name (progStats prog)
+    when (dodump && (dump FD.Progress || coreSteps)) $ Stats.printStat ("Total: " ++ name) (progStats prog)
hunk ./Main.hs 726
-    when ((dodump && dump FD.Progress) || dump FD.CorePass) $ Stats.printStat name (progStats prog)
+    when ((dodump && dump FD.Progress) || dump FD.CoreSteps) $ Stats.printStat ("Total: " ++ name) (progStats prog)
hunk ./Main.hs 733
-    when ((dodump && dump FD.Progress) || dump FD.CorePass) $ Stats.printStat name (progStats prog)
+    when (dodump && (dump FD.Progress || coreSteps)) $ Stats.printStat ("Total: " ++ name) (progStats prog)
hunk ./Main.hs 795
-            when ((dmp && dump FD.Progress) || dump FD.CoreSteps) $ Stats.print "Optimization" stats'
+            when ((dmp && dump FD.Progress) || dmp && coreSteps) $ Stats.print "Optimization" stats'
hunk ./Main.hs 810
-    when ((b && dump FD.Progress) || dump FD.CorePass) $ putErrLn $ "-- " ++ s
+    when ((b && dump FD.Progress) || (b && dump FD.CorePass)) $ putErrLn $ "-- " ++ s