Fix up xmlCleanupParser sequence.

[bpt/emacs.git] / src / xml.c

diff --git a/src/xml.c b/src/xml.c
index a686e55..8b485e7 100644 (file)
--- a/src/xml.c
+++ b/src/xml.c
@@ -1,5 +1,5 @@
 /* Interface to libxml2.
-   Copyright (C) 2010 Free Software Foundation, Inc.
+   Copyright (C) 2010-2011 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -28,11 +28,12 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include "lisp.h"
 #include "buffer.h"
 
-Lisp_Object make_dom (xmlNode *node)
+static Lisp_Object
+make_dom (xmlNode *node)
 {
   if (node->type == XML_ELEMENT_NODE)
     {
-      Lisp_Object result = Fcons (intern (node->name), Qnil);
+      Lisp_Object result = Fcons (intern ((char *) node->name), Qnil);
       xmlNode *child;
       xmlAttr *property;
       Lisp_Object plist = Qnil;
@@ -44,8 +45,9 @@ Lisp_Object make_dom (xmlNode *node)
          if (property->children &&
              property->children->content)
            {
-             plist = Fcons (Fcons (intern (property->name),
-                                   build_string (property->children->content)),
+             char *content = (char *) property->children->content;
+             plist = Fcons (Fcons (intern ((char *) property->name),
+                                   build_string (content)),
                             plist);
            }
          property = property->next;
@@ -62,10 +64,18 @@ Lisp_Object make_dom (xmlNode *node)
 
       return Fnreverse (result);
     }
-  else if (node->type == XML_TEXT_NODE)
+  else if (node->type == XML_TEXT_NODE || node->type == XML_CDATA_SECTION_NODE)
+    {
+      if (node->content)
+       return build_string ((char *) node->content);
+      else
+       return Qnil;
+    }
+  else if (node->type == XML_COMMENT_NODE)
     {
       if (node->content)
-       return build_string (node->content);
+       return list3 (intern ("comment"), Qnil,
+                     build_string ((char *) node->content));
       else
        return Qnil;
     }
@@ -77,7 +87,6 @@ static Lisp_Object
 parse_region (Lisp_Object start, Lisp_Object end, Lisp_Object base_url, int htmlp)
 {
   xmlDoc *doc;
-  xmlNode *node;
   Lisp_Object result = Qnil;
   const char *burl = "";
   EMACS_INT bytes;
@@ -96,29 +105,42 @@ parse_region (Lisp_Object start, Lisp_Object end, Lisp_Object base_url, int html
   if (! NILP (base_url))
     {
       CHECK_STRING (base_url);
-      burl = SDATA (base_url);
+      burl = SSDATA (base_url);
     }
 
   bytes = CHAR_TO_BYTE (iend) - CHAR_TO_BYTE (istart);
 
   if (htmlp)
-    doc = htmlReadMemory (BYTE_POS_ADDR (CHAR_TO_BYTE (istart)),
+    doc = htmlReadMemory ((char *) BYTE_POS_ADDR (CHAR_TO_BYTE (istart)),
                          bytes, burl, "utf-8",
                          HTML_PARSE_RECOVER|HTML_PARSE_NONET|
-                         HTML_PARSE_NOWARNING|HTML_PARSE_NOERROR);
+                         HTML_PARSE_NOWARNING|HTML_PARSE_NOERROR|
+                         HTML_PARSE_NOBLANKS);
   else
-    doc = xmlReadMemory (BYTE_POS_ADDR (CHAR_TO_BYTE (istart)),
+    doc = xmlReadMemory ((char *) BYTE_POS_ADDR (CHAR_TO_BYTE (istart)),
                         bytes, burl, "utf-8",
                         XML_PARSE_NONET|XML_PARSE_NOWARNING|
-                        XML_PARSE_NOERROR);
+                        XML_PARSE_NOBLANKS |XML_PARSE_NOERROR);
 
   if (doc != NULL)
     {
-      node = xmlDocGetRootElement (doc);
-      if (node != NULL)
-       result = make_dom (node);
+      xmlNode *n = doc->children->next;
+      Lisp_Object r = Qnil;
+
+      while (n) {
+       if (!NILP (r))
+         result = Fcons (r, result);
+       r = make_dom (n);
+       n = n->next;
+      }
+
+      if (NILP (result))
+       result = r;
+      else
+       result = Fcons (intern ("top"),
+                       Fcons (Qnil, Fnreverse (Fcons (r, result))));
+
       xmlFreeDoc (doc);
-      xmlCleanupParser ();
     }
 
   return result;