[commit: ghc] master: Add LANGUAGE pragmas to compiler/ source files (2389244)
git at git.haskell.org
git at git.haskell.org
Thu May 15 08:33:12 UTC 2014
Repository : ssh://git@git.haskell.org/ghc
On branch : master
Link : http://ghc.haskell.org/trac/ghc/changeset/23892440032fcab8a6a753916d506857674169ec/ghc
>---------------------------------------------------------------
commit 23892440032fcab8a6a753916d506857674169ec
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date: Wed May 14 19:46:28 2014 +0200
Add LANGUAGE pragmas to compiler/ source files
In some cases, the layout of the LANGUAGE/OPTIONS_GHC lines has been
reorganized, while following the convention, to
- place `{-# LANGUAGE #-}` pragmas at the top of the source file, before
any `{-# OPTIONS_GHC #-}`-lines.
- Moreover, if the list of language extensions fit into a single
`{-# LANGUAGE ... -#}`-line (shorter than 80 characters), keep it on one
line. Otherwise split into `{-# LANGUAGE ... -#}`-lines for each
individual language extension. In both cases, try to keep the
enumeration alphabetically ordered.
(The latter layout is preferable as it's more diff-friendly)
While at it, this also replaces obsolete `{-# OPTIONS ... #-}` pragma
occurences by `{-# OPTIONS_GHC ... #-}` pragmas.
>---------------------------------------------------------------
23892440032fcab8a6a753916d506857674169ec
compiler/basicTypes/ConLike.lhs | 1 +
compiler/basicTypes/DataCon.lhs | 3 +-
compiler/basicTypes/Demand.lhs | 1 +
compiler/basicTypes/Id.lhs | 2 ++
compiler/basicTypes/IdInfo.lhs | 2 +-
compiler/basicTypes/Literal.lhs | 2 +-
compiler/basicTypes/MkId.lhs | 3 +-
compiler/basicTypes/Module.lhs | 1 +
compiler/basicTypes/Name.lhs | 2 ++
compiler/basicTypes/NameEnv.lhs | 3 +-
compiler/basicTypes/NameSet.lhs | 3 +-
compiler/basicTypes/OccName.lhs | 4 ++-
compiler/basicTypes/PatSyn.lhs | 1 +
compiler/basicTypes/RdrName.lhs | 2 +-
compiler/basicTypes/SrcLoc.lhs | 1 +
compiler/basicTypes/UniqSupply.lhs | 2 ++
compiler/basicTypes/Unique.lhs | 2 +-
compiler/basicTypes/Var.lhs | 3 +-
compiler/basicTypes/VarSet.lhs | 3 +-
compiler/cmm/Bitmap.hs | 2 ++
compiler/cmm/BlockId.hs | 4 ++-
compiler/cmm/Cmm.hs | 2 +-
compiler/cmm/CmmBuildInfoTables.hs | 2 +-
compiler/cmm/CmmCallConv.hs | 1 +
compiler/cmm/CmmExpr.hs | 3 ++
compiler/cmm/CmmInfo.hs | 3 +-
compiler/cmm/CmmLayoutStack.hs | 2 +-
compiler/cmm/CmmLive.hs | 1 +
compiler/cmm/CmmMachOp.hs | 1 +
compiler/cmm/CmmNode.hs | 7 +++-
compiler/cmm/CmmOpt.hs | 2 ++
compiler/cmm/CmmPipeline.hs | 2 ++
compiler/cmm/CmmType.hs | 1 +
compiler/cmm/CmmUtils.hs | 2 +-
compiler/cmm/Hoopl.hs | 2 ++
compiler/cmm/Hoopl/Dataflow.hs | 13 ++++---
compiler/cmm/MkGraph.hs | 2 +-
compiler/cmm/PprC.hs | 3 +-
compiler/cmm/PprCmm.hs | 5 +--
compiler/cmm/PprCmmDecl.hs | 2 ++
compiler/cmm/SMRep.lhs | 2 +-
compiler/codeGen/CgUtils.hs | 3 +-
compiler/codeGen/CodeGen/Platform/ARM.hs | 1 +
compiler/codeGen/CodeGen/Platform/NoRegs.hs | 1 +
compiler/codeGen/CodeGen/Platform/PPC.hs | 1 +
compiler/codeGen/CodeGen/Platform/PPC_Darwin.hs | 1 +
compiler/codeGen/CodeGen/Platform/SPARC.hs | 1 +
compiler/codeGen/CodeGen/Platform/X86.hs | 1 +
compiler/codeGen/CodeGen/Platform/X86_64.hs | 1 +
compiler/codeGen/StgCmm.hs | 2 ++
compiler/codeGen/StgCmmBind.hs | 2 ++
compiler/codeGen/StgCmmClosure.hs | 4 +--
compiler/codeGen/StgCmmCon.hs | 2 ++
compiler/codeGen/StgCmmEnv.hs | 2 ++
compiler/codeGen/StgCmmExpr.hs | 2 ++
compiler/codeGen/StgCmmForeign.hs | 2 ++
compiler/codeGen/StgCmmHeap.hs | 2 ++
compiler/codeGen/StgCmmLayout.hs | 2 ++
compiler/codeGen/StgCmmMonad.hs | 3 +-
compiler/codeGen/StgCmmPrim.hs | 2 ++
compiler/codeGen/StgCmmProf.hs | 2 ++
compiler/codeGen/StgCmmTicky.hs | 2 ++
compiler/codeGen/StgCmmUtils.hs | 2 ++
compiler/coreSyn/CoreArity.lhs | 3 +-
compiler/coreSyn/CoreFVs.lhs | 2 ++
compiler/coreSyn/CoreLint.lhs | 7 +---
compiler/coreSyn/CorePrep.lhs | 2 +-
compiler/coreSyn/CoreSubst.lhs | 3 +-
compiler/coreSyn/CoreSyn.lhs | 5 ++-
compiler/coreSyn/CoreTidy.lhs | 3 +-
compiler/coreSyn/CoreUnfold.lhs | 3 +-
compiler/coreSyn/CoreUtils.lhs | 2 ++
compiler/coreSyn/MkCore.lhs | 3 +-
compiler/coreSyn/TrieMap.lhs | 4 +--
compiler/deSugar/Check.lhs | 2 ++
compiler/deSugar/Coverage.lhs | 2 ++
compiler/deSugar/Desugar.lhs | 2 ++
compiler/deSugar/DsArrows.lhs | 3 +-
compiler/deSugar/DsBinds.lhs | 3 +-
compiler/deSugar/DsCCall.lhs | 3 +-
compiler/deSugar/DsExpr.lhs | 2 ++
compiler/deSugar/DsForeign.lhs | 2 ++
compiler/deSugar/DsGRHSs.lhs | 2 ++
compiler/deSugar/DsListComp.lhs | 2 +-
compiler/deSugar/DsMeta.hs | 2 ++
compiler/deSugar/DsMonad.lhs | 2 ++
compiler/deSugar/DsUtils.lhs | 3 +-
compiler/deSugar/Match.lhs | 2 ++
compiler/deSugar/MatchCon.lhs | 3 +-
compiler/deSugar/MatchLit.lhs | 2 ++
compiler/ghc.cabal.in | 41 ++++++++++++++++------
compiler/ghci/ByteCodeAsm.lhs | 4 +--
compiler/ghci/ByteCodeGen.lhs | 3 +-
compiler/ghci/ByteCodeInstr.lhs | 3 +-
compiler/ghci/ByteCodeItbls.lhs | 3 +-
compiler/ghci/ByteCodeLink.lhs | 7 +++-
compiler/ghci/Debugger.hs | 2 ++
compiler/ghci/DebuggerUtils.hs | 2 ++
compiler/ghci/Linker.lhs | 7 ++--
compiler/ghci/RtClosureInspect.hs | 4 ++-
compiler/hsSyn/Convert.lhs | 2 ++
compiler/hsSyn/HsDoc.hs | 2 +-
compiler/hsSyn/HsExpr.lhs | 2 +-
compiler/hsSyn/HsLit.lhs | 4 +--
compiler/hsSyn/HsUtils.lhs | 3 +-
compiler/iface/BinIface.hs | 2 ++
compiler/iface/BuildTyCl.lhs | 3 +-
compiler/iface/IfaceEnv.lhs | 3 +-
compiler/iface/IfaceSyn.lhs | 3 +-
compiler/iface/LoadIface.lhs | 1 +
compiler/iface/MkIface.lhs | 2 ++
compiler/iface/TcIface.lhs | 2 ++
compiler/llvmGen/Llvm/PpLlvm.hs | 2 ++
compiler/llvmGen/Llvm/Types.hs | 2 +-
compiler/llvmGen/LlvmCodeGen.hs | 4 +--
compiler/llvmGen/LlvmCodeGen/Base.hs | 2 ++
compiler/llvmGen/LlvmCodeGen/CodeGen.hs | 5 ++-
compiler/llvmGen/LlvmCodeGen/Data.hs | 1 +
compiler/llvmGen/LlvmCodeGen/Ppr.hs | 3 +-
compiler/llvmGen/LlvmCodeGen/Regs.hs | 2 ++
compiler/llvmGen/LlvmMangler.hs | 2 ++
compiler/main/BreakArray.hs | 2 ++
compiler/main/CmdLineParser.hs | 2 ++
compiler/main/CodeOutput.lhs | 2 ++
compiler/main/DriverMkDepend.hs | 2 ++
compiler/main/DriverPhases.hs | 2 ++
compiler/main/DriverPipeline.hs | 4 +--
compiler/main/DynFlags.hs | 4 ++-
compiler/main/DynamicLoading.hs | 2 ++
compiler/main/ErrUtils.lhs | 1 +
compiler/main/Finder.lhs | 2 ++
compiler/main/GHC.hs | 2 ++
compiler/main/GhcMake.hs | 2 +-
compiler/main/GhcMonad.hs | 1 +
compiler/main/HeaderInfo.hs | 2 ++
compiler/main/HscMain.hs | 2 ++
compiler/main/HscTypes.lhs | 1 +
compiler/main/InteractiveEval.hs | 2 ++
compiler/main/InteractiveEvalTypes.hs | 2 ++
compiler/main/PackageConfig.hs | 2 ++
compiler/main/Packages.lhs | 2 ++
compiler/main/PlatformConstants.hs | 2 ++
compiler/main/PprTyThing.hs | 2 +-
compiler/main/StaticFlags.hs | 3 +-
compiler/main/SysTools.lhs | 2 ++
compiler/main/TidyPgm.lhs | 2 ++
compiler/nativeGen/AsmCodeGen.lhs | 3 +-
compiler/nativeGen/NCGMonad.hs | 2 ++
compiler/nativeGen/PPC/CodeGen.hs | 2 +-
compiler/nativeGen/PPC/Cond.hs | 2 +-
compiler/nativeGen/PPC/Instr.hs | 2 ++
compiler/nativeGen/PPC/RegInfo.hs | 4 ++-
compiler/nativeGen/PPC/Regs.hs | 2 ++
compiler/nativeGen/Reg.hs | 2 +-
compiler/nativeGen/RegAlloc/Graph/Main.hs | 2 ++
compiler/nativeGen/RegAlloc/Graph/Stats.hs | 1 +
compiler/nativeGen/RegAlloc/Graph/TrivColorable.hs | 2 +-
compiler/nativeGen/RegAlloc/Linear/FreeRegs.hs | 1 +
compiler/nativeGen/RegAlloc/Linear/Main.hs | 2 ++
compiler/nativeGen/RegAlloc/Linear/PPC/FreeRegs.hs | 1 -
compiler/nativeGen/RegAlloc/Linear/State.hs | 2 ++
compiler/nativeGen/RegAlloc/Liveness.hs | 7 +++-
compiler/nativeGen/RegClass.hs | 2 +-
compiler/nativeGen/SPARC/CodeGen.hs | 2 ++
compiler/nativeGen/SPARC/CodeGen/Amode.hs | 2 +-
compiler/nativeGen/SPARC/CodeGen/Base.hs | 2 +-
compiler/nativeGen/SPARC/CodeGen/CondCode.hs | 2 +-
compiler/nativeGen/SPARC/CodeGen/Expand.hs | 2 +-
compiler/nativeGen/SPARC/CodeGen/Gen32.hs | 2 +-
compiler/nativeGen/SPARC/CodeGen/Sanity.hs | 2 +-
compiler/nativeGen/SPARC/Cond.hs | 2 +-
compiler/nativeGen/SPARC/Imm.hs | 2 +-
compiler/nativeGen/SPARC/Instr.hs | 4 ++-
compiler/nativeGen/SPARC/Ppr.hs | 2 ++
compiler/nativeGen/SPARC/Regs.hs | 2 +-
compiler/nativeGen/SPARC/ShortcutJump.hs | 2 +-
compiler/nativeGen/SPARC/Stack.hs | 2 +-
compiler/nativeGen/Size.hs | 2 +-
compiler/nativeGen/TargetReg.hs | 4 +--
compiler/nativeGen/X86/CodeGen.hs | 3 +-
compiler/nativeGen/X86/Instr.hs | 9 ++---
compiler/nativeGen/X86/Ppr.hs | 2 ++
compiler/nativeGen/X86/RegInfo.hs | 4 +--
compiler/nativeGen/X86/Regs.hs | 2 ++
compiler/parser/Ctype.lhs | 3 +-
compiler/parser/RdrHsSyn.lhs | 2 ++
compiler/prelude/PrelInfo.lhs | 3 +-
compiler/prelude/PrelNames.lhs | 2 ++
compiler/prelude/PrelRules.lhs | 4 +--
compiler/prelude/PrimOp.lhs | 2 ++
compiler/prelude/TysPrim.lhs | 3 +-
compiler/prelude/TysWiredIn.lhs | 2 ++
compiler/profiling/CostCentre.lhs | 2 +-
compiler/profiling/SCCfinal.lhs | 2 ++
compiler/rename/RnBinds.lhs | 2 +-
compiler/rename/RnEnv.lhs | 2 ++
compiler/rename/RnExpr.lhs | 2 ++
compiler/rename/RnNames.lhs | 2 ++
compiler/rename/RnPat.lhs | 7 +---
compiler/rename/RnSource.lhs | 2 ++
compiler/rename/RnSplice.lhs | 2 ++
compiler/rename/RnTypes.lhs | 2 ++
compiler/simplCore/CSE.lhs | 2 ++
compiler/simplCore/CoreMonad.lhs | 5 ++-
compiler/simplCore/FloatIn.lhs | 3 +-
compiler/simplCore/FloatOut.lhs | 3 +-
compiler/simplCore/LiberateCase.lhs | 3 +-
compiler/simplCore/OccurAnal.lhs | 3 +-
compiler/simplCore/SAT.lhs | 3 +-
compiler/simplCore/SetLevels.lhs | 3 +-
compiler/simplCore/SimplCore.lhs | 2 ++
compiler/simplCore/SimplEnv.lhs | 2 ++
compiler/simplCore/SimplUtils.lhs | 2 ++
compiler/simplCore/Simplify.lhs | 2 ++
compiler/simplStg/SimplStg.lhs | 2 ++
compiler/simplStg/StgStats.lhs | 2 ++
compiler/simplStg/UnariseStg.lhs | 2 ++
compiler/specialise/Rules.lhs | 2 ++
compiler/specialise/SpecConstr.lhs | 2 ++
compiler/specialise/Specialise.lhs | 2 ++
compiler/stgSyn/CoreToStg.lhs | 2 ++
compiler/stgSyn/StgLint.lhs | 2 ++
compiler/stgSyn/StgSyn.lhs | 1 +
compiler/stranal/DmdAnal.lhs | 3 +-
compiler/stranal/WorkWrap.lhs | 3 +-
compiler/stranal/WwLib.lhs | 2 ++
compiler/typecheck/FamInst.lhs | 4 +--
compiler/typecheck/FunDeps.lhs | 2 ++
compiler/typecheck/Inst.lhs | 3 +-
compiler/typecheck/TcAnnotations.lhs | 2 ++
compiler/typecheck/TcArrows.lhs | 3 +-
compiler/typecheck/TcBinds.lhs | 2 ++
compiler/typecheck/TcCanonical.lhs | 2 ++
compiler/typecheck/TcClassDcl.lhs | 3 +-
compiler/typecheck/TcDefaults.lhs | 2 +-
compiler/typecheck/TcDeriv.lhs | 2 ++
compiler/typecheck/TcEnv.lhs | 2 ++
compiler/typecheck/TcErrors.lhs | 4 +--
compiler/typecheck/TcEvidence.lhs | 2 ++
compiler/typecheck/TcExpr.lhs | 2 ++
compiler/typecheck/TcForeign.lhs | 2 ++
compiler/typecheck/TcGenDeriv.lhs | 2 +-
compiler/typecheck/TcGenGenerics.lhs | 4 +--
compiler/typecheck/TcHsSyn.lhs | 2 ++
compiler/typecheck/TcHsType.lhs | 3 +-
compiler/typecheck/TcInstDcls.lhs | 3 +-
compiler/typecheck/TcInteract.lhs | 2 ++
compiler/typecheck/TcMType.lhs | 3 +-
compiler/typecheck/TcMatches.lhs | 3 +-
compiler/typecheck/TcPat.lhs | 3 +-
compiler/typecheck/TcPatSyn.lhs | 2 ++
compiler/typecheck/TcRnDriver.lhs | 2 ++
compiler/typecheck/TcRnMonad.lhs | 2 ++
compiler/typecheck/TcRnTypes.lhs | 2 ++
compiler/typecheck/TcRules.lhs | 2 +-
compiler/typecheck/TcSMonad.lhs | 3 +-
compiler/typecheck/TcSimplify.lhs | 2 ++
compiler/typecheck/TcSplice.lhs | 3 +-
compiler/typecheck/TcSplice.lhs-boot | 2 ++
compiler/typecheck/TcTyClsDecls.lhs | 2 +-
compiler/typecheck/TcTyDecls.lhs | 3 +-
compiler/typecheck/TcType.lhs | 2 ++
compiler/typecheck/TcUnify.lhs | 3 +-
compiler/typecheck/TcValidity.lhs | 2 ++
compiler/types/Class.lhs | 3 +-
compiler/types/CoAxiom.lhs | 2 +-
compiler/types/Coercion.lhs | 2 ++
compiler/types/FamInstEnv.lhs | 3 +-
compiler/types/InstEnv.lhs | 2 ++
compiler/types/Kind.lhs | 3 +-
compiler/types/OptCoercion.lhs | 3 +-
compiler/types/TyCon.lhs | 1 +
compiler/types/Type.lhs | 1 +
compiler/types/TypeRep.lhs | 8 ++---
compiler/types/Unify.lhs | 3 +-
compiler/utils/Bag.lhs | 2 ++
compiler/utils/Binary.hs | 2 +-
compiler/utils/BufWrite.hs | 4 ++-
compiler/utils/Digraph.lhs | 4 +--
compiler/utils/Encoding.hs | 2 +-
compiler/utils/ExtsCompat46.hs | 2 +-
compiler/utils/FastBool.lhs | 2 ++
compiler/utils/FastFunctions.lhs | 1 +
compiler/utils/FastMutInt.lhs | 3 +-
compiler/utils/FastString.lhs | 2 +-
compiler/utils/FastTypes.lhs | 1 +
compiler/utils/Fingerprint.hsc | 2 ++
compiler/utils/GraphBase.hs | 2 +-
compiler/utils/GraphPpr.hs | 2 +-
compiler/utils/IOEnv.hs | 3 +-
compiler/utils/ListSetOps.lhs | 1 +
compiler/utils/Pair.lhs | 2 ++
compiler/utils/Panic.lhs | 2 ++
compiler/utils/Pretty.lhs | 2 +-
compiler/utils/Serialized.hs | 3 +-
compiler/utils/State.hs | 1 +
compiler/utils/StringBuffer.lhs | 2 +-
compiler/utils/UniqFM.lhs | 4 +--
compiler/utils/Util.lhs | 1 +
compiler/vectorise/Vectorise/Exp.hs | 2 +-
compiler/vectorise/Vectorise/Monad/InstEnv.hs | 2 ++
compiler/vectorise/Vectorise/Type/Env.hs | 2 ++
compiler/vectorise/Vectorise/Utils/Base.hs | 2 ++
303 files changed, 583 insertions(+), 201 deletions(-)
Diff suppressed because of size. To see it, use:
git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc 23892440032fcab8a6a753916d506857674169ec
More information about the ghc-commits
mailing list