Merge remote branch 'origin/master' into monad-comp

Conflicts:
	compiler/main/HscMain.lhs

diff --cc compiler/main/DynFlags.hs
Simple merge

diff --cc compiler/main/HscMain.lhs
index f0c1111,36e53a8..6a5552f
--- 1/compiler/main/HscMain.lhs
--- 2/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
--- 1/compiler/parser/Lexer.x
--- 2/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

diff --cc compiler/typecheck/TcRnTypes.lhs
Simple merge

diff --cc docs/users_guide/flags.xml
Simple merge