From 396ec32e4fadc8203bb26d741f9c2861cdf531c1 Mon Sep 17 00:00:00 2001 From: simonmar Date: Tue, 27 Jul 1999 15:56:59 +0000 Subject: [PATCH] [project @ 1999-07-27 15:56:59 by simonmar] Sigh, didn't work in the cpp, !literate case. --- ghc/utils/hscpp/hscpp.prl | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) 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 () { # 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 $_; } -- 1.7.10.4