diff options
| author | simonpj <unknown> | 2001-03-13 14:58:28 +0000 |
|---|---|---|
| committer | simonpj <unknown> | 2001-03-13 14:58:28 +0000 |
| commit | 788faebb40b51d37e73ed94dfc99460d39a1a811 (patch) | |
| tree | 5aed135958315fcb297c1c4908440775fdbdf1ad /ghc/compiler/main/DriverPipeline.hs | |
| parent | 6a44ce76861d73d59badc8f8c17ffbd52eff17ba (diff) | |
| download | haskell-788faebb40b51d37e73ed94dfc99460d39a1a811.tar.gz | |
[project @ 2001-03-13 14:58:25 by simonpj]
----------------
Nuke ClassContext
----------------
This commit tidies up a long-standing inconsistency in GHC.
The context of a class or instance decl used to be restricted
to predicates of the form
C t1 .. tn
with
type ClassContext = [(Class,[Type])]
but everywhere else in the compiler we used
type ThetaType = [PredType]
where PredType can be any sort of constraint (= predicate).
The inconsistency actually led to a crash, when compiling
class (?x::Int) => C a where {}
I've tidied all this up by nuking ClassContext altogether, and using
PredType throughout. Lots of modified files, but all in
more-or-less trivial ways.
I've also added a check that the context of a class or instance
decl doesn't include a non-inheritable predicate like (?x::Int).
Other things
* rename constructor 'Class' from type TypeRep.Pred to 'ClassP'
(makes it easier to grep for)
* rename constructor HsPClass => HsClassP
HsPIParam => HsIParam
Diffstat (limited to 'ghc/compiler/main/DriverPipeline.hs')
| -rw-r--r-- | ghc/compiler/main/DriverPipeline.hs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ghc/compiler/main/DriverPipeline.hs b/ghc/compiler/main/DriverPipeline.hs index f5686721e7..2b69fa7f9f 100644 --- a/ghc/compiler/main/DriverPipeline.hs +++ b/ghc/compiler/main/DriverPipeline.hs @@ -1,5 +1,5 @@ ----------------------------------------------------------------------------- --- $Id: DriverPipeline.hs,v 1.53 2001/03/06 15:00:25 rrt Exp $ +-- $Id: DriverPipeline.hs,v 1.54 2001/03/13 14:58:26 simonpj Exp $ -- -- GHC Driver -- @@ -884,7 +884,7 @@ compile ghci_mode summary source_unchanged old_iface hst hit pcs = do HscC -> newTempName (phaseInputExt HCc) HscJava -> newTempName "java" -- ToDo #ifdef ILX - HscILX -> newTempName (phaseInputExt Ilx) + HscILX -> newTempName "ilx" -- ToDo #endif HscInterpreted -> return (error "no output file") |