Changeset 12292 for third-party

Timestamp:

08/16/06 07:16:34 (2 years ago)

Author:

audreyt

Message:

* explicit import of ByteString? functions in HsSyc? o try to debug for agentzh++'s buildfail

Files:

• third-party/HsSyck/Data/Yaml/Syck.hsc (modified) (7 diffs)

third-party/HsSyck/Data/Yaml/Syck.hsc

@@ -23 +23 @@
 import qualified Data.HashTable as Hash
 import qualified Data.ByteString.Char8 as Buf
+import Data.ByteString.Char8 (copyCStringLen, useAsCStringLen, useAsCString, copyCString)
 
 type Buf        = Buf.ByteString
@@ -153 +154 @@
 outputCallbackPS :: IORef [Buf] -> SyckEmitter -> CString -> CLong -> IO ()
 outputCallbackPS out emitter buf len = do
-    str <- Buf.copyCStringLen (buf, fromEnum len)
+    str <- copyCStringLen (buf, fromEnum len)
     str `seq` modifyIORef out (str:)
 
@@ -177 +178 @@
 emitNode _ e n | EStr s <- n_elem n = do
     withTag n (Ptr "string"##) $ \tag ->
-        Buf.useAsCStringLen s $ \(cs, l) ->       
+        useAsCStringLen s $ \(cs, l) ->       
         syck_emit_scalar e tag scalarNone 0 0 0 cs (toEnum l)
 
@@ -195 +196 @@
 
 withTag :: YamlNode -> CString -> (CString -> IO a) -> IO a
-withTag node def f = maybe (f def) (`Buf.useAsCString` f) (n_tag node)
+withTag node def f = maybe (f def) (`useAsCString` f) (n_tag node)
 
 parseYaml :: String -> IO YamlNode
@@ -204 +205 @@
 
 parseYamlBytes :: Buf -> IO YamlNode
-parseYamlBytes = (`Buf.useAsCString` parseYamlCStr)
+parseYamlBytes = (`useAsCString` parseYamlCStr)
 
 parseYamlCStr :: CString -> IO YamlNode
@@ -285 +286 @@
     tag <- #{peek SyckNode, type_id} syckNode
     if (tag == nullPtr) then (return Nothing) else do
-        p <- Buf.copyCString tag
+        p <- copyCString tag
         return $! case Buf.elemIndex '/' p of
             Just n -> let { pre = Buf.take n p; post = Buf.drop (n+1) p } in
@@ -322 +323 @@
     tag   <- syckNodeTag syckNode
     cstr  <- syck_str_read syckNode
-    buf   <- Buf.copyCStringLen (cstr, fromEnum len)
+    buf   <- copyCStringLen (cstr, fromEnum len)
     let node = nilNode{ n_elem = EStr buf, n_tag = tag }
     if tag == Nothing && Buf.length buf == 1 && Buf.index buf 0 == '~'