[clean up code, enable strictness by default
John Meacham <john@repetae.net>**20051002035318] hunk ./E/SSimplify.hs 437
-    forceInline x | Properties p <- Info.fetch (tvrInfo x) = Set.member prop_INLINE p
+    forceInline x
+        | not (fopts FO.InlinePragmas) = False
+        | Properties p <- Info.fetch (tvrInfo x) = Set.member prop_INLINE p
hunk ./FlagOpts.flags 16
-@default inline-pragmas rules wrapper float-in
+@default inline-pragmas rules wrapper float-in strictness
hunk ./Main.hs 143
+    let allHo = ho `mappend` ho'
+
hunk ./Main.hs 158
-    let inscope =  [ tvrNum n | (n,_) <- Map.elems $ hoEs ho ] ++ [tvrNum n | (_,n,_) <- ds ] ++ map tvrNum (methodNames (hoClassHierarchy ho `mappend` hoClassHierarchy ho'))
+    let inscope =  [ tvrNum n | (n,_) <- Map.elems $ hoEs ho ] ++ [tvrNum n | (_,n,_) <- ds ] ++ map tvrNum (methodNames (hoClassHierarchy allHo))
hunk ./Main.hs 172
-        lc <- mangle False ("Annotate") (annotate annmap (idann (hoRules ho `mappend` hoRules ho') (hoProps ho `mappend` hoProps ho')) letann lamann) lc
+        lc <- mangle False ("Annotate") (annotate annmap (idann (hoRules allHo) (hoProps allHo)) letann lamann) lc
hunk ./Main.hs 179
-            let sopt = mempty { SS.so_exports = inscope, SS.so_boundVars = smap, SS.so_rules = allRules, SS.so_dataTable = fullDataTable, SS.so_properties = (if fopts FO.InlinePragmas then  hoProps ho else mempty) }
+            let sopt = mempty { SS.so_exports = inscope, SS.so_boundVars = smap, SS.so_rules = allRules, SS.so_dataTable = fullDataTable }
hunk ./Main.hs 195
-    let imap = annotateMethods (hoClassHierarchy ho `mappend` hoClassHierarchy ho') allRules (hoProps ho `mappend` hoProps ho')
+    let imap = annotateMethods (hoClassHierarchy allHo) allRules (hoProps allHo)
hunk ./Main.hs 254
-        let sopt = mempty { SS.so_rules = rules, SS.so_dataTable = dataTable, SS.so_properties = (if fopts FO.InlinePragmas then  hoProps ho else mempty) }
+        let sopt = mempty { SS.so_rules = rules, SS.so_dataTable = dataTable }
hunk ./Main.hs 263
-    -- (lc,_) <- return $ E.CPR.cprAnalyze mempty lc
-    -- sequence_ [ putStrLn $ (tvrShowName t) <+> show (maybe E.CPR.Top id (Info.lookup (tvrInfo t)) ::  E.CPR.Val) | (t,_,_) <- scCombinators $ eToSC dataTable lc ]
-    --lc <- opt "Simplification..." esimplify lc
+    --(lc,_) <- return $ E.CPR.cprAnalyze mempty lc
+    --sequence_ [ putStrLn $ (tvrShowName t) <+> show (maybe E.CPR.Top id (Info.lookup (tvrInfo t)) ::  E.CPR.Val) | (t,_,_) <- scCombinators $ eToSC dataTable lc ]
hunk ./Main.hs 266
-    --wdump FD.Progress $ printEStats lc
hunk ./Main.hs 267
-    --wdump FD.Progress $ printEStats lc
-    --wdump FD.Lambdacube $ printCheckName dataTable lc
hunk ./Main.hs 268
-    --mapM_ putErrLn $  sort [ tshow x <+> "->" <+> tshow y | (x@(E.Strictness.V i),y@Lam {}) <- vs, odd i]
-    --let esimplify = E.Simplify.simplify mempty { so_dataTable = dataTable, so_properties = (if fopts FO.InlinePragmas then  hoProps ho else mempty), so_rules = rules, so_strictness = Map.fromList [ (i,S n) | (E.Strictness.V i,S n) <- vs] }
-    --lc <- opt "Strictness Simplification..." (\ss e -> esimplify ss e >>= \e' -> printCheckName dataTable e' >> return e' ) lc
-    -- lc <- opt "Strictness Simplification..." esimplify lc
+    mapM_ putErrLn $  sort [ tshow x <+> "->" <+> tshow y | (x@(E.Strictness.V i),y@Lam {}) <- vs, odd i]
hunk ./Main.hs 270
-        let sopt = mempty { SS.so_rules = rules, SS.so_dataTable = dataTable, SS.so_properties = (if fopts FO.InlinePragmas then  hoProps ho else mempty), SS.so_strictness = Map.fromList [ (i,S n) | (E.Strictness.V i,S n) <- vs] }
+        let sopt = mempty { SS.so_rules = rules, SS.so_dataTable = dataTable,  SS.so_strictness = Map.fromList [ (i,S n) | (E.Strictness.V i,S n) <- vs] }