@@ -101,10 +101,6 @@ iWarn fc err =
101 lineFC :: FC
101 lineFC :: FC
102 lineFC = FC fn (si, 1) (si, length (fromJust sourceLine))
102 lineFC = FC fn (si, 1) (si, length (fromJust sourceLine))
104− intersection :: FC -> FC -> FC
105− intersection (FC fn1 s1 e1) (FC fn2 s2 e2) = FC fn1 (max s1 s2) (min e1 e2)
106− intersection _ _ = NoFC
108 intersects :: FC -> FC -> Bool
104 intersects :: FC -> FC -> Bool
109 intersects (FC fn1 s1 e1) (FC fn2 s2 e2)
105 intersects (FC fn1 s1 e1) (FC fn2 s2 e2)
110 | fn1 /= fn2 = False
106 | fn1 /= fn2 = False
@@ -113,6 +109,12 @@ iWarn fc err =
113 | otherwise = True
109 | otherwise = True
114 intersects _ _ = False
110 intersects _ _ = False
112+ intersection :: FC -> FC -> FC
113+ intersection fc1@(FC fn1 s1 e1) fc2@(FC _ s2 e2)
114+ | intersects fc1 fc2 = FC fn1 (max s1 s2) (min e1 e2)
116+ intersection _ _ = NoFC
116 width :: Ann -> Int
118 width :: Ann -> Int
117 width (AText s) = length s
119 width (AText s) = length s
118 width (ATagged _ n) = width n
120 width (ATagged _ n) = width n