Commit 25f0bf02 authored by Ian Lynagh's avatar Ian Lynagh
Browse files

Don't mix implicit and explicit layout

parent ada3dd22
......@@ -552,8 +552,8 @@ lookupBindGroupOcc :: Maybe NameSet -- See notes on the (Maybe NameSet)
-- See Note [Looking up signature names]
lookupBindGroupOcc mb_bound_names what rdr_name
= do { local_env <- getLocalRdrEnv
; case lookupLocalRdrEnv local_env rdr_name of
Just n -> check_local_name n
; case lookupLocalRdrEnv local_env rdr_name of {
Just n -> check_local_name n;
Nothing -> do -- Not defined in a nested scope
{ env <- getGlobalRdrEnv
......@@ -565,7 +565,7 @@ lookupBindGroupOcc mb_bound_names what rdr_name
-- as a duplicate top-level binding for 'f'
[] | null gres -> bale_out_with empty
| otherwise -> bale_out_with import_msg
}}
}}}
where
check_local_name name -- The name is in scope, and not imported
= case mb_bound_names of
......
......@@ -943,8 +943,8 @@ illegalBracket = ptext (sLit "Template Haskell brackets cannot be nested (withou
lookupClassInstances :: TH.Name -> [TH.Type] -> TcM [TH.Name]
lookupClassInstances c ts
= do { loc <- getSrcSpanM
; case convertToHsPred loc (TH.ClassP c ts) of
Left msg -> failWithTc msg
; case convertToHsPred loc (TH.ClassP c ts) of {
Left msg -> failWithTc msg;
Right rdr_pred -> do
{ rn_pred <- rnLPred doc rdr_pred -- Rename
; kc_pred <- kcHsLPred rn_pred -- Kind check
......@@ -954,7 +954,7 @@ lookupClassInstances c ts
; inst_envs <- tcGetInstEnvs
; let (matches, unifies) = lookupInstEnv inst_envs cls tys
dfuns = map is_dfun (map fst matches ++ unifies)
; return (map reifyName dfuns) } }
; return (map reifyName dfuns) } } }
where
doc = ptext (sLit "TcSplice.classInstances")
\end{code}
......
Markdown is supported
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