[commit: ghc] monad-comp: Merge remote branch 'origin/master' into monad-comp (5ccf658)
Simon Peyton Jones
simonpj at microsoft.com
Fri Apr 29 19:05:23 CEST 2011
Repository : ssh://darcs.haskell.org//srv/darcs/ghc
On branch : monad-comp
http://hackage.haskell.org/trac/ghc/changeset/5ccf658872ea2304f34eda6b1fb840fc1bfc0ba0
>---------------------------------------------------------------
commit 5ccf658872ea2304f34eda6b1fb840fc1bfc0ba0
Merge: 478e69b... 51bbdda...
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date: Thu Apr 28 11:50:15 2011 +0100
Merge remote branch 'origin/master' into monad-comp
Conflicts:
compiler/main/HscMain.lhs
.gitignore | 2 +-
aclocal.m4 | 83 ++----
boot | 202 ++++++++++---
boot-pkgs | 114 -------
compiler/Makefile.local | 75 -----
compiler/basicTypes/Module.lhs | 11 +-
compiler/basicTypes/Name.lhs | 3 +-
compiler/basicTypes/NameSet.lhs | 12 +-
compiler/basicTypes/OccName.lhs | 3 +-
compiler/basicTypes/SrcLoc.lhs | 8 +-
compiler/basicTypes/Var.lhs | 3 +-
compiler/cmm/CmmCPS.hs | 5 +-
compiler/cmm/CmmLint.hs | 1 +
compiler/cmm/CmmParse.y | 28 ++-
compiler/cmm/CmmProcPoint.hs | 2 +
compiler/cmm/CmmStackLayout.hs | 152 ++++++++--
compiler/cmm/cmm-notes | 29 +-
compiler/ghc.mk | 4 -
compiler/hsSyn/HsDecls.lhs | 30 +--
compiler/hsSyn/HsImpExp.lhs | 11 +-
compiler/iface/MkIface.lhs | 34 +-
compiler/main/DriverMkDepend.hs | 2 -
compiler/main/DriverPipeline.hs | 6 +-
compiler/main/DynFlags.hs | 312 ++++++++++++--------
compiler/main/GHC.hs | 4 +-
compiler/main/GhcMake.hs | 9 +-
compiler/main/HscMain.lhs | 11 +-
compiler/main/HscTypes.lhs | 2 +-
compiler/main/Packages.lhs | 2 +-
compiler/main/StaticFlags.hs | 18 +-
compiler/main/SysTools.lhs | 104 ++++---
compiler/nativeGen/AsmCodeGen.lhs | 19 ++-
compiler/nativeGen/PPC/CodeGen.hs | 37 ++--
compiler/nativeGen/PPC/Instr.hs | 10 +-
compiler/nativeGen/PPC/Ppr.hs | 2 +-
.../nativeGen/RegAlloc/Linear/JoinToTargets.hs | 2 +-
compiler/nativeGen/SPARC/CodeGen.hs | 16 +-
compiler/nativeGen/SPARC/Instr.hs | 10 +-
compiler/nativeGen/SPARC/Ppr.hs | 2 +-
compiler/nativeGen/X86/CodeGen.hs | 40 ++--
compiler/nativeGen/X86/Instr.hs | 15 +-
compiler/nativeGen/X86/Ppr.hs | 12 +-
compiler/parser/Lexer.x | 42 ++--
compiler/prelude/PrelRules.lhs | 2 +-
compiler/rename/RnSource.lhs | 2 +-
compiler/simplCore/CoreMonad.lhs | 14 +-
compiler/typecheck/TcForeign.lhs | 137 +++++-----
compiler/typecheck/TcInteract.lhs | 9 +-
compiler/utils/Bag.lhs | 3 +-
compiler/utils/Util.lhs | 14 +
configure.ac | 22 +-
distrib/Makefile | 2 +-
distrib/configure.ac.in | 4 +-
docs/users_guide/debugging.xml | 132 +++++++--
docs/users_guide/flags.xml | 52 +++-
docs/users_guide/shared_libs.xml | 2 +-
extra-gcc-opts.in | 1 -
ghc.mk | 12 +-
ghc/Main.hs | 42 ++-
ghc/ghc-bin.cabal.in | 2 +-
ghc/ghc.mk | 10 +-
libffi/ghc.mk | 11 +-
libraries/Makefile.common | 118 --------
libraries/Makefile.inc | 8 -
libraries/Makefile.local | 38 ---
libraries/tarballs/time-1.2.0.3.tar.gz | Bin 85069 -> 0 bytes
libraries/tarballs/time-1.2.0.4.tar.gz | Bin 0 -> 85693 bytes
mk/config.mk.in | 37 ++-
rts/ghc.mk | 6 +-
rules/build-package-way.mk | 6 +-
rules/build-prog.mk | 2 +-
rules/c-suffix-rules.mk | 8 +-
rules/distdir-way-opts.mk | 8 +-
rules/hs-suffix-rules-srcdir.mk | 4 +-
rules/package-config.mk | 5 +
settings.in | 4 +
sync-all | 29 +-
utils/ghctags/Main.hs | 3 +-
78 files changed, 1188 insertions(+), 1050 deletions(-)
diff --cc compiler/main/HscMain.lhs
index f0c1111,36e53a8..6a5552f
--- a/compiler/main/HscMain.lhs
+++ b/compiler/main/HscMain.lhs
@@@ -1132,12 -1132,11 +1132,11 @@@ hscTcExpr -- Typecheck an expression (b
hscTcExpr hsc_env expr = runHsc hsc_env $ do
maybe_stmt <- hscParseStmt expr
case maybe_stmt of
- Just (L _ (ExprStmt expr _ _ _)) ->
- ioMsgMaybe $ tcRnExpr hsc_env (hsc_IC hsc_env) expr
- _ ->
- liftIO $ throwIO $ mkSrcErr $ unitBag $
- mkPlainErrMsg noSrcSpan
- (text "not an expression:" <+> quotes (text expr))
- Just (L _ (ExprStmt expr _ _)) ->
++ Just (L _ (ExprStmt expr _ _ _)) ->
+ ioMsgMaybe $ tcRnExpr hsc_env (hsc_IC hsc_env) expr
+ _ ->
+ liftIO $ throwIO $ mkSrcErr $ unitBag $ mkPlainErrMsg noSrcSpan
+ (text "not an expression:" <+> quotes (text expr))
-- | Find the kind of a type
hscKcType
diff --cc compiler/parser/Lexer.x
index 61019b3,a2d2276..46f7488
--- a/compiler/parser/Lexer.x
+++ b/compiler/parser/Lexer.x
@@@ -1873,30 -1873,29 +1873,30 @@@ mkPState flags buf loc
alr_justClosedExplicitLetBlock = False
}
where
- bitmap = genericsBit `setBitIf` xopt Opt_Generics flags
- .|. ffiBit `setBitIf` xopt Opt_ForeignFunctionInterface flags
- .|. parrBit `setBitIf` xopt Opt_ParallelArrays flags
- .|. arrowsBit `setBitIf` xopt Opt_Arrows flags
- .|. thBit `setBitIf` xopt Opt_TemplateHaskell flags
- .|. qqBit `setBitIf` xopt Opt_QuasiQuotes flags
- .|. ipBit `setBitIf` xopt Opt_ImplicitParams flags
- .|. explicitForallBit `setBitIf` xopt Opt_ExplicitForAll flags
- .|. bangPatBit `setBitIf` xopt Opt_BangPatterns flags
- .|. tyFamBit `setBitIf` xopt Opt_TypeFamilies flags
- .|. haddockBit `setBitIf` dopt Opt_Haddock flags
- .|. magicHashBit `setBitIf` xopt Opt_MagicHash flags
- .|. kindSigsBit `setBitIf` xopt Opt_KindSignatures flags
- .|. recursiveDoBit `setBitIf` xopt Opt_RecursiveDo flags
- .|. recBit `setBitIf` xopt Opt_DoRec flags
- .|. recBit `setBitIf` xopt Opt_Arrows flags
- .|. unicodeSyntaxBit `setBitIf` xopt Opt_UnicodeSyntax flags
- .|. unboxedTuplesBit `setBitIf` xopt Opt_UnboxedTuples flags
+ bitmap = genericsBit `setBitIf` xopt Opt_Generics flags
+ .|. ffiBit `setBitIf` xopt Opt_ForeignFunctionInterface flags
+ .|. parrBit `setBitIf` xopt Opt_ParallelArrays flags
+ .|. arrowsBit `setBitIf` xopt Opt_Arrows flags
+ .|. thBit `setBitIf` xopt Opt_TemplateHaskell flags
+ .|. qqBit `setBitIf` xopt Opt_QuasiQuotes flags
+ .|. ipBit `setBitIf` xopt Opt_ImplicitParams flags
+ .|. explicitForallBit `setBitIf` xopt Opt_ExplicitForAll flags
+ .|. bangPatBit `setBitIf` xopt Opt_BangPatterns flags
+ .|. tyFamBit `setBitIf` xopt Opt_TypeFamilies flags
+ .|. haddockBit `setBitIf` dopt Opt_Haddock flags
+ .|. magicHashBit `setBitIf` xopt Opt_MagicHash flags
+ .|. kindSigsBit `setBitIf` xopt Opt_KindSignatures flags
+ .|. recursiveDoBit `setBitIf` xopt Opt_RecursiveDo flags
+ .|. recBit `setBitIf` xopt Opt_DoRec flags
+ .|. recBit `setBitIf` xopt Opt_Arrows flags
+ .|. unicodeSyntaxBit `setBitIf` xopt Opt_UnicodeSyntax flags
+ .|. unboxedTuplesBit `setBitIf` xopt Opt_UnboxedTuples flags
.|. datatypeContextsBit `setBitIf` xopt Opt_DatatypeContexts flags
.|. transformComprehensionsBit `setBitIf` xopt Opt_TransformListComp flags
+ .|. transformComprehensionsBit `setBitIf` xopt Opt_MonadComprehensions flags
.|. rawTokenStreamBit `setBitIf` dopt Opt_KeepRawTokenStream flags
.|. alternativeLayoutRuleBit `setBitIf` xopt Opt_AlternativeLayoutRule flags
- .|. relaxedLayoutBit `setBitIf` xopt Opt_RelaxedLayout flags
+ .|. relaxedLayoutBit `setBitIf` xopt Opt_RelaxedLayout flags
.|. nondecreasingIndentationBit `setBitIf` xopt Opt_NondecreasingIndentation flags
--
setBitIf :: Int -> Bool -> Int
More information about the Cvs-ghc
mailing list