[project @ 1998-08-14 11:12:32 by sof]

[ghc-hetmet.git] / ghc / compiler / utils / Argv.lhs

diff --git a/ghc/compiler/utils/Argv.lhs b/ghc/compiler/utils/Argv.lhs
index 58926a8..1420bfc 100644 (file)
--- a/ghc/compiler/utils/Argv.lhs
+++ b/ghc/compiler/utils/Argv.lhs
@@ -4,18 +4,23 @@
 \section[Argv]{@Argv@: direct (non-standard) access to command-line arguments}
 
 \begin{code}
-#include "HsVersions.h"
-
 module Argv ( argv ) where
 
-import PreludeGlaST    ( indexAddrOffAddr )
+#include "HsVersions.h"
+
+import FastString
 
-CHK_Ubiq() -- debugging consistency check
+#if __GLASGOW_HASKELL__ <= 302
+import GlaExts         ( Addr )
+import ByteArray       ( indexAddrOffAddr )
+#else
+import Addr            ( Addr, indexAddrOffAddr )
+#endif
 
 argv :: [FAST_STRING]
 argv = unpackArgv ``prog_argv'' (``prog_argc''::Int)
 
-unpackArgv :: _Addr -> Int -> [FAST_STRING] -- argv[1 .. argc-1]
+unpackArgv :: Addr -> Int -> [FAST_STRING] -- argv[1 .. argc-1]
 
 unpackArgv argv argc = unpack 1
   where
@@ -24,6 +29,6 @@ unpackArgv argv argc = unpack 1
       = if (n >= argc)
        then ([] :: [FAST_STRING])
        else case (indexAddrOffAddr argv n) of { item ->
-            _packCString item : unpack (n + 1)
+            mkFastCharString item : unpack (n + 1)
             }
 \end{code}