API bump for HaXml >= 1.22.

diff --git a/src/Twitter/Status.hs b/src/Twitter/Status.hs
index 6416232ebff9499bfc2d25e5bd258e8340e19ef0..e40bc6a6a718aa4b68e62902125859b128fc91ad 100644 (file)
--- a/src/Twitter/Status.hs
+++ b/src/Twitter/Status.hs
@@ -7,6 +7,7 @@ import Data.String.Utils (join, splitWs)
 import Test.HUnit
 import Text.Regex (matchRegex, mkRegex)
 import Text.XML.HaXml
+import Text.XML.HaXml.Posn (noPos)
 
 import StringUtils (listify)
 import Twitter.User
@@ -22,7 +23,7 @@ data Status = Status { status_id  :: Integer,
 
 
 -- |Given some XML content, create a 'Status' from it.
-status_from_content :: Content -> (Maybe Status)
+status_from_content :: Content i -> (Maybe Status)
 status_from_content content =
 
     if (length status_ids) == 0
@@ -67,7 +68,7 @@ parse_status xml_data =
     catMaybes maybe_status
     where
       (Document _ _ root _) = xmlParse xml_file_name xml_data
-      root_elem = CElem root
+      root_elem = CElem root noPos
       status_element = (single_status root_elem)
       maybe_status = map status_from_content status_element
 
@@ -79,7 +80,7 @@ parse_statuses xml_data =
     catMaybes maybe_statuses
     where
       (Document _ _ root _) = xmlParse xml_file_name xml_data
-      root_elem = CElem root
+      root_elem = CElem root noPos
       status_elements = (all_statuses root_elem)
       maybe_statuses = map status_from_content status_elements
 

diff --git a/src/Twitter/User.hs b/src/Twitter/User.hs
index ffa01ba747a8a7d7b13e684d6e0204c6c20acaa4..2c199c9d3607d0b3187babaf20c5a3ef44669a08 100644 (file)
--- a/src/Twitter/User.hs
+++ b/src/Twitter/User.hs
@@ -13,7 +13,7 @@ data User = User { screen_name :: String }
 
 
 -- |Create a 'User' from HaXML 'Content'.
-user_from_content :: Content -> (Maybe User)
+user_from_content :: Content i -> (Maybe User)
 user_from_content c =
     if (length names) == 0
     then

diff --git a/src/Twitter/Xml.hs b/src/Twitter/Xml.hs
index e284a0da5ae6601c2a8fac8ee0a9730989325773..9c220dc8231c8e6bd6da0e4653823e161ac6ed6f 100644 (file)
--- a/src/Twitter/Xml.hs
+++ b/src/Twitter/Xml.hs
@@ -10,9 +10,9 @@ import Text.XML.HaXml
 -- |Returns the 'CharData' contained within the given 'Content', or
 -- 'Nothing' if no acceptable CharData was found. It will parse either
 -- a 'CString' ('String') or 'CRef' (XML entity reference).
-get_char_data :: Content -> (Maybe CharData)
-get_char_data (CString _ cd) = Just cd
-get_char_data (CRef ref) = Just (verbatim ref) -- Entities.
+get_char_data :: Content i -> (Maybe CharData)
+get_char_data (CString _ cd _) = Just cd
+get_char_data (CRef ref _) = Just (verbatim ref) -- Entities.
 get_char_data _ = Nothing
 
 
@@ -20,36 +20,36 @@ get_char_data _ = Nothing
 -- The name is due to the fact that if we retrieve more than
 -- one status, they will be wrapped in a <statuses> tag, and
 -- thus not be top-level.
-single_status :: CFilter
+single_status :: CFilter i
 single_status = (tag "status")
 
 -- |A 'CFilter' returning all <status> tags within <statuses>.
-all_statuses :: CFilter
+all_statuses :: CFilter i
 all_statuses = (tag "statuses" /> tag "status")
 
 -- |Finds the text of the <id> element contained within some other
 -- content. Called unique_id here because status_id is used elsewhere.
-unique_id :: CFilter
+unique_id :: CFilter i
 unique_id = keep /> (tag "id") /> txt
 
 -- |Finds the text of the <created_at> element contained within some
 -- other element.
-status_created_at :: CFilter
+status_created_at :: CFilter i
 status_created_at = keep /> (tag "created_at") /> txt
 
 -- |Finds the text of the <text> element contained within some
 -- other element.
-status_text :: CFilter
+status_text :: CFilter i
 status_text = keep /> (tag "text") /> txt
 
 -- |Finds the XML of the <user> element contained within some other
 -- element.
-status_user :: CFilter
+status_user :: CFilter i
 status_user = keep /> (tag "user")
 
 -- |Finds the text of the <screen_name> element contained within some
 -- other element.
-user_screen_name :: CFilter
+user_screen_name :: CFilter i
 user_screen_name = keep /> (tag "screen_name") /> txt
 
 -- |A wrapper around the 'read' function which returns either Nothing