Commit f53c4074 authored by simonpj's avatar simonpj
Browse files

[project @ 2001-02-28 11:44:39 by simonpj]

Import/formatting wibbles
parent 3dea9c72
......@@ -16,6 +16,9 @@ module HscMain ( HscResult(..), hscMain,
import RdrHsSyn ( RdrNameStmt )
import Rename ( renameStmt )
import ByteCodeGen ( byteCodeGen )
import Id ( Id, idName, idFlavour, modifyIdInfo )
import IdInfo ( setFlavourInfo, makeConstantFlavour )
import HscTypes ( InteractiveContext(..), TyThing(..) )
#endif
import HsSyn
......@@ -44,8 +47,6 @@ import SimplStg ( stg2stg )
import CodeGen ( codeGen )
import CodeOutput ( codeOutput )
import Id ( Id, idName, idFlavour, modifyIdInfo )
import IdInfo ( setFlavourInfo, makeConstantFlavour )
import Module ( ModuleName, moduleName, mkHomeModule,
moduleUserString )
import CmdLineOpts
......@@ -60,7 +61,7 @@ import CmStaticInfo ( GhciMode(..) )
import HscStats ( ppSourceStats )
import HscTypes ( ModDetails, ModIface(..), PersistentCompilerState(..),
PersistentRenamerState(..), ModuleLocation(..),
HomeSymbolTable, InteractiveContext(..),
HomeSymbolTable,
NameSupply(..), PackageRuleBase, HomeIfaceTable,
typeEnvClasses, typeEnvTyCons, emptyIfaceTable
)
......
{-# OPTIONS -fno-warn-incomplete-patterns #-}
-----------------------------------------------------------------------------
-- $Id: Main.hs,v 1.56 2001/02/27 15:25:18 simonmar Exp $
-- $Id: Main.hs,v 1.57 2001/02/28 11:44:39 simonpj Exp $
--
-- GHC Driver program
--
......@@ -18,6 +18,7 @@ module Main (main) where
#ifdef GHCI
import InteractiveUI
import Char ( toLower )
#endif
#ifndef mingw32_TARGET_OS
......
......@@ -263,8 +263,8 @@ This is done {\em either} by pass 3 (for the top-level bindings),
\begin{code}
rn_mono_binds :: [RenamedSig] -- Signatures attached to this group
-> RdrNameMonoBinds
-> RnMS (RenamedHsBinds, --
FreeVars) -- Free variables
-> RnMS (RenamedHsBinds, -- Dependency analysed
FreeVars) -- Free variables
rn_mono_binds siglist mbinds
=
......
......@@ -27,7 +27,6 @@ import RnMonad
import FiniteMap
import PrelNames ( pRELUDE_Name, mAIN_Name, main_RDR_Unqual, isUnboundName )
import UniqFM ( lookupUFM )
import Bag ( bagToList )
import Module ( ModuleName, moduleName, WhereFrom(..) )
import NameSet
import Name ( Name, nameSrcLoc, nameOccName, nameEnvElts )
......
......@@ -876,9 +876,8 @@ minusFVBinders vs fv = foldr minusFVBinder fv vs
minusFVBinder :: Id -> FreeVarsInfo -> FreeVarsInfo
minusFVBinder v fv | isId v && opt_KeepStgTypes
= (fv `delVarEnv` v) `unionFVInfo`
tyvarFVInfo (tyVarsOfType (idType v))
| otherwise
= fv `delVarEnv` v
tyvarFVInfo (tyVarsOfType (idType v))
| otherwise = fv `delVarEnv` v
-- When removing a binder, remember to add its type variables
-- c.f. CoreFVs.delBinderFV
......
......@@ -58,7 +58,7 @@ import TyCon ( TyCon )
import Class ( Class, ClassOpItem, ClassContext )
import Name ( Name, OccName, NamedThing(..),
nameOccName, getSrcLoc, mkLocalName, isLocalName,
nameIsLocalOrFrom, nameModule_maybe
nameIsLocalOrFrom
)
import Name ( NameEnv, lookupNameEnv, nameEnvElts,
extendNameEnvList, emptyNameEnv, plusNameEnv )
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment