From 1241c26f3552a2037263769e5ef7fa68d9f3be36 Mon Sep 17 00:00:00 2001 From: Ian Lynagh Date: Wed, 12 Sep 2007 16:22:00 +0000 Subject: [PATCH] Remove warning flags from individual compiler modules We now set the flags once and for all in compiler/Makefile. --- compiler/cmm/CmmCPSZ.hs | 1 - compiler/cmm/CmmContFlowOpt.hs | 2 +- compiler/cmm/CmmCvt.hs | 1 - compiler/cmm/CmmExpr.hs | 1 - compiler/cmm/CmmLiveZ.hs | 2 +- compiler/cmm/CmmProcPointZ.hs | 2 +- compiler/cmm/CmmSpillReload.hs | 1 - compiler/cmm/CmmTx.hs | 2 +- compiler/cmm/CmmZipUtil.hs | 6 +++--- compiler/cmm/DFMonad.hs | 2 +- compiler/cmm/MkZipCfg.hs | 2 +- compiler/cmm/StackColor.hs | 2 +- compiler/cmm/StackPlacements.hs | 2 +- compiler/cmm/ZipCfg.hs | 2 +- compiler/cmm/ZipCfgCmmRep.hs | 2 +- compiler/cmm/ZipDataflow.hs | 2 +- 16 files changed, 14 insertions(+), 18 deletions(-) diff --git a/compiler/cmm/CmmCPSZ.hs b/compiler/cmm/CmmCPSZ.hs index 9410304..d0858e9 100644 --- a/compiler/cmm/CmmCPSZ.hs +++ b/compiler/cmm/CmmCPSZ.hs @@ -1,4 +1,3 @@ -{-# OPTIONS -Wall -fno-warn-name-shadowing #-} module CmmCPSZ ( -- | Converts C-- with full proceedures and parameters diff --git a/compiler/cmm/CmmContFlowOpt.hs b/compiler/cmm/CmmContFlowOpt.hs index 4e319c8..022b2dd 100644 --- a/compiler/cmm/CmmContFlowOpt.hs +++ b/compiler/cmm/CmmContFlowOpt.hs @@ -1,4 +1,4 @@ -{-# OPTIONS -Wall -fno-warn-name-shadowing #-} + module CmmContFlowOpt ( runCmmOpts, cmmCfgOpts, cmmCfgOptsZ , branchChainElimZ, removeUnreachableBlocksZ diff --git a/compiler/cmm/CmmCvt.hs b/compiler/cmm/CmmCvt.hs index ca635c2..ae336b5 100644 --- a/compiler/cmm/CmmCvt.hs +++ b/compiler/cmm/CmmCvt.hs @@ -1,5 +1,4 @@ {-# LANGUAGE PatternGuards #-} -{-# OPTIONS -Wall -fno-warn-name-shadowing #-} module CmmCvt ( cmmToZgraph, cmmOfZgraph ) diff --git a/compiler/cmm/CmmExpr.hs b/compiler/cmm/CmmExpr.hs index 791731b..983a232 100644 --- a/compiler/cmm/CmmExpr.hs +++ b/compiler/cmm/CmmExpr.hs @@ -1,4 +1,3 @@ -{-# OPTIONS -Wall -fno-warn-name-shadowing #-} module CmmExpr ( CmmExpr(..), cmmExprRep, maybeInvertCmmExpr diff --git a/compiler/cmm/CmmLiveZ.hs b/compiler/cmm/CmmLiveZ.hs index 00a6491..8a5d36c 100644 --- a/compiler/cmm/CmmLiveZ.hs +++ b/compiler/cmm/CmmLiveZ.hs @@ -1,4 +1,4 @@ -{-# OPTIONS -Wall -fno-warn-name-shadowing #-} + module CmmLiveZ ( CmmLive , cmmLivenessZ diff --git a/compiler/cmm/CmmProcPointZ.hs b/compiler/cmm/CmmProcPointZ.hs index c73f016..e250bf3 100644 --- a/compiler/cmm/CmmProcPointZ.hs +++ b/compiler/cmm/CmmProcPointZ.hs @@ -1,4 +1,4 @@ -{-# OPTIONS -Wall -fno-warn-name-shadowing #-} + module CmmProcPointZ ( minimalProcPointSet , addProcPointProtocols diff --git a/compiler/cmm/CmmSpillReload.hs b/compiler/cmm/CmmSpillReload.hs index 6195a4c..7d4f42c 100644 --- a/compiler/cmm/CmmSpillReload.hs +++ b/compiler/cmm/CmmSpillReload.hs @@ -1,4 +1,3 @@ -{-# OPTIONS -Wall -fno-warn-name-shadowing #-} module CmmSpillReload ( ExtendWithSpills(..) diff --git a/compiler/cmm/CmmTx.hs b/compiler/cmm/CmmTx.hs index ef3e8e7..d9733b8 100644 --- a/compiler/cmm/CmmTx.hs +++ b/compiler/cmm/CmmTx.hs @@ -1,4 +1,4 @@ -{-# OPTIONS -Wall -fno-warn-name-shadowing #-} + module CmmTx where data ChangeFlag = NoChange | SomeChange diff --git a/compiler/cmm/CmmZipUtil.hs b/compiler/cmm/CmmZipUtil.hs index 2dcb55f..c7a027e 100644 --- a/compiler/cmm/CmmZipUtil.hs +++ b/compiler/cmm/CmmZipUtil.hs @@ -1,10 +1,10 @@ -{-# OPTIONS -Wall -fno-warn-name-shadowing #-} -module CmmZipUtil + +module CmmZipUtil ( zipPreds ) where import Prelude hiding (last, unzip) -import ZipCfg +import ZipCfg import Maybes -- | Compute the predecessors of each *reachable* block diff --git a/compiler/cmm/DFMonad.hs b/compiler/cmm/DFMonad.hs index fc2fd45..0365cbb 100644 --- a/compiler/cmm/DFMonad.hs +++ b/compiler/cmm/DFMonad.hs @@ -1,4 +1,4 @@ -{-# OPTIONS -Wall -fno-warn-name-shadowing #-} + module DFMonad ( OptimizationFuel , DFTx, runDFTx, lastTxPass, txDecrement, txRemaining, txExhausted diff --git a/compiler/cmm/MkZipCfg.hs b/compiler/cmm/MkZipCfg.hs index 8b0284c..9b9989c 100644 --- a/compiler/cmm/MkZipCfg.hs +++ b/compiler/cmm/MkZipCfg.hs @@ -1,4 +1,4 @@ -{-# OPTIONS -Wall -fno-warn-name-shadowing #-} +{-# LANGUAGE ScopedTypeVariables #-} module MkZipCfg ( AGraph, (<*>), emptyAGraph, withFreshLabel, withUnique , mkMiddle, mkMiddles, mkLast, mkZTail, mkBranch, mkLabel, mkIfThenElse, mkWhileDo diff --git a/compiler/cmm/StackColor.hs b/compiler/cmm/StackColor.hs index c9cb856..2f97a18 100644 --- a/compiler/cmm/StackColor.hs +++ b/compiler/cmm/StackColor.hs @@ -1,4 +1,4 @@ -{-# OPTIONS -Wall -fno-warn-name-shadowing #-} + module StackColor where import StackPlacements diff --git a/compiler/cmm/StackPlacements.hs b/compiler/cmm/StackPlacements.hs index 31a5198..5cac288 100644 --- a/compiler/cmm/StackPlacements.hs +++ b/compiler/cmm/StackPlacements.hs @@ -1,4 +1,4 @@ -{-# OPTIONS -Wall -fno-warn-name-shadowing #-} + module StackPlacements ( SlotSet, allStackSlots -- the infinite set of stack slots , SlotClass(..), slotClassBits, stackSlot32, stackSlot64, stackSlot128 diff --git a/compiler/cmm/ZipCfg.hs b/compiler/cmm/ZipCfg.hs index b8088d0..672c55c 100644 --- a/compiler/cmm/ZipCfg.hs +++ b/compiler/cmm/ZipCfg.hs @@ -1,4 +1,4 @@ -{-# OPTIONS -Wall -fno-warn-name-shadowing #-} +{-# LANGUAGE ScopedTypeVariables #-} module ZipCfg ( BlockId(..), freshBlockId , BlockEnv, emptyBlockEnv, lookupBlockEnv, extendBlockEnv, insertBlock, mkBlockEnv diff --git a/compiler/cmm/ZipCfgCmmRep.hs b/compiler/cmm/ZipCfgCmmRep.hs index da84f7b..135a219 100644 --- a/compiler/cmm/ZipCfgCmmRep.hs +++ b/compiler/cmm/ZipCfgCmmRep.hs @@ -1,4 +1,4 @@ -{-# OPTIONS -Wall -fno-warn-name-shadowing #-} + -- This module is pure representation and should be imported only by -- clients that need to manipulate representation and know what diff --git a/compiler/cmm/ZipDataflow.hs b/compiler/cmm/ZipDataflow.hs index df05680..36285a3 100644 --- a/compiler/cmm/ZipDataflow.hs +++ b/compiler/cmm/ZipDataflow.hs @@ -1,4 +1,4 @@ -{-# OPTIONS -Wall -fno-warn-name-shadowing #-} + {-# LANGUAGE MultiParamTypeClasses #-} module ZipDataflow ( Answer(..) -- 1.7.10.4