libxml-sax 0.6.0.2 → 0.6.1

raw patch · 2 files changed

+28/−3 lines, 2 files

Files

• Text/XML/LibXML/SAX.chs +25/−1
• libxml-sax.cabal +3/−2

@@ -32,6 +32,7 @@ 	, parsedCharacters 	, parsedComment 	, parsedInstruction+	, parsedDoctype 	 	-- *** Buffer-based callbacks 	, parsedCharactersBuffer@@ -83,7 +84,7 @@ 	ParserHandle handlePtr <- 		maybeWith withUTF8 filename $ \cFilename -> 		allocaBytes {# sizeof xmlSAXHandler #} $ \sax -> do-		{# call memset #} sax 0 {# sizeof xmlSAXHandler #}+		void $ {# call memset #} sax 0 {# sizeof xmlSAXHandler #} 		{#set xmlSAXHandler->initialized #} sax xmlSax2Magic 		{#call xmlCreatePushParserCtxt #} sax nullPtr nullPtr 0 cFilename 	@@ -164,6 +165,8 @@  type ProcessingInstructionSAXFunc = Ptr () -> CUString -> CUString -> IO () +type ExternalSubsetSAXFunc = Ptr () -> CUString -> CUString -> CUString -> IO ()+ foreign import ccall "wrapper" 	allocCallback0 :: Callback0 -> IO (FunPtr Callback0) @@ -182,6 +185,9 @@ foreign import ccall "wrapper" 	allocCallbackInstruction :: ProcessingInstructionSAXFunc -> IO (FunPtr ProcessingInstructionSAXFunc) +foreign import ccall "wrapper"+	allocCallbackExternalSubset :: ExternalSubsetSAXFunc -> IO (FunPtr ExternalSubsetSAXFunc)+ -- localname, prefix, namespace, value_begin, value_end data CAttribute = CAttribute CString CString CString CString CString @@ -291,6 +297,24 @@ parsedInstruction = callback wrapInstruction 	{# get xmlSAXHandler->processingInstruction #} 	{# set xmlSAXHandler->processingInstruction #}++wrapExternalSubset :: Parser m -> (X.Doctype -> m Bool) -> IO (FunPtr ExternalSubsetSAXFunc)+wrapExternalSubset p io =+	allocCallbackExternalSubset $ \_ cname cpublic csystem ->+	catchRef p $ parserFromIO p $ do+		name <- peekUTF8 (castPtr cname)+		public <- maybePeek peekUTF8 (castPtr cpublic)+		system <- maybePeek peekUTF8 (castPtr csystem)+		let external = case (public, system) of+			(Nothing, Just s) -> Just $ X.SystemID s+			(Just p', Just s) -> Just $ X.PublicID p' s+			_ -> Nothing+		parserToIO p $ io $ X.Doctype name external []++parsedDoctype :: Callback m (X.Doctype -> m Bool)+parsedDoctype = callback wrapExternalSubset+	{# get xmlSAXHandler->externalSubset #}+	{# set xmlSAXHandler->externalSubset #}  wrapCharactersBuffer :: Parser m -> ((Ptr Word8, Integer) -> m Bool)                      -> IO (FunPtr CharactersSAXFunc)

@@ -1,5 +1,5 @@ name: libxml-sax-version: 0.6.0.2+version: 0.6.1 synopsis: Bindings for the libXML2 SAX interface license: MIT license-file: license.txt@@ -18,7 +18,8 @@   location: http://john-millikin.com/software/bindings/libxml-sax/  library-  ghc-options: -Wall -fno-warn-unused-do-bind+  ghc-options: -Wall+   build-depends:       base >= 4 && < 5     , bytestring >= 0.9 && < 0.10