[commit: ghc] master: compiler: add new modules pulling in FunFlags (65cae36)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/65cae368e2e5fdc537f616ff98a5cffc2e6071e3/ghc

>---------------------------------------------------------------

commit 65cae368e2e5fdc537f616ff98a5cffc2e6071e3
Author: Sergei Trofimovich <slyfox at gentoo.org>
Date:   Thu Nov 27 22:08:32 2014 +0000

    compiler: add new modules pulling in FunFlags
    
    And also sync type signature under '#ifndef GHCI'
    Tested by setting
        GhcWithInterpreter = NO
    
    Signed-off-by: Sergei Trofimovich <slyfox at gentoo.org>


>---------------------------------------------------------------

65cae368e2e5fdc537f616ff98a5cffc2e6071e3
 compiler/ghc.mk              | 7 +++----
 compiler/rename/RnSplice.lhs | 2 +-
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/compiler/ghc.mk b/compiler/ghc.mk
index 2912aab..640bf75 100644
--- a/compiler/ghc.mk
+++ b/compiler/ghc.mk
@@ -472,6 +472,7 @@ compiler_stage3_SplitObjs = NO
 compiler_stage2_dll0_START_MODULE = DynFlags
 compiler_stage2_dll0_MODULES = \
 	Annotations \
+	ApiAnnotation \
 	Avail \
 	Bag \
 	BasicTypes \
@@ -498,6 +499,7 @@ compiler_stage2_dll0_MODULES = \
 	CoreUnfold \
 	CoreUtils \
 	CostCentre \
+	Ctype \
 	DataCon \
 	Demand \
 	Digraph \
@@ -539,7 +541,7 @@ compiler_stage2_dll0_MODULES = \
 	InstEnv \
 	Kind \
 	Lexeme \
-	ApiAnnotation \
+	Lexer \
 	ListSetOps \
 	Literal \
 	LoadIface \
@@ -602,7 +604,6 @@ ifeq "$(GhcWithInterpreter)" "YES"
 # These files are reacheable from DynFlags
 # only by GHCi-enabled code (see #9552)
 compiler_stage2_dll0_MODULES += \
-	ApiAnnotation \
 	Bitmap \
 	BlockId \
 	ByteCodeAsm \
@@ -625,13 +626,11 @@ compiler_stage2_dll0_MODULES += \
 	CodeGen.Platform.SPARC \
 	CodeGen.Platform.X86 \
 	CodeGen.Platform.X86_64 \
-	Ctype \
 	FastBool \
 	Hoopl \
 	Hoopl.Dataflow \
 	InteractiveEvalTypes \
 	MkGraph \
-	Lexer \
 	PprCmm \
 	PprCmmDecl \
 	PprCmmExpr \
diff --git a/compiler/rename/RnSplice.lhs b/compiler/rename/RnSplice.lhs
index 8918e39..b0c81b0 100644
--- a/compiler/rename/RnSplice.lhs
+++ b/compiler/rename/RnSplice.lhs
@@ -54,7 +54,7 @@ rnSpliceType e _ = failTH e "Template Haskell type splice"
 rnSpliceExpr :: Bool -> HsSplice RdrName -> RnM (HsExpr Name, FreeVars)
 rnSpliceExpr _ e = failTH e "Template Haskell splice"
 
-rnSplicePat :: HsSplice RdrName -> RnM (Pat Name, FreeVars)
+rnSplicePat :: HsSplice RdrName -> RnM (Either (Pat RdrName) (Pat Name), FreeVars)
 rnSplicePat e = failTH e "Template Haskell pattern splice"
 
 rnSpliceDecl :: SpliceDecl RdrName -> RnM (SpliceDecl Name, FreeVars)