libxml-ruby 0.6.0 → 0.7.0

data/ext/libxml/ruby_xml_node.h

@@ -1,27 +1,17 @@
-/* $Id: ruby_xml_node.h 207 2007-11-14 07:51:46Z danj $ */
-
-/* Please see the LICENSE file for copyright and distribution information */
-
-#ifndef __RUBY_XML_NODE__
-#define __RUBY_XML_NODE__
-
-extern VALUE cXMLNode;
-extern VALUE eXMLNodeSetNamespace;
-extern VALUE eXMLNodeFailedModify;
-extern VALUE eXMLNodeUnknownType;
-
-typedef struct ruby_xml_node {
-  xmlNodePtr node;
-} ruby_xml_node;
-
-VALUE
-ruby_xml_node2_wrap(VALUE class, xmlNodePtr xnode);
-
-void ruby_xml_node_free(ruby_xml_node *rxn);
-void ruby_xml_node_mark_common(xmlNodePtr n);
-void ruby_init_xml_node(void);
-VALUE ruby_xml_node_child_set(VALUE self, VALUE obj);
-VALUE ruby_xml_node_name_get(VALUE self);
-VALUE ruby_xml_node_property_get(VALUE self, VALUE key);
-VALUE ruby_xml_node_property_set(VALUE self, VALUE key, VALUE val);
-#endif
+/* $Id: ruby_xml_node.h 348 2008-07-09 18:18:19Z cfis $ */
+
+/* Please see the LICENSE file for copyright and distribution information */
+
+#ifndef __RUBY_XML_NODE__
+#define __RUBY_XML_NODE__
+
+extern VALUE cXMLNode;
+extern VALUE eXMLNodeSetNamespace;
+extern VALUE eXMLNodeFailedModify;
+extern VALUE eXMLNodeUnknownType;
+
+void ruby_init_xml_node(void);
+void ruby_xml_node_mark_common(xmlNodePtr xnode);
+VALUE ruby_xml_node2_wrap(VALUE class, xmlNodePtr xnode);
+VALUE check_string_or_symbol(VALUE val);
+#endif

data/ext/libxml/ruby_xml_node_set.c

@@ -1,4 +1,4 @@
-/* $Id: ruby_xml_node_set.c 300 2008-07-01 19:14:15Z cfis $ */
+/* $Id: ruby_xml_node_set.c 339 2008-07-09 08:36:26Z cfis $ */
 
 /* Please see the LICENSE file for copyright and distribution information */
 
@@ -17,7 +17,7 @@ VALUE cXMLNodeSet;
 
 /*
  * call-seq:
- *    nodeset.to_a => [node, ..., node]
+ *    nodeset.to_a -> [node, ..., node]
  * 
  * Obtain an array of the nodes in this set.
  */
