merge GHC HEAD

[ghc-hetmet.git] / compiler / rename / RnTypes.lhs

diff --git a/compiler/rename/RnTypes.lhs b/compiler/rename/RnTypes.lhs
index 138ffa2..31382c2 100644 (file)
--- a/compiler/rename/RnTypes.lhs
+++ b/compiler/rename/RnTypes.lhs
@@ -31,7 +31,7 @@ import RnEnv
 import TcRnMonad
 import RdrName
 import PrelNames
 import TcRnMonad
 import RdrName
 import PrelNames

-import TypeRep         ( funTyConName )
+import TysPrim          ( funTyConName )

 import Name
 import SrcLoc
 import NameSet
 import Name
 import SrcLoc
 import NameSet

@@ -139,13 +139,6 @@ rnHsType doc (HsRecTy flds)
   = do { flds' <- rnConDeclFields doc flds
        ; return (HsRecTy flds') }
 
   = do { flds' <- rnConDeclFields doc flds
        ; return (HsRecTy flds') }
 

-rnHsType _ (HsNumTy i)
-  | i == 1    = return (HsNumTy i)
-  | otherwise = addErr err_msg >> return (HsNumTy i)
-  where
-    err_msg = ptext (sLit "Only unit numeric type pattern is valid")
-                          
-

 rnHsType doc (HsFunTy ty1 ty2) = do
     ty1' <- rnLHsType doc ty1
        -- Might find a for-all as the arg of a function type
 rnHsType doc (HsFunTy ty1 ty2) = do
     ty1' <- rnLHsType doc ty1
        -- Might find a for-all as the arg of a function type

@@ -170,6 +163,11 @@ rnHsType doc (HsPArrTy ty) = do
     ty' <- rnLHsType doc ty
     return (HsPArrTy ty')
 
     ty' <- rnLHsType doc ty
     return (HsPArrTy ty')
 

+rnHsType doc (HsModalBoxType ecn ty) = do
+    ecn' <- lookupOccRn ecn
+    ty' <- rnLHsType doc ty
+    return (HsModalBoxType ecn' ty')
+

 -- Unboxed tuples are allowed to have poly-typed arguments.  These
 -- sometimes crop up as a result of CPR worker-wrappering dictionaries.
 rnHsType doc (HsTupleTy tup_con tys) = do
 -- Unboxed tuples are allowed to have poly-typed arguments.  These
 -- sometimes crop up as a result of CPR worker-wrappering dictionaries.
 rnHsType doc (HsTupleTy tup_con tys) = do