Update of /cvsroot/gtk2hs/gtk2hs/tools/c2hs/chs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16378/tools/c2hs/chs
Modified Files:
CHS.hs
Log Message:
Repaired dependency generation. It is still not fully automatic (see comment
in mk/common.mk). Make it compile on Mac OS that has a funny C pre-processor.
Decrease the initial heap size to 400MB.
Index: CHS.hs
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/tools/c2hs/chs/CHS.hs,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CHS.hs 8 Dec 2004 00:08:20 -0000 1.2
+++ CHS.hs 23 Jan 2005 15:44:36 -0000 1.3
@@ -404,12 +404,14 @@
(Position fname line _) = pos
generated = isBuiltinPos pos
emitNow = state == Emit ||
- (state == Wait && not (null s) && head s == '\n')
+ (state == Wait && not (null s) && nlStart)
+ nlStart = head s == '\n'
nextState = if generated then Wait else NoLine
in
(if emitNow then
showString ("\n{-# LINE " ++ show (line `max` 0) ++ " " ++
- show fname ++ " #-}")
+ show fname ++ " #-}" ++
+ (if nlStart then "" else "\n"))
else id)
. showString s
. showFrags pureHs nextState frags
|