Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : master
http://hackage.haskell.org/trac/ghc/changeset/3475561ee6210f8c570b5bbc47ed9355e435279f >--------------------------------------------------------------- commit 3475561ee6210f8c570b5bbc47ed9355e435279f Author: David Terei <[email protected]> Date: Fri Nov 18 15:44:14 2011 -0800 Tabs -> Spaces + cleaning >--------------------------------------------------------------- compiler/ghci/ByteCodeItbls.lhs | 14 -------------- compiler/main/DriverPhases.hs | 18 +++++------------- compiler/main/DriverPipeline.hs | 8 -------- 3 files changed, 5 insertions(+), 35 deletions(-) diff --git a/compiler/ghci/ByteCodeItbls.lhs b/compiler/ghci/ByteCodeItbls.lhs index 3c1cbb5..ed94526 100644 --- a/compiler/ghci/ByteCodeItbls.lhs +++ b/compiler/ghci/ByteCodeItbls.lhs @@ -4,22 +4,8 @@ ByteCodeItbls: Generate infotables for interpreter-made bytecodes \begin{code} -{-# OPTIONS -fno-warn-tabs #-} --- The above warning supression flag is a temporary kludge. --- While working on this module you are encouraged to remove it and --- detab the module (please do the detabbing in a separate patch). See --- http://hackage.haskell.org/trac/ghc/wiki/Commentary/CodingStyle#TabsvsSpaces --- for details - {-# OPTIONS -optc-DNON_POSIX_SOURCE #-} -{-# OPTIONS -w #-} --- The above warning supression flag is a temporary kludge. --- While working on this module you are encouraged to remove it and fix --- any warnings in the module. See --- http://hackage.haskell.org/trac/ghc/wiki/Commentary/CodingStyle#Warnings --- for details - module ByteCodeItbls ( ItblEnv, ItblPtr(..), itblCode, mkITbls , StgInfoTable(..) ) where diff --git a/compiler/main/DriverPhases.hs b/compiler/main/DriverPhases.hs index 6ece67e..29dbb58 100644 --- a/compiler/main/DriverPhases.hs +++ b/compiler/main/DriverPhases.hs @@ -7,19 +7,12 @@ -- ----------------------------------------------------------------------------- -{-# OPTIONS -fno-warn-tabs #-} --- The above warning supression flag is a temporary kludge. --- While working on this module you are encouraged to remove it and --- detab the module (please do the detabbing in a separate patch). See --- http://hackage.haskell.org/trac/ghc/wiki/Commentary/CodingStyle#TabsvsSpaces --- for details - module DriverPhases ( HscSource(..), isHsBoot, hscSourceString, Phase(..), happensBefore, eqPhase, anyHsc, isStopLn, - startPhase, -- :: String -> Phase - phaseInputExt, -- :: Phase -> String + startPhase, + phaseInputExt, isHaskellishSuffix, isHaskellSrcSuffix, @@ -37,7 +30,7 @@ module DriverPhases ( isExtCoreFilename, isDynLibFilename, isHaskellUserSrcFilename, - isSourceFilename -- :: FilePath -> Bool + isSourceFilename ) where #include "HsVersions.h" @@ -125,8 +118,8 @@ eqPhase HCc HCc = True eqPhase Splitter Splitter = True eqPhase SplitAs SplitAs = True eqPhase As As = True -eqPhase LlvmOpt LlvmOpt = True -eqPhase LlvmLlc LlvmLlc = True +eqPhase LlvmOpt LlvmOpt = True +eqPhase LlvmLlc LlvmLlc = True eqPhase LlvmMangle LlvmMangle = True eqPhase CmmCpp CmmCpp = True eqPhase Cmm Cmm = True @@ -281,4 +274,3 @@ isHaskellUserSrcFilename f = isHaskellUserSrcSuffix (drop 1 $ takeExtension f) isDynLibFilename f = isDynLibSuffix (drop 1 $ takeExtension f) isSourceFilename f = isSourceSuffix (drop 1 $ takeExtension f) - diff --git a/compiler/main/DriverPipeline.hs b/compiler/main/DriverPipeline.hs index e590658..6228d10 100644 --- a/compiler/main/DriverPipeline.hs +++ b/compiler/main/DriverPipeline.hs @@ -1000,11 +1000,6 @@ runPhase Cmm input_fn dflags io $ hscCompileCmmFile hsc_env input_fn - -- XXX: catch errors above and convert them into ghcError? Original - -- code was: - -- - --when (not ok) $ ghcError (PhaseFailed "cmm" (ExitFailure 1)) - return (next_phase, output_fn) ----------------------------------------------------------------------------- @@ -1063,7 +1058,6 @@ runPhase cc_phase input_fn dflags | otherwise = "-O" -- Decide next phase - let next_phase = As output_fn <- phaseOutputFilename next_phase @@ -1136,8 +1130,6 @@ runPhase cc_phase input_fn dflags return (next_phase, output_fn) - -- ToDo: postprocess the output from gcc - ----------------------------------------------------------------------------- -- Splitting phase _______________________________________________ Cvs-ghc mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-ghc
