X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2FbasicTypes%2FSrcLoc.lhs;h=e028c1267696554047816469e012be63b6bdcad3;hb=55710e16202e985f8e4f910a09dfc2d0298ca255;hp=8ced456050f20d212bd6903bbd2d4f0cc3b91458;hpb=e944b32b8e8a88a52e22cb4daa0bdb4ebbb7793f;p=ghc-hetmet.git

diff --git a/compiler/basicTypes/SrcLoc.lhs b/compiler/basicTypes/SrcLoc.lhs
index 8ced456..e028c12 100644
--- a/compiler/basicTypes/SrcLoc.lhs
+++ b/compiler/basicTypes/SrcLoc.lhs
@@ -1,11 +1,6 @@
 %
-% (c) The University of Glasgow, 1992-2003
+% (c) The University of Glasgow, 1992-2006
 %
-%************************************************************************
-%*									*
-\section[SrcLoc]{The @SrcLoc@ type}
-%*									*
-%************************************************************************
 
 \begin{code}
 module SrcLoc (
@@ -35,14 +30,16 @@ module SrcLoc (
 
 	-- These are dubious exports, because they crash on some inputs,
 	-- used only in Lexer.x where we are sure what the Span looks like
-	srcSpanFile, srcSpanEndLine, srcSpanEndCol,
+	srcSpanFile, 
+        srcSpanStartLine, srcSpanEndLine, 
+        srcSpanStartCol, srcSpanEndCol,
 
 	Located(..), getLoc, unLoc, noLoc, eqLocated, cmpLocated, combineLocs, addCLoc
     ) where
 
 #include "HsVersions.h"
 
-import Util		( thenCmp )
+import Util
 import Outputable
 import FastString
 \end{code}
@@ -138,11 +135,7 @@ cmpSrcLoc (ImportedLoc m1) (ImportedLoc m2)  = m1 `compare` m2
 cmpSrcLoc (ImportedLoc _)  other	     = LT
 
 cmpSrcLoc (SrcLoc s1 l1 c1) (SrcLoc s2 l2 c2)      
-  = (s1 `compare` s2) `thenCmp` (l1 `cmpline` l2) `thenCmp` (c1 `cmpline` c2)
-  where
-	l1 `cmpline` l2 | l1 <  l2 = LT
-			| l1 == l2 = EQ
-			| otherwise = GT 
+  = (s1 `compare` s2) `thenCmp` (l1 `compare` l2) `thenCmp` (c1 `compare` c2)
 cmpSrcLoc (SrcLoc _ _ _) other = GT
 
 instance Outputable SrcLoc where
@@ -157,7 +150,7 @@ instance Outputable SrcLoc where
 	   hcat [text "{-# LINE ", int src_line, space,
 		 char '\"', ftext src_path, text " #-}"]
 
-    ppr (ImportedLoc mod) = ptext SLIT("Imported from") <+> text mod
+    ppr (ImportedLoc mod) = ptext SLIT("Defined in") <+> text mod
     ppr (UnhelpfulLoc s)  = ftext s
 \end{code}
 
@@ -354,7 +347,7 @@ pprUserSpan (SrcSpanPoint src_path line col)
 	   char ':', int col
 	 ]
 
-pprUserSpan (ImportedSpan mod) = ptext SLIT("Imported from") <+> quotes (text mod)
+pprUserSpan (ImportedSpan mod) = ptext SLIT("Defined in") <+> text mod
 pprUserSpan (UnhelpfulSpan s)  = ftext s
 \end{code}