[project @ 1999-07-29 16:19:33 by sof]

Fixed bug/limitation in command-line handling.

diff --git a/ghc/utils/hscpp/hscpp.prl b/ghc/utils/hscpp/hscpp.prl
index fb1bf46..03a8398 100644 (file)
--- a/ghc/utils/hscpp/hscpp.prl
+++ b/ghc/utils/hscpp/hscpp.prl
@@ -15,21 +15,16 @@ $file = '';
 
 $Cpp = ${RAWCPP};
 
-foreach (@ARGV) {
-    /^-v$/ && do { $Verbose = 1; next; };
-
-    /^[^-]/ && do { 
-       if ($file ne '') { 
-           die "usage: hscpp [arg...] file";
-       } else {
-           $file = $_; 
-       };
-       next;
-    };
-
+while (@ARGV) {
+    $_ = $ARGV[0];
+    /^-v$/  && do { $Verbose = 1; shift(@ARGV); next; };
+    /^[^-]/ && $#ARGV == 0 && do { $file = $_; shift(@ARGV); next; };
     push @args, $_;
+    shift(@ARGV);
 }
 
+die "usage: hscpp [arg...] file" if ($file eq '');
+
 print STDERR "hscpp:CPP invoked: $Cpp @args - <$file\n" if $Verbose;
 open(INPIPE, "$Cpp @args - <$file |") 
        || die "Can't open C pre-processor pipe\n";