From: simonmar <unknown>
Date: Tue, 27 Jul 1999 15:56:59 +0000 (+0000)
Subject: [project @ 1999-07-27 15:56:59 by simonmar]
X-Git-Tag: Approximately_9120_patches~5941
X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=commitdiff_plain;h=396ec32e4fadc8203bb26d741f9c2861cdf531c1

[project @ 1999-07-27 15:56:59 by simonmar]
Sigh, didn't work in the  cpp, !literate case.
---

diff --git a/ghc/utils/hscpp/hscpp.prl b/ghc/utils/hscpp/hscpp.prl
index a45ebba..e56ef26 100644
--- a/ghc/utils/hscpp/hscpp.prl
+++ b/ghc/utils/hscpp/hscpp.prl
@@ -37,13 +37,15 @@ open(INPIPE, "$Cpp @args - <$file |")
 while (<INPIPE>) {
 
 # 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 \-\}/;
-    s/^#\s*(\d+)\s+(\".*\").*/\{\-# LINE \1 \2 \-\}/;
 
+    s/^#\s*line\s+(\d+)\s+(\"\")$//;
     s/^#\s*(\d+)\s+(\"\").*//;  # these are a result of our using stdin in
 				# the $(CPP) command line above.
 
+#   s/^#\s*line\s+\d+$/\{\-# LINE \-\}/;   IGNORE THIS ONE FOR NOW
+    s/^#\s*line\s+(\d+)\s+(\".+\")$/\{\-# LINE \1 \2 \-\}/;
+    s/^#\s*(\d+)\s+(\".*\").*/\{\-# LINE \1 \2 \-\}/;
+
     print $_;
 }