@@ -37,7 +37,7 @@ ruby_xml_node_set_to_a(VALUE self) {
 
 /*
  * call-seq:
- *    nodeset.each { |node| ... } => self
+ *    nodeset.each { |node| ... } -> self
  * 
  * Call the supplied block for each node in this set.
  */
@@ -52,7 +52,7 @@ ruby_xml_node_set_each(VALUE self) {
 
 /*
  * call-seq:
- *    nodeset.empty? => (true|false)
+ *    nodeset.empty? -> (true|false)
  *
  * Determine whether this nodeset is empty (contains no nodes).
  */
@@ -67,7 +67,7 @@ ruby_xml_node_set_empty_q(VALUE self) {
 
 /*
  * call-seq:
- *    nodeset.first => node
+ *    nodeset.first -> node
  *
  * Returns the first node in this node set, or nil if none exist.
  */
@@ -81,7 +81,7 @@ ruby_xml_node_set_first(VALUE self) {
 
 /*
  * call-seq:
- *    nodeset.length => num
+ *    nodeset.length -> num
  * 
  * Obtain the length of this nodeset.
  */
@@ -96,7 +96,8 @@ ruby_xml_node_set_length(VALUE self) {
 
 static void
 ruby_xml_node_set_mark(ruby_xml_node_set *rxnset) {
-  if (!NIL_P(rxnset->rxpop)) rb_gc_mark(rxnset->rxpop);
+  if (!NIL_P(rxnset->rxpop))
+    rb_gc_mark(rxnset->rxpop);
 }
 
 static void
@@ -124,7 +125,7 @@ ruby_xml_node_set_new2(VALUE rxpop)
 
 /*
  * call-seq:
- *    nodeset.xpath => xpath
+ *    nodeset.xpath -> xpath
  * 
  * Obtain the xpath corresponding to this nodeset, if any.
  */
@@ -136,7 +137,7 @@ ruby_xml_node_set_xpath_get(VALUE self) {
 
 /*
  * call-seq:
- *    nodeset.xpath_ctxt => context
+ *    nodeset.xpath_ctxt -> context
  * 
  * Return the xpath context corresponding to this nodeset,
  * if any.

data/ext/libxml/ruby_xml_node_set.h

@@ -1,20 +1,20 @@
-/* $Id: ruby_xml_node_set.h 207 2007-11-14 07:51:46Z danj $ */
-
-/* Please see the LICENSE file for copyright and distribution information */
-
-#ifndef __RUBY_XML_NODE_SET__
-#define __RUBY_XML_NODE_SET__
-
-extern VALUE cXMLNodeSet;
-
-typedef struct ruby_xml_node_set {
-  VALUE rxpop;
-} ruby_xml_node_set;
-
-void ruby_init_xml_node_set(void);
-VALUE ruby_xml_node_set_new(VALUE class, VALUE xpop);
-VALUE ruby_xml_node_set_new2(VALUE xpop);
-VALUE ruby_xml_node_set_each(VALUE self);
-VALUE ruby_xml_node_set_first(VALUE self);
-
-#endif
+/* $Id: ruby_xml_node_set.h 207 2007-11-14 07:51:46Z danj $ */
+
+/* Please see the LICENSE file for copyright and distribution information */
+
+#ifndef __RUBY_XML_NODE_SET__
+#define __RUBY_XML_NODE_SET__
+
+extern VALUE cXMLNodeSet;
+
+typedef struct ruby_xml_node_set {
+  VALUE rxpop;
+} ruby_xml_node_set;
+
+void ruby_init_xml_node_set(void);
+VALUE ruby_xml_node_set_new(VALUE class, VALUE xpop);
+VALUE ruby_xml_node_set_new2(VALUE xpop);
+VALUE ruby_xml_node_set_each(VALUE self);
+VALUE ruby_xml_node_set_first(VALUE self);
+
+#endif

data/ext/libxml/ruby_xml_ns.c

@@ -1,4 +1,4 @@
-/* $Id: ruby_xml_ns.c 300 2008-07-01 19:14:15Z cfis $ */
+/* $Id: ruby_xml_ns.c 351 2008-07-09 19:55:21Z cfis $ */
 
 /* Please see the LICENSE file for copyright and distribution information */
 
@@ -7,130 +7,119 @@
 
 VALUE cXMLNS;
 
+
+VALUE
+ruby_xml_ns_alloc(VALUE klass) {
+  return Data_Wrap_Struct(cXMLNS, NULL, NULL, NULL);
+}
+
+/*
+ * call-seq:
+ *    initialize(node, "href", "prefix")
+ * 
+ * Create a new namespace attached to the specified node with the
+ * give prefix and namespace.
+ *
+ *  XML::NS.new(node, "xlink", "http://www.w3.org/1999/xlink")
+ */
+VALUE
+ruby_xml_ns_initialize(VALUE self, VALUE node, VALUE href, VALUE prefix) {
+  xmlNodePtr xnode;
+  xmlNsPtr xns;
+
+  Data_Get_Struct(node, xmlNode, xnode);
+  xns = xmlNewNs(xnode, (xmlChar*)StringValuePtr(href), (xmlChar*)StringValuePtr(prefix));
+
+  DATA_PTR(self) = xns;
+  return self;  
+}
+
+VALUE
+ruby_xml_ns_wrap(xmlNsPtr xns) {
+  return(Data_Wrap_Struct(cXMLNS, NULL, NULL, xns));
+}
+
+
 /*
  * call-seq:
- *    ns.href => "href"
+ *    ns.href -> "href"
  * 
  * Obtain the namespace's href.
  */
 VALUE
 ruby_xml_ns_href_get(VALUE self) {
-  ruby_xml_ns *rxns;
-  Data_Get_Struct(self, ruby_xml_ns, rxns);
-  if (rxns->ns == NULL || rxns->ns->href == NULL)
+  xmlNsPtr xns;
+  Data_Get_Struct(self, xmlNs, xns);
+  if (xns == NULL || xns->href == NULL)
     return(Qnil);
   else
-    return(rb_str_new2((const char*)rxns->ns->href));
+    return(rb_str_new2((const char*)xns->href));
 }
 
 
 /*
  * call-seq:
- *    ns.href? => (true|false)
+ *    ns.href? -> (true|false)
  * 
  * Determine whether this namespace has an href.
  */
 VALUE
 ruby_xml_ns_href_q(VALUE self) {
-  ruby_xml_ns *rxns;
-  Data_Get_Struct(self, ruby_xml_ns, rxns);
-  if (rxns->ns == NULL || rxns->ns->href == NULL)
+  xmlNsPtr xns;
+  Data_Get_Struct(self, xmlNs, xns);
+  if (xns == NULL || xns->href == NULL)
     return(Qfalse);
   else
     return(Qtrue);
 }
 
 
-void
-ruby_xml_ns_free(ruby_xml_ns *rxns) {
-  if (rxns->ns != NULL && !rxns->is_ptr) {
-    xmlFreeNs(rxns->ns);
-    rxns->ns = NULL;
-  }
-
-  ruby_xfree(rxns);
-}
-
-
-static void
-ruby_xml_ns_mark(ruby_xml_ns *rxns) {
-  if (rxns == NULL) return;
-  if (!NIL_P(rxns->xd)) rb_gc_mark(rxns->xd);
-}
-
-
-VALUE
-ruby_xml_ns_new(VALUE class, VALUE xd, xmlNsPtr ns) {
-  ruby_xml_ns *rxns;
-
-  rxns = ALLOC(ruby_xml_ns);
-  rxns->is_ptr = 0;
-  rxns->ns = ns;
-  rxns->xd = xd;
-  return(Data_Wrap_Struct(class, ruby_xml_ns_mark,
-			  ruby_xml_ns_free, rxns));
-}
-
-
-VALUE
-ruby_xml_ns_new2(VALUE class, VALUE xd, xmlNsPtr ns) {
-  ruby_xml_ns *rxns;
-
-  rxns = ALLOC(ruby_xml_ns);
-  rxns->is_ptr = 1;
-  rxns->ns = ns;
-  rxns->xd = xd;
-  return(Data_Wrap_Struct(class, ruby_xml_ns_mark,
-			  ruby_xml_ns_free, rxns));
-}
-
-
 /*
  * call-seq:
- *    ns.next => ns
+ *    ns.next -> ns
  * 
  * Obtain the next namespace.
  */
 VALUE
 ruby_xml_ns_next(VALUE self) {
-  ruby_xml_ns *rxns;
-  Data_Get_Struct(self, ruby_xml_ns, rxns);
-  if (rxns->ns == NULL || rxns->ns->next == NULL)
+  xmlNsPtr xns;
+  Data_Get_Struct(self, xmlNs, xns);
+  if (xns == NULL || xns->next == NULL)
     return(Qnil);
   else
-    return(ruby_xml_ns_new2(cXMLNS, rxns->xd, rxns->ns->next));
+    return(ruby_xml_ns_wrap(xns->next));
 }
 
 
 /*
  * call-seq:
- *    ns.prefix => "prefix"
- *    ns.to_s   => "prefix"
+ *    ns.prefix -> "prefix"
+ *    ns.to_s   -> "prefix"
  * 
  * Obtain the namespace's prefix.
  */
 VALUE
 ruby_xml_ns_prefix_get(VALUE self) {
-  ruby_xml_ns *rxns;
-  Data_Get_Struct(self, ruby_xml_ns, rxns);
-  if (rxns->ns == NULL || rxns->ns->prefix == NULL)
+  xmlNsPtr xns;
+  Data_Get_Struct(self, xmlNs, xns);
+  if (xns == NULL || xns->prefix == NULL)
     return(Qnil);
   else
-    return(rb_str_new2((const char*)rxns->ns->prefix));
+    return(rb_str_new2((const char*)xns->prefix));
 }
 
 
 /*
  * call-seq:
- *    ns.prefix? => (true|false)
+ *    ns.prefix? -> (true|false)
  * 
  * Determine whether this namespace has a prefix.
  */
 VALUE
 ruby_xml_ns_prefix_q(VALUE self) {
-  ruby_xml_ns *rxns;
-  Data_Get_Struct(self, ruby_xml_ns, rxns);
-  if (rxns->ns == NULL || rxns->ns->prefix == NULL)
+  xmlNsPtr xns;
+  Data_Get_Struct(self, xmlNs, xns);
+  if (xns == NULL || xns->prefix == NULL)
     return(Qfalse);
   else
     return(Qtrue);
@@ -144,6 +133,8 @@ ruby_xml_ns_prefix_q(VALUE self) {
 void
 ruby_init_xml_ns(void) {
   cXMLNS = rb_define_class_under(mXML, "NS", rb_cObject);
+  rb_define_alloc_func(cXMLNS, ruby_xml_ns_alloc);
+  rb_define_method(cXMLNS, "initialize", ruby_xml_ns_initialize, 3);
   rb_define_method(cXMLNS, "href", ruby_xml_ns_href_get, 0);
   rb_define_method(cXMLNS, "href?", ruby_xml_ns_href_q, 0);
   rb_define_method(cXMLNS, "next", ruby_xml_ns_next, 0);

data/ext/libxml/ruby_xml_ns.h

@@ -1,21 +1,12 @@
-/* $Id: ruby_xml_ns.h 39 2006-02-21 20:40:16Z roscopeco $ */
-
-/* Please see the LICENSE file for copyright and distribution information */
-
-#ifndef __RUBY_XML_NS__
-#define __RUBY_XML_NS__
-
-extern VALUE cXMLNS;
-
-typedef struct ruby_xml_ns {
-  xmlNsPtr ns;
-  int is_ptr;
-  VALUE xd;
-} ruby_xml_ns;
-
-void ruby_xml_ns_free(ruby_xml_ns *rxn);
-void ruby_init_xml_ns(void);
-VALUE ruby_xml_ns_new(VALUE class, VALUE xd, xmlNsPtr ns);
-VALUE ruby_xml_ns_new2(VALUE class, VALUE xd, xmlNsPtr ns);
-VALUE ruby_xml_ns_name_get(VALUE self);
-#endif
+/* $Id: ruby_xml_ns.h 324 2008-07-08 23:00:02Z cfis $ */
+
+/* Please see the LICENSE file for copyright and distribution information */
+
+#ifndef __RUBY_XML_NS__
+#define __RUBY_XML_NS__
+
+extern VALUE cXMLNS;
+
+void ruby_init_xml_ns(void);
+VALUE ruby_xml_ns_wrap(xmlNsPtr ns);
+#endif

data/ext/libxml/ruby_xml_parser.c

@@ -1,4 +1,4 @@
-/* $Id: ruby_xml_parser.c 300 2008-07-01 19:14:15Z cfis $ */
+/* $Id: ruby_xml_parser.c 351 2008-07-09 19:55:21Z cfis $ */
 
 /* Please see the LICENSE file for copyright and distribution information */
 
@@ -18,7 +18,7 @@ ctxtRead(FILE *f, char * buf, size_t len) {
 
 /*
  * call-seq:
- * 		XML::Parser.catalog_dump => true
+ * 		XML::Parser.catalog_dump -> true
  * 
  * Dump the parser resource catalogs to stdout.
  */
@@ -31,7 +31,7 @@ ruby_xml_parser_catalog_dump(VALUE self) {
 
 /*
  * call-seq:
- * 		XML::Parser.catalog_remove(catalog) => true
+ * 		XML::Parser.catalog_remove(catalog) -> true
  * 
  * Remove the specified resource catalog.
  */
@@ -45,7 +45,7 @@ ruby_xml_parser_catalog_remove(VALUE self, VALUE cat) {
 
 /*
  * call-seq:
- * 		XML::Parser.check_lib_versions => true							
+ * 		XML::Parser.check_lib_versions -> true							
  * 
  * Check LIBXML version matches version the bindings
  * were compiled to. Throws an exception if not.
@@ -59,7 +59,7 @@ ruby_xml_parser_check_lib_versions(VALUE class) {
 
 /*
  * call-seq:
- * 		XML::Parser.enabled_automata? => (true|false)
+ * 		XML::Parser.enabled_automata? -> (true|false)
  * 
  * Determine whether libxml regexp automata support is enabled.
  */
@@ -75,7 +75,7 @@ ruby_xml_parser_enabled_automata_q(VALUE class) {
 
 /*
  * call-seq:
- * 		XML::Parser.enabled_c14n? => (true|false)
+ * 		XML::Parser.enabled_c14n? -> (true|false)
  * 
  * Determine whether libxml 'canonical XML' support is enabled.
  * See "Canonical XML" (http://www.w3.org/TR/xml-c14n)
@@ -92,7 +92,7 @@ ruby_xml_parser_enabled_c14n_q(VALUE class) {
 
 /*
  * call-seq:
- * 		XML::Parser.enabled_catalog? => (true|false)                                         
+ * 		XML::Parser.enabled_catalog? -> (true|false)                                         
  * 
  * Determine whether libxml resource catalog support is enabled.
  */
@@ -108,7 +108,7 @@ ruby_xml_parser_enabled_catalog_q(VALUE class) {
 
 /*
  * call-seq:
- * 		XML::Parser.enabled_debug? => (true|false)  
+ * 		XML::Parser.enabled_debug? -> (true|false)  
  * 
  * Determine whether libxml debugging support is enabled.
  */
@@ -124,7 +124,7 @@ ruby_xml_parser_enabled_debug_q(VALUE class) {
 
 /*
  * call-seq:
- * 		XML::Parser.enabled_docbook? => (true|false)  
+ * 		XML::Parser.enabled_docbook? -> (true|false)  
  * 
  * Determine whether libxml docbook support is enabled.
  */
@@ -140,7 +140,7 @@ ruby_xml_parser_enabled_docbook_q(VALUE class) {
 
 /*
  * call-seq:
- * 		XML::Parser.enabled_ftp? => (true|false)  
+ * 		XML::Parser.enabled_ftp? -> (true|false)  
  * 
  * Determine whether libxml ftp client support is enabled.
  */
@@ -156,7 +156,7 @@ ruby_xml_parser_enabled_ftp_q(VALUE class) {
 
 /*
  * call-seq:
- * 		XML::Parser.enabled_http? => (true|false)  
+ * 		XML::Parser.enabled_http? -> (true|false)  
  * 
  * Determine whether libxml http client support is enabled.
  */
@@ -172,7 +172,7 @@ ruby_xml_parser_enabled_http_q(VALUE class) {
 
 /*
  * call-seq:
- * 		XML::Parser.enabled_html? => (true|false)  
+ * 		XML::Parser.enabled_html? -> (true|false)  
  * 
  * Determine whether libxml html support is enabled.
  */
@@ -188,7 +188,7 @@ ruby_xml_parser_enabled_html_q(VALUE class) {
 
 /*
  * call-seq:
- * 		XML::Parser.enabled_iconv? => (true|false)  
+ * 		XML::Parser.enabled_iconv? -> (true|false)  
  * 
  * Determine whether libxml iconv support is enabled.
  */
@@ -204,7 +204,7 @@ ruby_xml_parser_enabled_iconv_q(VALUE class) {
 
 /*
  * call-seq:
- * 		XML::Parser.enabled_memory_debug? => (true|false)  
+ * 		XML::Parser.enabled_memory_debug? -> (true|false)  
  * 
  * Determine whether libxml memory location debugging support
  * is enabled.
@@ -221,7 +221,7 @@ ruby_xml_parser_enabled_memory_debug_location_q(VALUE class) {
 
 /*
  * call-seq:
- * 		XML::Parser.enabled_regexp? => (true|false)  
+ * 		XML::Parser.enabled_regexp? -> (true|false)  
  * 
  * Determine whether libxml regular expression support is enabled.
  */
@@ -237,7 +237,7 @@ ruby_xml_parser_enabled_regexp_q(VALUE class) {
 
 /*
  * call-seq:
- * 		XML::Parser.enabled_schemas? => (true|false)  
+ * 		XML::Parser.enabled_schemas? -> (true|false)  
  * 
  * Determine whether libxml schema support is enabled.
  */
@@ -253,7 +253,7 @@ ruby_xml_parser_enabled_schemas_q(VALUE class) {
 
 /*
  * call-seq:
- * 		XML::Parser.enabled_thread? => (true|false)  
+ * 		XML::Parser.enabled_thread? -> (true|false)  
  * 
  * Determine whether libxml thread-safe semantics support 
  * is enabled (I think?).
@@ -270,7 +270,7 @@ ruby_xml_parser_enabled_thread_q(VALUE class) {
 
 /*
  * call-seq:
- * 		XML::Parser.enabled_unicode? => (true|false)  
+ * 		XML::Parser.enabled_unicode? -> (true|false)  
  * 
  * Determine whether libxml unicode support is enabled.
  */
@@ -286,7 +286,7 @@ ruby_xml_parser_enabled_unicode_q(VALUE class) {
 
 /*
  * call-seq:
- * 		XML::Parser.enabled_xinclude? => (true|false)  
+ * 		XML::Parser.enabled_xinclude? -> (true|false)  
  * 
  * Determine whether libxml xinclude support is enabled.
  */
@@ -302,7 +302,7 @@ ruby_xml_parser_enabled_xinclude_q(VALUE class) {
 
 /*
  * call-seq:
- * 		XML::Parser.enabled_xpath? => (true|false)  
+ * 		XML::Parser.enabled_xpath? -> (true|false)  
  * 
  * Determine whether libxml xpath support is enabled.
  */
@@ -318,7 +318,7 @@ ruby_xml_parser_enabled_xpath_q(VALUE class) {
 
 /*
  * call-seq:
- * 		XML::Parser.enabled_xpointer? => (true|false)  
+ * 		XML::Parser.enabled_xpointer? -> (true|false)  
  * 
  * Determine whether libxml xpointer support is enabled.
  */
@@ -334,7 +334,7 @@ ruby_xml_parser_enabled_xpointer_q(VALUE class) {
 
 /*
  * call-seq:
- * 		XML::Parser.enabled_zlib? => (true|false)  
+ * 		XML::Parser.enabled_zlib? -> (true|false)  
  * 
  * Determine whether libxml zlib support is enabled.
  */
@@ -350,7 +350,7 @@ ruby_xml_parser_enabled_zlib_q(VALUE class) {
 
 /*
  * call-seq:
- *    XML::Parser.debug_entities => (true|false)
+ *    XML::Parser.debug_entities -> (true|false)
  * 
  * Determine whether included-entity debugging is enabled.
  * (Requires Libxml to be compiled with debugging support)
@@ -394,7 +394,7 @@ ruby_xml_parser_debug_entities_set(VALUE class, VALUE bool) {
 
 /*
  * call-seq:
- *    XML::Parser.default_keep_blanks => (true|false)
+ *    XML::Parser.default_keep_blanks -> (true|false)
  * 
  * Determine whether parsers retain whitespace by default.
  */
@@ -429,7 +429,7 @@ ruby_xml_parser_default_keep_blanks_set(VALUE class, VALUE bool) {
 
 /*
  * call-seq:
- *    XML::Parser.default_load_external_dtd => (true|false)
+ *    XML::Parser.default_load_external_dtd -> (true|false)
  * 
  * Determine whether parsers load external DTDs by default.
  */
@@ -462,7 +462,7 @@ ruby_xml_parser_default_load_external_dtd_set(VALUE class, VALUE bool) {
 
 /*
  * call-seq:
- *    XML::Parser.default_line_numbers => (true|false)
+ *    XML::Parser.default_line_numbers -> (true|false)
  * 
  * Determine whether parsers retain line-numbers by default.
  */
@@ -495,7 +495,7 @@ ruby_xml_parser_default_line_numbers_set(VALUE class, VALUE bool) {
 
 /*
  * call-seq:
- *    XML::Parser.default_pedantic_parser => (true|false)
+ *    XML::Parser.default_pedantic_parser -> (true|false)
  * 
  * Determine whether parsers are pedantic by default.
  */
@@ -528,7 +528,7 @@ ruby_xml_parser_default_pedantic_parser_set(VALUE class, VALUE bool) {
 
 /*
  * call-seq:
- *    XML::Parser.default_substitute_entities => (true|false)
+ *    XML::Parser.default_substitute_entities -> (true|false)
  * 
  * Determine whether parsers perform inline entity substitution
  * (for external entities) by default.
@@ -563,7 +563,7 @@ ruby_xml_parser_default_substitute_entities_set(VALUE class, VALUE bool) {
 
 /*
  * call-seq:
- *    XML::Parser.default_tree_indent_string => "string"
+ *    XML::Parser.default_tree_indent_string -> "string"
  * 
  * Obtain the default string used by parsers to indent the XML tree
  * for output.
@@ -594,7 +594,7 @@ ruby_xml_parser_default_tree_indent_string_set(VALUE class, VALUE string) {
 
 /*
  * call-seq:
- *    XML::Parser.default_validity_checking => (true|false)
+ *    XML::Parser.default_validity_checking -> (true|false)
  * 
  * Determine whether parsers perform XML validation by default.
  */
@@ -627,7 +627,7 @@ ruby_xml_parser_default_validity_checking_set(VALUE class, VALUE bool) {
 
 /*
  * call-seq:
- *    XML::Parser.default_warnings => (true|false)
+ *    XML::Parser.default_warnings -> (true|false)
  * 
  * Determine whether parsers output warnings by default.
  */
@@ -660,7 +660,7 @@ ruby_xml_parser_default_warnings_set(VALUE class, VALUE bool) {
 
 /*
  * call-seq:
- *    XML::Parser.default_compression => (true|false)
+ *    XML::Parser.default_compression -> (true|false)
  * 
  * Determine whether parsers use Zlib compression by default
  * (requires libxml to be compiled with Zlib support).
@@ -698,7 +698,7 @@ ruby_xml_parser_default_compression_set(VALUE class, VALUE num) {
 
 /*
  * call-seq:
- *    XML::Parser.features => ["feature", ..., "feature"]
+ *    XML::Parser.features -> ["feature", ..., "feature"]
  * 
  * Obtains an array of strings representing features supported 
  * (and enabled) by the installed libxml.
@@ -732,7 +732,7 @@ ruby_xml_parser_features(VALUE class) {
 
 /*
  * call-seq:
- *    parser.filename => "filename"
+ *    parser.filename -> "filename"
  * 
  * Obtain the filename this parser will read from.
  */
@@ -779,14 +779,14 @@ ruby_xml_parser_filename_set(VALUE self, VALUE filename) {
     return(Qnil);
   }
 
-  rxp->ctxt = ruby_xml_parser_context_new3();
+  rxp->ctxt = ruby_xml_parser_context_new();
   data = (rx_file_data *)rxp->data;
   data->filename = filename;
 
   Data_Get_Struct(rxp->ctxt, ruby_xml_parser_context, rxpc);
   rxpc->ctxt = xmlCreateFileParserCtxt(StringValuePtr(filename));
   if (rxpc->ctxt == NULL)
-    rb_raise(rb_eIOError, filename);
+    rb_raise(rb_eIOError, StringValuePtr(filename));
 
   return(data->filename);
 }
@@ -821,7 +821,7 @@ ruby_xml_parser_free(ruby_xml_parser *rxp) {
 
 /*
  * call-seq:
- *    XML::Parser.indent_tree_output => (true|false)
+ *    XML::Parser.indent_tree_output -> (true|false)
  * 
  * Determines whether XML output will be indented 
  * (using the string supplied to +default_indent_tree_string+)
@@ -858,7 +858,7 @@ ruby_xml_parser_indent_tree_output_set(VALUE class, VALUE bool) {
 
 /*
  * call-seq:
- *    parser.io => IO
+ *    parser.io -> IO
  * 
  * Obtain the IO instance this parser works with.
  */
@@ -914,7 +914,7 @@ ruby_xml_parser_io_set(VALUE self, VALUE io) {
     return(Qnil);
   }
 
-  rxp->ctxt = ruby_xml_parser_context_new3();
+  rxp->ctxt = ruby_xml_parser_context_new();
   data = (rx_io_data *)rxp->data;
   data->io = io;
 
@@ -936,9 +936,10 @@ ruby_xml_parser_io_set(VALUE self, VALUE io) {
 void
 ruby_xml_parser_mark(ruby_xml_parser *rxp) {
   if (rxp == NULL) return;
-  if (!NIL_P(rxp->ctxt)) rb_gc_mark(rxp->ctxt);
+  if (!NIL_P(rxp->ctxt))
+    rb_gc_mark(rxp->ctxt);
 
-  ruby_xml_state_marker();
+  rb_gc_mark(LIBXML_STATE);
 
   switch(rxp->data_type) {
   case RUBY_LIBXML_SRC_TYPE_NULL:
@@ -963,7 +964,7 @@ ruby_xml_parser_mark(ruby_xml_parser *rxp) {
 
 /*
  * call-seq:
- *    XML::Parser.memory_dump => (true|false)
+ *    XML::Parser.memory_dump -> (true|false)
  * 
  * Perform a parser memory dump (requires memory debugging 
  * support in libxml).
@@ -982,7 +983,7 @@ ruby_xml_parser_memory_dump(VALUE self) {
 
 /*
  * call-seq:
- *    XML::Parser.memory_used => num_bytes
+ *    XML::Parser.memory_used -> num_bytes
  * 
  * Perform a parser memory dump (requires memory debugging 
  * support in libxml).
@@ -1000,7 +1001,7 @@ ruby_xml_parser_memory_used(VALUE self) {
 
 /*
  * call-seq:
- *    XML::Parser.new => parser
+ *    XML::Parser.new -> parser
  * 
  * Create a new parser instance with no pre-determined source.
  */
@@ -1026,7 +1027,7 @@ ruby_xml_parser_new(VALUE class) {
 
 /*
  * call-seq:
- *    XML::Parser.file => parser
+ *    XML::Parser.file -> parser
  * 
  * Create a new parser instance that will read the specified file.
  */
@@ -1051,7 +1052,7 @@ ruby_xml_parser_new_file(VALUE class, VALUE filename) {
 
 /*
  * call-seq:
- *    XML::Parser.io => parser
+ *    XML::Parser.io -> parser
  * 
  * Create a new parser instance that will read from the
  * specified IO object.
@@ -1077,7 +1078,7 @@ ruby_xml_parser_new_io(VALUE class, VALUE io) {
 
 /*
  * call-seq:
- *    XML::Parser.string => parser
+ *    XML::Parser.string -> parser
  * 
  * Create a new parser instance that will parse the given
  * string.
@@ -1103,7 +1104,7 @@ ruby_xml_parser_new_string(VALUE class, VALUE str) {
 
 /*
  * call-seq:
- *    parser.parse => document
+ *    parser.parse -> document
  * 
  * Parse the input XML and create an XML::Document with
  * it's content. If an error occurs, XML::Parser::ParseError
@@ -1151,7 +1152,7 @@ ruby_xml_parser_parse(VALUE self) {
 
 /*
  * call-seq:
- *    parser.context => context
+ *    parser.context -> context
  * 
  * Obtain the XML::Parser::Context associated with this
  * parser.
@@ -1170,7 +1171,7 @@ ruby_xml_parser_context_get(VALUE self) {
 
 /*
  * call-seq:
- *    parser.string => "string"
+ *    parser.string -> "string"
  * 
  * Obtain the string this parser works with.
  */
@@ -1211,7 +1212,7 @@ ruby_xml_parser_str_set(VALUE self, VALUE str) {
     return(Qnil);
   }
 
-  rxp->ctxt = ruby_xml_parser_context_new3();
+  rxp->ctxt = ruby_xml_parser_context_new();
   data = (rx_string_data *)rxp->data;
   data->str = str;
 
@@ -1225,8 +1226,8 @@ ruby_xml_parser_str_set(VALUE self, VALUE str) {
 
 /*
  * call-seq:
- *    XML::Parser.register_error_handler(lambda { |msg| ... }) => old_handler
- *    XML::Parser.register_error_handler(nil) => old_handler
+ *    XML::Parser.register_error_handler(lambda { |msg| ... }) -> old_handler
+ *    XML::Parser.register_error_handler(nil) -> old_handler
  * 
  * Register the attached block as the handler for parser errors.
  * A message describing parse errors is passed to the block.