| ... |
... |
@@ -18,7 +18,7 @@ import Data.Int (Int) |
|
18
|
18
|
import Data.Word (Word)
|
|
19
|
19
|
import Data.Maybe (Maybe, maybe)
|
|
20
|
20
|
import Data.Either (Either, either)
|
|
21
|
|
-import Data.List (length, (++), map, zipWith, take, drop, replicate)
|
|
|
21
|
+import Data.List (length, (++), map, zipWith, zipWith5, take, drop, replicate)
|
|
22
|
22
|
import Data.String (String)
|
|
23
|
23
|
import Data.ByteString (ByteString, unpack)
|
|
24
|
24
|
import Data.ByteString.Short (ShortByteString)
|
| ... |
... |
@@ -179,7 +179,7 @@ pprLiteral currentModule literal = case literal of |
|
179
|
179
|
-> text "label" <+>
|
|
180
|
180
|
ppr label
|
|
181
|
181
|
BCONPtrItbl infoTableName
|
|
182
|
|
- -> text "info table" <+>
|
|
|
182
|
+ -> text "info table of" <+>
|
|
183
|
183
|
ppr infoTableName
|
|
184
|
184
|
BCONPtrAddr addrName
|
|
185
|
185
|
-> text "address" <+>
|
| ... |
... |
@@ -296,15 +296,15 @@ pprBreakpointsData currentModule InternalModBreaks {..} |
|
296
|
296
|
-- | […]
|
|
297
|
297
|
pprBreakpointsInSource :: Module -> ModBreaks -> SDoc
|
|
298
|
298
|
pprBreakpointsInSource currentModule ModBreaks {..}
|
|
299
|
|
- = entry (text "breakpoints in source:") $
|
|
300
|
|
- assert (modBreaks_module == currentModule) $
|
|
301
|
|
- assert boundsAreIdentical $
|
|
302
|
|
- vcatOrNone $
|
|
303
|
|
- pprBreakpointInSource <$> indices modBreaks_locs_ <*>
|
|
304
|
|
- elems modBreaks_locs_ <*>
|
|
305
|
|
- elems modBreaks_decls <*>
|
|
306
|
|
- elems modBreaks_vars <*>
|
|
307
|
|
- elems modBreaks_ccs
|
|
|
299
|
+ = entry (text "breakpoints in source:") $
|
|
|
300
|
+ assert (modBreaks_module == currentModule) $
|
|
|
301
|
+ assert boundsAreIdentical $
|
|
|
302
|
+ vcatOrNone $
|
|
|
303
|
+ zipWith5 pprBreakpointInSource (indices modBreaks_locs_)
|
|
|
304
|
+ (elems modBreaks_locs_)
|
|
|
305
|
+ (elems modBreaks_decls)
|
|
|
306
|
+ (elems modBreaks_vars)
|
|
|
307
|
+ (elems modBreaks_ccs)
|
|
308
|
308
|
where
|
|
309
|
309
|
|
|
310
|
310
|
boundsAreIdentical :: Bool
|