[clean up preprocessing a little
John Meacham <john@repetae.net>**20100803073754
 Ignore-this: c1064468bed864231c2d5fb3a68bbeaf
] hunk ./src/Ho/Build.hs 7
+    preprocessHs,
hunk ./src/Ho/Build.hs 34
-import Name.Name
hunk ./src/Ho/Build.hs 56
+import Name.Name
+import Options
hunk ./src/Ho/Build.hs 678
-preprocess :: FilePath -> LBS.ByteString -> IO LBS.ByteString
-preprocess fn lbs = do
-    let fopts s = s `member` optFOptsSet initialOpts
-        initialOpts = collectFileOpts fn (LBSU.toString $ LBS.take 2048 lbs)
-        incFlags = [ "-I" ++ d | d <- optIncdirs options ++ optIncs initialOpts]
-        defFlags = ("-D__JHC__=" ++ revision):("-D__JHC_VERSION__=" ++ version):[ "-D" ++ d | d <- optDefs initialOpts]
+preprocessHs :: FilePath -> LBS.ByteString -> IO LBS.ByteString
+preprocessHs fn lbs = preprocess (collectFileOpts fn (LBSU.toString $ LBS.take 2048 lbs)) fn lbs
hunk ./src/Ho/Build.hs 681
+preprocess :: Opt -> FilePath -> LBS.ByteString -> IO LBS.ByteString
+preprocess opt fn lbs = do
+    let fopts s = s `member` optFOptsSet opt
+        incFlags = [ "-I" ++ d | d <- optIncdirs options ++ optIncs opt]
+        defFlags = ("-D__JHC__=" ++ revision):("-D__JHC_VERSION__=" ++ version):[ "-D" ++ d | d <- optDefs opt]
hunk ./src/Ho/Build.hs 698
-    lbs' <- preprocess fn lbs
+    let fileOpts = collectFileOpts fn (LBSU.toString $ LBS.take 2048 lbs)
+    lbs' <- preprocess fileOpts fn lbs
hunk ./src/Main.hs 44
-        Preprocess      -> do
-            forM_ (optArgs o) $ \fn -> do
-                LBS.readFile fn >>= preprocess fn >>= LBS.putStr
+        Preprocess      -> forM_ (optArgs o) $ \fn -> do
+            lbs <- LBS.readFile fn
+            res <- preprocessHs fn lbs
+            LBS.putStr res