vcd 0.1.3 → 0.1.4

raw patch · 2 files changed

+35/−47 lines, 2 filesdep +polyparsedep −parsec

Dependencies added: polyparse

Dependencies removed: parsec

Files

• Data/VCD.hs +33/−45
• vcd.cabal +2/−2

@@ -24,8 +24,7 @@ import Data.IORef import Data.Word import System.IO-import Text.ParserCombinators.Parsec-import Text.ParserCombinators.Parsec.Pos+import Text.ParserCombinators.Poly.Lazy import Text.Printf  -- | The VCDHandle keeps track of generation state and the output handle.@@ -135,9 +134,8 @@   hPutStrLn (handle vcd) $ "$upscope $end"   return a --- | Set a time step.  'step' will also transition a VCDHandle from the definition to the recording phase.-step :: VCDHandle -> Int -> IO ()-step vcd n = do+stepInit :: VCDHandle -> IO ()+stepInit vcd = do   defs'     <- readIORef $ defs     vcd   dumpvars' <- readIORef $ dumpvars vcd   when defs' $ do@@ -148,6 +146,10 @@     hPutStrLn (handle vcd) "$end"     writeIORef (dirty vcd) True +-- | Set a time step.  'step' will also transition a VCDHandle from the definition to the recording phase.+step :: VCDHandle -> Int -> IO ()+step vcd n = do+  stepInit vcd   t <- readIORef $ time vcd   writeIORef (time vcd) $ t + n   dirty' <- readIORef $ dirty vcd@@ -159,16 +161,7 @@ -- | Save as 'step', but forces a step recording even if variables have not changed.  Useful for realtime simulation. step' :: VCDHandle -> Int -> IO () step' vcd n = do-  defs'     <- readIORef $ defs     vcd-  dumpvars' <- readIORef $ dumpvars vcd-  when defs' $ do-    writeIORef (defs vcd) False-    hPutStrLn (handle vcd) "$enddefinitions $end"-    hPutStrLn (handle vcd) "$dumpvars"-    dumpvars'-    hPutStrLn (handle vcd) "$end"-    writeIORef (dirty vcd) True-+  stepInit vcd   t <- readIORef $ time vcd   writeIORef (time vcd) $ t + n   hPutStrLn (handle vcd) $ "#" ++ show (t + n)@@ -205,13 +198,11 @@   | String String   deriving (Show, Eq) -type VCDParser = GenParser Token ()+type VCDParser = Parser Token  -- | Parse VCD data. parseVCD :: String -> VCD-parseVCD a = case parse vcd "unknown" $ map token $ words a of-  Left err -> error $ show err-  Right vcd -> vcd+parseVCD a = fst $ runParser vcd $ map token $ words a   where   token a = case a of     "$end"                -> End@@ -224,36 +215,33 @@     '#':a | not (null a) && all isDigit a -> Step $ read a     a                     -> String a -noPos :: a -> SourcePos-noPos _ = initialPos "unknown"+tok :: Token -> VCDParser ()+tok a = satisfy (== a) >> return () -tok_ = token show noPos-tok a = tok_ (\ b -> if a == b then Just () else Nothing)-str = tok_ $ \ a -> case a of-  String a -> Just a-  _        -> Nothing+str :: VCDParser String+str = do+  String sc <- satisfy (\ a -> case a of { String _ -> True; _ -> False })+  return sc  vcd :: VCDParser VCD-vcd = do-  ts <- timescale-  defs <- definitions-  tok EndDefinitions-  tok End-  tok DumpVars-  initValues <- values-  tok End-  initTime <- step_-  samples <- many sample >>= return . ((initTime, initValues):)-  eof-  return $ VCD ts defs samples+vcd = return (\ ts defs initValues initTime samples -> VCD ts defs $ (initTime, initValues) : samples)+  `apply`   timescale+  `apply`   definitions+  `discard` tok EndDefinitions+  `discard` tok End+  `discard` tok DumpVars+  `apply`   values+  `discard` tok End+  `apply`   step_+  `apply`   many sample+  `discard` eof  timescale :: VCDParser Timescale timescale = do   tok Timescale-  one <- str-  sc  <- str+  tok $ String "1"+  sc <- str   tok End-  when (one /= "1") $ error $ "invalid timescale: " ++ one   case sc of     "s"  -> return S     "ms" -> return MS@@ -262,7 +250,7 @@     _    -> error $ "invalid timescale: " ++ sc  definitions :: VCDParser [Definition]-definitions = many $ scope_ <|> var_+definitions = many $ oneOf [scope_, var_]  scope_ :: VCDParser Definition scope_ = do@@ -286,9 +274,9 @@   return $ Var typ (read width) code name  step_ :: VCDParser Int-step_ = tok_ $ \ a -> case a of-  Step a -> Just a-  _      -> Nothing+step_ = do+  Step a <- satisfy (\ a -> case a of { Step _ -> True; _ -> False })+  return a  sample :: VCDParser (Int, [(String, Value)]) sample = do

@@ -1,5 +1,5 @@ name:    vcd-version: 0.1.3+version: 0.1.4  category: Data @@ -23,7 +23,7 @@ library     build-depends:         base       >= 4.0 && < 5.0,-        parsec     >= 2.1+        polyparse  >= 1.4      exposed-modules:         Data.VCD