[project @ 1999-07-28 14:10:09 by simonmar]

Sigh, another go at getting #line directives right.

diff --git a/ghc/utils/hscpp/hscpp.prl b/ghc/utils/hscpp/hscpp.prl
index e56ef26..5c08b9b 100644 (file)
--- a/ghc/utils/hscpp/hscpp.prl
+++ b/ghc/utils/hscpp/hscpp.prl
@@ -36,11 +36,10 @@ open(INPIPE, "$Cpp @args - <$file |")
 
 while (<INPIPE>) {
 
-# line directives come in flavo[u]rs:
+    s/^#\s*line\s+(\d+)\s+\"\"$/\{\-# LINE \1 \"$file\" \-\}/;
+    s/^#\s*(\d+)\s+\"\"/\{\-# LINE \1 \"$file\" \-\}/;
 
-    s/^#\s*line\s+(\d+)\s+(\"\")$//;
-    s/^#\s*(\d+)\s+(\"\").*//;  # these are a result of our using stdin in
-                               # the $(CPP) command line above.
+# line directives come in flavo[u]rs:
 
 #   s/^#\s*line\s+\d+$/\{\-# LINE \-\}/;   IGNORE THIS ONE FOR NOW
     s/^#\s*line\s+(\d+)\s+(\".+\")$/\{\-# LINE \1 \2 \-\}/;