X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2Futils%2FStringBuffer.lhs;h=61a0321d718aa39f1e8307a0eaa393efc4263934;hb=423d477bfecd490de1449c59325c8776f91d7aac;hp=16218fd8ad6ba52be37d7d5015cc3a00a92b6fa7;hpb=9541ef3440f89f5f275509b1cc64fb9c498dcf73;p=ghc-hetmet.git

diff --git a/ghc/compiler/utils/StringBuffer.lhs b/ghc/compiler/utils/StringBuffer.lhs
index 16218fd..61a0321 100644
--- a/ghc/compiler/utils/StringBuffer.lhs
+++ b/ghc/compiler/utils/StringBuffer.lhs
@@ -8,7 +8,8 @@ Buffers for scanning string input stored in external arrays.
 \begin{code}
 module StringBuffer
        (
-        StringBuffer,
+        StringBuffer(..),
+	-- non-abstract for vs/HaskellService
 
 	 -- * Creation/destruction
         hGetStringBuffer,     -- :: FilePath     -> IO StringBuffer
@@ -19,7 +20,6 @@ module StringBuffer
 	prevChar,          -- :: StringBuffer -> Char -> Char
 	lookAhead,         -- :: StringBuffer -> Int  -> Char
 	atEnd,		   -- :: StringBuffer -> Bool
-	difference,	   -- :: StringBuffer -> StringBuffer -> Int
 
 	-- * Moving
 	stepOn, stepOnBy,
@@ -27,6 +27,9 @@ module StringBuffer
          -- * Conversion
         lexemeToString,     -- :: StringBuffer -> Int -> String
         lexemeToFastString, -- :: StringBuffer -> Int -> FastString
+
+	 -- * Parsing integers
+	 parseInteger,
        ) where
 
 #include "HsVersions.h"
@@ -47,6 +50,11 @@ import GHC.IO		( slurpFile )
 #endif
 
 import IO			( openFile, hFileSize, IOMode(ReadMode) )
+#if __GLASGOW_HASKELL__ >= 601
+import System.IO		( openBinaryFile )
+#else
+import IOExts                   ( openFileEx, IOModeEx(..) )
+#endif
 
 #if __GLASGOW_HASKELL__ < 503
 import IArray			( listArray )
@@ -62,6 +70,9 @@ import Data.Array.IO		( IOArray, hGetArray )
 
 import Char			( ord )
 
+#if __GLASGOW_HASKELL__ < 601
+openBinaryFile fp mode = openFileEx fp (BinaryMode mode)
+#endif
 -- -----------------------------------------------------------------------------
 -- The StringBuffer type
 
@@ -82,7 +93,7 @@ instance Show StringBuffer where
 
 hGetStringBuffer :: FilePath -> IO StringBuffer
 hGetStringBuffer fname = do
-   h <- openFile fname ReadMode
+   h <- openBinaryFile fname ReadMode
    size <- hFileSize h
    let size_i@(I# sz#) = fromIntegral size
 #if __GLASGOW_HASKELL__ < 503
@@ -90,7 +101,7 @@ hGetStringBuffer fname = do
    r <- hGetBufBA h arr size_i
 #else
    arr <- newArray_ (0,size_i-1)
-   r <- hGetArray h arr size_i
+   r <- if size_i == 0 then return 0 else hGetArray h arr size_i
 #endif
    if (r /= size_i)
 	then ioError (userError "short read of file")
@@ -135,9 +146,6 @@ lookAhead (StringBuffer arr# l# c#) (I# i#) =
  where 
    off = c# +# i#
 
-difference :: StringBuffer -> StringBuffer -> Int
-difference (StringBuffer _ _ c1#) (StringBuffer _ _ c2#) = I# (c2# -# c1#)
-
 -- -----------------------------------------------------------------------------
 -- Moving
 
@@ -169,4 +177,13 @@ lexemeToFastString :: StringBuffer -> Int -> FastString
 lexemeToFastString _ 0 = mkFastString ""
 lexemeToFastString (StringBuffer fo _ current#) (I# len) =
     mkFastSubStringBA# fo current# len
+
+-- -----------------------------------------------------------------------------
+-- Parsing integer strings in various bases
+
+parseInteger :: StringBuffer -> Int -> Integer -> (Char->Int) -> Integer
+parseInteger buf len radix to_int 
+  = go 0 0
+  where go i x | i == len  = x
+	       | otherwise = go (i+1) (x * radix + toInteger (to_int (lookAhead buf i)))
 \end{code}