[project @ 1999-05-18 15:03:54 by simonpj]

[ghc-hetmet.git] / ghc / compiler / typecheck / TcTyClsDecls.lhs

diff --git a/ghc/compiler/typecheck/TcTyClsDecls.lhs b/ghc/compiler/typecheck/TcTyClsDecls.lhs
index df3c25f..e56e5ff 100644 (file)
--- a/ghc/compiler/typecheck/TcTyClsDecls.lhs
+++ b/ghc/compiler/typecheck/TcTyClsDecls.lhs
@@ -159,7 +159,7 @@ tcAddDeclCtxt decl thing_inside
   where
      (name, loc, thing)
        = case decl of
-           (ClassDecl _ name _ _ _ _ _ _ loc)   -> (name, loc, "class")
+           (ClassDecl _ name _ _ _ _ _ _ _ loc) -> (name, loc, "class")
            (TySynonym name _ _ loc)             -> (name, loc, "type synonym")
            (TyData NewType  _ name _ _ _ _ loc) -> (name, loc, "data type")
            (TyData DataType _ name _ _ _ _ loc) -> (name, loc, "newtype")
@@ -210,7 +210,7 @@ getTyBinding1 (TyData _ _ name tyvars _ _ _ _)
                       Nothing,  
                       ATyCon (error "ATyCon: data")))
 
-getTyBinding1 (ClassDecl _ name tyvars _ _ _ _ _ _)
+getTyBinding1 (ClassDecl _ name tyvars _ _ _ _ _ _ _)
  = mapNF_Tc kcHsTyVar tyvars           `thenNF_Tc` \ arg_kinds ->
    returnNF_Tc (name, (foldr mkArrowKind boxedTypeKind arg_kinds, 
                       Just (length tyvars), 
@@ -275,7 +275,7 @@ Edges in Type/Class decls
 
 mk_cls_edges :: RenamedTyClDecl -> Maybe (RenamedTyClDecl, Unique, [Unique])
 
-mk_cls_edges decl@(ClassDecl ctxt name _ _ _ _ _ _ _)
+mk_cls_edges decl@(ClassDecl ctxt name _ _ _ _ _ _ _ _)
   = Just (decl, getUnique name, map (getUnique . fst) ctxt)
 mk_cls_edges other_decl
   = Nothing
@@ -291,7 +291,7 @@ mk_edges decl@(TyData _ ctxt name _ condecls derivs _ _)
 mk_edges decl@(TySynonym name _ rhs _)
   = (decl, getUnique name, uniqSetToList (get_ty rhs))
 
-mk_edges decl@(ClassDecl ctxt name _ sigs _ _ _ _ _)
+mk_edges decl@(ClassDecl ctxt name _ sigs _ _ _ _ _ _)
   = (decl, getUnique name, uniqSetToList (get_ctxt ctxt `unionUniqSets`
                                         get_sigs sigs))
 
@@ -345,11 +345,11 @@ get_tys tys
 
 ----------------------------------------------------
 get_sigs sigs
-  = unionManyUniqSets (mapMaybe get_sig sigs)
+  = unionManyUniqSets (map get_sig sigs)
   where 
-    get_sig (ClassOpSig _ _ ty _) = Just (get_ty ty)
-    get_sig (FixSig _)           = Nothing
-    get_sig other                = panic "TcTyClsDecls:get_sig"
+    get_sig (ClassOpSig _ _ ty _) = get_ty ty
+    get_sig (FixSig _)           = emptyUniqSet
+    get_sig other = panic "TcTyClsDecls:get_sig"
 
 ----------------------------------------------------
 set_name name = unitUniqSet (getUnique name)