[project @ 1999-07-27 13:55:57 by simonmar]

Fix filenames in {-# LINE #-} directives when using both unlit and
hscpp (I think).

diff --git a/ghc/utils/hscpp/hscpp.prl b/ghc/utils/hscpp/hscpp.prl
index 8d753e5..802e9ed 100644 (file)
--- a/ghc/utils/hscpp/hscpp.prl
+++ b/ghc/utils/hscpp/hscpp.prl
@@ -36,10 +36,15 @@ open(INPIPE, "$Cpp @args - <$file |")
 
 while (<INPIPE>) {
 
+    print STDERR $_;
+
 # 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 \"$file\" \-\}/;
-    s/^#\s*(\d+)\s+(\".*\").*/\{\-# LINE \1 \"$file\" \-\}/;
+    s/^#\s*line\s+(\d+)\s+(\".+\")$/\{\-# LINE \1 \2 \-\}/;
+    s/^#\s*(\d+)\s+(\".*\").*/\{\-# LINE \1 \2 \-\}/;
+
+    s/^#\s*(\d+)\s+(\"\").*//;  # these are a result of our using stdin in
+                               # the $(CPP) command line above.
 
     print $_;
 }