Changeset 7166

Timestamp:

09/27/05 13:52:26 (3 years ago)

Author:

autrijus

Message:

* Merged Data.FastPackedString? with Simon Marlow's FPS API.

Files:

• README (modified) (1 diff)
• src/Data/FastPackedString.hs (modified) (8 diffs)
• src/cbits/fpstring.c (modified) (4 diffs)

README

@@ -34 +34 @@
 The "UTF8" subsystem is derived from Sven Moritz Hallberg's work,
 under a BSD-style license.  See src/UTF8.lhs.
+
+The "FastPackedString" subsystem is derived from Don Stewart et all's work,
+under a BSD-style license.  See src/Data/FastPackedString.hs.
 
 The "Unicode" subsystem is derived from Dimitry Golubovsky's work,

src/Data/FastPackedString.hs

@@ -34 +34 @@
         -- * Introducing and eliminating 'FastString's
         empty,        -- :: FastString
+        nil,          -- :: FastString -- DEPRECATED
+
         pack,         -- :: String -> FastString
         unpack,       -- :: FastString -> String
@@ -78 +80 @@
         drop,         -- :: Int -> FastString -> FastString
         splitAt,      -- :: Int -> FastString -> (FastString, FastString)
+        substr,       -- :: FastString -> Int -> Int -> FastString -- DEPRECATED
 
         takeWhile,    -- :: (Char -> Bool) -> FastString -> FastString
@@ -122 +125 @@
         spanEnd,      -- :: (Char -> Bool) -> FastString -> (FastString, FastString)
         split,        -- :: Char -> FastString -> [FastString]
+
         tokens,       -- :: (Char -> Bool) -> FastString -> [FastString]
+        splitWith,    -- :: (Char -> Bool) -> FastString -> [FastString] -- DEPRECATED
+
         hash,         -- :: FastString -> Int32
         elemIndexLast,-- :: Char -> FastString -> Maybe Int
@@ -169 +175 @@
 #endif
 
+        fromForeignPtr,         -- :: ForeignPtr Word8 -> Int -> FastString
+        toForeignPtr,           -- :: FastString -> (ForeignPtr Word8, Int, Int)
    ) where
 
@@ -270 +278 @@
 empty = unsafePerformIO $ mallocForeignPtr 1 >>= \fp -> return $ PS fp 0 0
 {-# NOINLINE empty #-}
+
+-- | /O(1)/ Alias for 'empty' to agree with old PackedString interface
+{-# DEPRECATED nil "Use empty instead" #-}
+nil :: FastString
+nil = empty
 
 -- | /O(n)/ Convert a 'String' into a 'FastString'
@@ -536 +549 @@
 {-# INLINE drop #-}
 
+-- | /O(1)/ 'substr' @begin end xs@ returns the substring of @xs@ between
+-- (and including) the two indices.
+{-# DEPRECATED substr "Use take/drop instead" #-}
+substr :: FastString -> Int -> Int -> FastString
+substr str begin end = take (end - begin + 1) (drop begin str)
+
 -- | /O(1)/ 'splitAt' @n xs@ is equivalent to @('take' n xs, 'drop' n xs)@.
 splitAt :: Int -> FastString -> (FastString, FastString)
@@ -782 +801 @@
 tokens :: (Char -> Bool) -> FastString -> [FastString]
 tokens p = Prelude.filter (not.null) . breakAll p
+
+{-# DEPRECATED splitWith "Use tokens instead" #-}
+splitWith :: (Char -> Bool) -> FastString -> [FastString]
+splitWith = tokens
 
 -- | Splits a 'FastString' into components delimited by separators,
@@ -1074 +1097 @@
     return $ PS fp 0 l
 #endif
+
+fromForeignPtr :: ForeignPtr Word8 -> Int -> FastString
+fromForeignPtr fp l = PS fp 0 l
+
+toForeignPtr :: FastString -> (ForeignPtr Word8, Int, Int)
+toForeignPtr (PS ps s l) = (ps, s, l)
 
 -- | /O(n)/ Build a @FastString@ from a malloced @CString@. This value will

src/cbits/fpstring.c

@@ -21 +21 @@
 #include <sys/types.h>
 
+#ifdef USE_MMAP
 #ifdef _WIN32
 #include <windows.h>
@@ -26 +27 @@
 #include <sys/mman.h>
 #endif
+#endif
 
 #include "fpstring.h"
@@ -68 +70 @@
 // mmapping...
 
+#ifdef USE_MMAP
 #ifdef _WIN32
 
@@ -97 +100 @@
 }
 
+#endif
 #endif