Show
Ignore:
Timestamp:
02/18/07 15:56:10 (21 months ago)
Author:
audreyt
Message:

* Convert VStr from String to ByteString?, and Syn from

String to ID, in Pugs. Benchmark shows the perf gain is 5%,
so it's not worth the trouble of writing a GHC 6.7-compatible
processor. The next commit will revert this commit.

Files:
1 modified

Legend:

Unmodified
Added
Removed

  • src/Pugs/Prim/Yaml.hs

    r14337 r15296  
    2121fromYaml :: YamlNode -> Eval Val 
    2222fromYaml MkNode{n_elem=ENil}       = return VUndef 
    23 fromYaml MkNode{n_elem=EStr str}   = return $ VStr $ decodeUTF8 $ unpackBuf str 
     23fromYaml MkNode{n_elem=EStr str}   = return $ _VStr $ decodeUTF8 $ unpackBuf str 
    2424fromYaml MkNode{n_elem=ESeq nodes} = do 
    2525    av  <- mapM fromYaml nodes 
    … …  
    3333                val <- newScalar =<< fromYaml valNode 
    3434                return (key, val) 
    35             hv      <- liftIO $ (H.fromList H.hashString vals :: IO IHash) 
     35            hv      <- liftIO $ hashList vals 
    3636            return $ VRef (hashRef hv) 
    3737        Just s | (pre, post) <- Str.splitAt 16 s   -- 16 == length "tag:pugs:Object:" 
    … …  
    6464    obj     <- toYaml v 
    6565    rv      <- guardIO . emitYaml $ obj 
    66     (return . VStr . decodeUTF8) rv 
     66    (return . _VStr . decodeUTF8) rv 
    6767 
    6868strNode :: String -> YamlNode 
    … …  
    7272toYaml VUndef       = return $ mkNode ENil 
    7373toYaml (VBool x)    = return $ boolToYaml x 
    74 toYaml (VStr str)   = return $ strNode (encodeUTF8 str) 
     74toYaml (VStr str)   = return $ strNode (cast str) 
    7575toYaml v@(VRef r)   = do 
    7676    ptr <- liftIO $ stableAddressOf r