Changeset 14341 for src/Pugs/Prim.hs

Timestamp:

10/17/06 08:25:46 (2 years ago)

Author:

audreyt

svk:copy_cache_prev:

21206

Message:

* Pugs.Prim: Instead of using ByteString?.Char8's file IO primitives

(which defaults to binary mode instead of text mode on win32),
use Haskell's built-in ones, which handles CRLF transparently.

Files:

• src/Pugs/Prim.hs (modified) (4 diffs)

src/Pugs/Prim.hs

@@ -54 +54 @@
 import GHC.Exts (unsafeCoerce#)
 import GHC.Unicode
-import qualified UTF8 as Str
 import qualified Data.HashTable as H
 
@@ -359 +358 @@
 op1 "IO::next" = \v -> do
     fh  <- fromVal v
-    guardIO $ fmap (VStr . (++ "\n") . Str.unpack) (Str.hGetLine fh)
+    guardIO $ fmap (VStr . (++ "\n") . decodeUTF8) (hGetLine fh)
 op1 "Pugs::Safe::safe_print" = \v -> do
     str  <- fromVal v
-    guardIO . Str.hPut stdout $ Str.pack str
+    guardIO . putStr $ encodeUTF8 str
     return $ VBool True
 op1 "die" = \v -> do
@@ -438 +437 @@
         (do h <- fromVal v
             ifListContext (strictify $! op1 "=" v) $ do
-                content <- guardIO $ Str.hGetContents h
-                return . VStr $ Str.unpack content)
+                content <- guardIO $ hGetContents h
+                return . VStr $ decodeUTF8 content)
         (do
             fileName    <- fromVal v
@@ -451 +450 @@
     slurpList file = strictify $! op1 "=" (VList [VStr file])
     slurpScalar file = do
-        content <- guardIO $ Str.readFile file
-        return . VStr $ Str.unpack content
+        content <- guardIO $ readFile file
+        return . VStr $ decodeUTF8 content
 op1 "opendir" = \v -> do
     str <- fromVal v