Changeset 21673 for src/Pugs/Embed/Perl5.hs

Timestamp:

08/01/08 13:56:05 (5 months ago)

Author:

audreyt

Message:

* Import Pugs 6.2.13.11 from Hackage into our source tree.
* Highlights:

• Much faster startup time
• Slightly faster compilation time (mostly due to refactored Pugs.AST.Internals)
• Portable-to-Win32 readline thanks to Haskeline

Files:

• src/Pugs/Embed/Perl5.hs (modified) (6 diffs)

src/Pugs/Embed/Perl5.hs

@@ -1 @@
-{-# OPTIONS_GHC -fglasgow-exts -cpp -fvia-C -optc-w #-}
+{-# OPTIONS_GHC -fglasgow-exts -cpp -optc-w #-}
 
 #ifndef PUGS_HAVE_PERL5
@@ -13 +13 @@
 import System.Directory
 import Pugs.Internals 
-import qualified UTF8 as Str
+import qualified Data.ByteString.UTF8 as Str
 
 evalPCR :: FilePath -> String -> String -> [(String, String)] -> IO String
@@ -187 +187 @@
 import Foreign.C.String
 import {-# SOURCE #-} Pugs.AST.Internals
-import qualified UTF8 as Str
+import qualified Data.ByteString.UTF8 as Str
+import qualified Data.ByteString.Char8 as Buf
 import qualified Pugs.Val as Val
 
@@ -296 +297 @@
 
 vstrToSV :: String -> IO PerlSV
-vstrToSV str = Str.useAsCStringLen (cast str) $ \(cstr, len) -> perl5_newSVpvn cstr (toEnum len)
+vstrToSV str = Buf.useAsCStringLen (cast str) $ \(cstr, len) -> perl5_newSVpvn cstr (toEnum len)
 
 bufToSV :: ByteString -> IO PerlSV
-bufToSV str = Str.useAsCStringLen str $ \(cstr, len) -> perl5_newSVpvn cstr (toEnum len)
+bufToSV str = Buf.useAsCStringLen str $ \(cstr, len) -> perl5_newSVpvn cstr (toEnum len)
 
 vintToSV :: (Integral a) => a -> IO PerlSV
@@ -330 +331 @@
             
 canPerl5 :: PerlSV -> ByteString -> IO Bool
-canPerl5 sv meth = Str.useAsCString meth $ \cstr -> perl5_can sv cstr
+canPerl5 sv meth = Buf.useAsCString meth $ \cstr -> perl5_can sv cstr
 
 mkSV :: IO PerlSV -> IO PerlSV
@@ -342 +343 @@
 
 evalPerl5 :: String -> PugsEnv -> CInt -> IO PerlSV
-evalPerl5 str env cxt = mkSV $ Str.useAsCString (cast str) $ \cstr -> perl5_eval cstr env cxt
+evalPerl5 str env cxt = mkSV $ Buf.useAsCString (cast str) $ \cstr -> perl5_eval cstr env cxt
 
 freePerl5 :: PerlInterpreter -> IO ()