projects
/
ghc-hetmet.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
befdf6a
)
Follow FastString changes in Pretty
author
Max Bolingbroke
<batterseapower@hotmail.com>
Thu, 31 Jul 2008 01:23:54 +0000
(
01:23
+0000)
committer
Max Bolingbroke
<batterseapower@hotmail.com>
Thu, 31 Jul 2008 01:23:54 +0000
(
01:23
+0000)
compiler/utils/Pretty.lhs
patch
|
blob
|
history
diff --git
a/compiler/utils/Pretty.lhs
b/compiler/utils/Pretty.lhs
index
f6505c0
..
7aec715
100644
(file)
--- a/
compiler/utils/Pretty.lhs
+++ b/
compiler/utils/Pretty.lhs
@@
-162,7
+162,7
@@
module Pretty (
empty, isEmpty, nest,
empty, isEmpty, nest,
- text, char, ftext, ptext,
+ char, text, ftext, ptext,
int, integer, float, double, rational,
parens, brackets, braces, quotes, doubleQuotes,
semi, comma, colon, space, equals,
int, integer, float, double, rational,
parens, brackets, braces, quotes, doubleQuotes,
semi, comma, colon, space, equals,
@@
-531,7
+531,6
@@
union_ p q = Union (LOCAL_ASSERT( _ok p ) p) (LOCAL_ASSERT( _ok q ) q)
_ok _ = False
\end{code}
_ok _ = False
\end{code}
-
Notice the difference between
* NoDoc (no documents)
* Empty (one empty document; no height and no width)
Notice the difference between
* NoDoc (no documents)
* Empty (one empty document; no height and no width)
@@
-557,7
+556,7
@@
text s = case iUnbox (length s) of {sl -> textBeside_ (Str s) sl Empty}
ftext :: FastString -> Doc
ftext s = case iUnbox (lengthFS s) of {sl -> textBeside_ (PStr s) sl Empty}
ptext :: LitString -> Doc
ftext :: FastString -> Doc
ftext s = case iUnbox (lengthFS s) of {sl -> textBeside_ (PStr s) sl Empty}
ptext :: LitString -> Doc
-ptext s_= case iUnbox (strLength s) of {sl -> textBeside_ (LStr s sl) sl Empty}
+ptext s_= case iUnbox (lengthLS s) of {sl -> textBeside_ (LStr s sl) sl Empty}
where s = {-castPtr-} s_
#if defined(__GLASGOW_HASKELL__)
where s = {-castPtr-} s_
#if defined(__GLASGOW_HASKELL__)