Changeset 21673 for src/Pugs/Meta

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

Location:

src/Pugs/Meta

Files:

• Perl5.hs (modified) (2 diffs)
• Str.hs (modified) (2 diffs)

src/Pugs/Meta/Perl5.hs

@@ -8 +8 @@
 import Data.Typeable (Typeable)
 import qualified Data.Map as Map
+import qualified StringTable.AtomMap as AtomMap
 import Pugs.AST.Internals (envContext, anyToVal, anyFromVal)
 import Pugs.Types
@@ -41 +42 @@
         subSV   <- liftIO . bufToSV . cast $ meth
         posSVs  <- mapM coerceVal (fromP $ f_positionals feed)
-        namSVs  <- fmap concat . forM (Map.toList (f_nameds feed)) $ \(key, vals) -> do
+        namSVs  <- fmap concat . forM (AtomMap.toList (f_nameds feed)) $ \(key, vals) -> do
             keySV   <- liftIO (bufToSV $ cast key)
             fmap concat . forM (fromP vals) $ \v -> do

src/Pugs/Meta/Str.hs

@@ -1 @@
-{-# OPTIONS_GHC -fglasgow-exts #-}
+{-# OPTIONS_GHC -fglasgow-exts -fno-warn-deprecations #-}
 
 module Pugs.Meta.Str (_StrClass) where
@@ -5 +5 @@
 import Pugs.Val
 import Pugs.Class
-import qualified UTF8 as Str
+-- import qualified Data.ByteString.UTF8 as Str
 import qualified Data.ByteString.Char8 as Char8
-import Pugs.Internals.String
+import qualified Data.ByteString.Char8 as Str -- XXX
+import Pugs.Internals
 
 instance Boxable PureStr where