Skip to content

Commit

Permalink
Switching to ByteString
Browse files Browse the repository at this point in the history
  • Loading branch information
bytbox committed Nov 21, 2011
1 parent 2765b47 commit 0d11f07
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 7 deletions.
12 changes: 7 additions & 5 deletions Data/LHE.hs
Expand Up @@ -16,6 +16,8 @@ module Data.LHE (
RawEvent(..),
) where

import qualified Data.ByteString.Char8 as S

import Text.XML.HaXml.Parse (xmlParse)
import Text.XML.HaXml.Types (Document(..), Element(..), Content(..), QName(..))

Expand All @@ -30,20 +32,20 @@ data RawEvent = RawEvent [Double] [[Double]]

parseEventFile :: String -> IO [Event]
parseEventFile fname = do
readFile fname >>= return . parseEvents fname
S.readFile fname >>= return . parseEvents fname

parseEvents :: String -> String -> [Event]
parseEvents :: String -> S.ByteString -> [Event]
parseEvents fname dat =
let re = parseRawEvents fname dat in
[]

parseRawEventFile :: String -> IO [RawEvent]
parseRawEventFile fname = do
readFile fname >>= return . parseRawEvents fname
S.readFile fname >>= return . parseRawEvents fname

parseRawEvents :: String -> String -> [RawEvent]
parseRawEvents :: String -> S.ByteString -> [RawEvent]
parseRawEvents fname dat =
let Document _ _ (Elem eName _ eList) _ = xmlParse fname dat in
let Document _ _ (Elem eName _ eList) _ = xmlParse fname (S.unpack dat) in
map (getRawEvent . getElem) $ filter isEvent eList
where
isEvent (CElem (Elem (N "event") _ _) _) = True
Expand Down
4 changes: 2 additions & 2 deletions lhe.cabal
Expand Up @@ -6,7 +6,7 @@ Name: lhe
-- The package version. See the Haskell package versioning policy
-- (http://www.haskell.org/haskellwiki/Package_versioning_policy) for
-- standards guiding when and how versions should be incremented.
Version: 0.2.3
Version: 0.3

-- A short (one-line) description of the package.
Synopsis: Parser and writer for Les-Houches event files
Expand Down Expand Up @@ -47,7 +47,7 @@ Library
Exposed-modules: Data.LHE

-- Packages needed in order to build this package.
Build-depends: haskell2010 >= 1.0 , HaXml >= 1.22
Build-depends: haskell2010 >= 1.0 , HaXml >= 1.22, bytestring >= 0.9

-- Modules not exported by this package.
-- Other-modules:
Expand Down

0 comments on commit 0d11f07

Please sign in to comment.