@@ -98,35 +98,40 @@ pshow i (Msg s) = s
9898pshow i (InternalMsg s) = "INTERNAL ERROR: " ++ show s ++
9999 "\nThis is probably a bug, or a missing error message.\n" ++
100100 "Please consider reporting at " ++ bugaddr
101−pshow i (CantUnify _ x y e sc s)
101+pshow i (CantUnify _ x y e sc s)
102102 = let imps = opt_showimp (idris_options i) in
103− "Can't unify " ++ showImp Nothing imps False (delab i x)
104− ++ " with " ++ showImp Nothing imps False (delab i y) ++
103+ let colour = idris_colourRepl i in
104+ "Can't unify " ++ showImp (Just i) imps colour (delab i x)
105+ ++ " with " ++ showImp (Just i) imps colour (delab i y) ++
105106-- " (" ++ show x ++ " and " ++ show y ++ ") " ++
106107 case e of
107108 Msg "" -> ""
108− _ -> "\n\nSpecifically:\n\t" ++ pshow i e ++
109+ _ -> "\n\nSpecifically:\n\t" ++ pshow i e ++
109110 if (opt_errContext (idris_options i)) then showSc i sc else ""
110−pshow i (CantConvert x y env)
111+pshow i (CantConvert x y env)
111112 = let imps = opt_showimp (idris_options i) in
112− "Can't convert " ++ showImp Nothing imps False (delab i x) ++ " with "
113− ++ showImp Nothing imps False (delab i y) ++
113+ let colour = idris_colourRepl i in
114+ "Can't convert " ++ showImp (Just i) imps colour (delab i x) ++ " with "
115+ ++ showImp (Just i) imps colour (delab i y) ++
114116 if (opt_errContext (idris_options i)) then showSc i env else ""
115−pshow i (UnifyScope n out tm env)
117+pshow i (UnifyScope n out tm env)
116118 = let imps = opt_showimp (idris_options i) in
117− "Can't unify " ++ show n ++ " with "
118− ++ showImp Nothing imps False (delab i tm) ++ " as " ++ show out ++
119+ let colour = idris_colourRepl i in
120+ "Can't unify " ++ show n ++ " with "
121+ ++ showImp (Just i) imps colour (delab i tm) ++ " as " ++ show out ++
119122 " is not in scope" ++
120123 if (opt_errContext (idris_options i)) then showSc i env else ""
121124pshow i (CantInferType t)
122125 = "Can't infer type for " ++ t
123126pshow i (NonFunctionType f ty)
124127 = let imps = opt_showimp (idris_options i) in
125− showImp Nothing imps False (delab i f) ++ " does not have a function type ("
126− ++ showImp Nothing imps False (delab i ty) ++ ")"
128+ let colour = idris_colourRepl i in
129+ showImp (Just i) imps colour (delab i f) ++ " does not have a function type ("
130+ ++ showImp (Just i) imps colour (delab i ty) ++ ")"
127131pshow i (CantIntroduce ty)
128132 = let imps = opt_showimp (idris_options i) in
129− "Can't use lambda here: type is " ++ showImp Nothing imps False (delab i ty)
133+ let colour = idris_colourRepl i in
134+ "Can't use lambda here: type is " ++ showImp (Just i) imps colour (delab i ty)
130135pshow i (InfiniteUnify x tm env)
131136 = "Unifying " ++ showbasic x ++ " and " ++ show (delab i tm) ++
132137 " would lead to infinite value" ++