diff --git a/ghc/utils/hscpp/hscpp.prl b/ghc/utils/hscpp/hscpp.prl index a45ebbadc15c7ec46e3db5b9bd9133a278a13369..e56ef269cedb24eb44e7600b0d880195977214ff 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 $_; }