libxml-ruby 0.8.3-x86-mswin32-60 → 0.9.0-x86-mswin32-60

data/ext/libxml/ruby_xml_parser.h

@@ -1,4 +1,4 @@
-/* $Id: ruby_xml_parser.h 39 2006-02-21 20:40:16Z roscopeco $ */
+/* $Id: ruby_xml_parser.h 550 2008-11-17 23:26:53Z cfis $ */
 
 /* Please see the LICENSE file for copyright and distribution information */
 
@@ -7,25 +7,13 @@
 
 #define MAX_LIBXML_FEATURES_LEN 50
 
-extern int ruby_xml_parser_count;
+
 extern VALUE cXMLParser;
-extern VALUE eXMLParserParseError;
 
-typedef struct ruby_xml_parser {
-  VALUE ctxt;
-  int parsed;
-  void *data;
-  int data_type;
-} ruby_xml_parser;
+void ruby_init_parser();
 
-VALUE ruby_xml_parser_default_load_external_dtd_set(VALUE class, VALUE bool);
 VALUE ruby_xml_parser_default_substitute_entities_set(VALUE class, VALUE bool);
-VALUE ruby_xml_parser_features(VALUE self);
-VALUE ruby_xml_parser_filename_get(VALUE self);
-VALUE ruby_xml_parser_filename_set(VALUE self, VALUE filename);
-VALUE ruby_xml_parser_new(VALUE class);
-VALUE ruby_xml_parser_parse(VALUE self);
-VALUE ruby_xml_parser_str_get(VALUE self);
-VALUE ruby_xml_parser_str_set(VALUE self, VALUE str);
+VALUE ruby_xml_parser_default_load_external_dtd_set(VALUE class, VALUE bool);
+
 
 #endif

data/ext/libxml/ruby_xml_parser_context.c

@@ -1,20 +1,30 @@
-/* $Id: ruby_xml_parser_context.c 461 2008-07-15 21:35:56Z cfis $ */
+/* $Id: ruby_xml_parser_context.c 566 2008-11-18 06:53:36Z cfis $ */
 
 /* Please see the LICENSE file for copyright and distribution information */
 
 #include "ruby_libxml.h"
 #include "ruby_xml_parser_context.h"
 
-/* TODO:
+VALUE cXMLParserContext;
+
+/*
+ * Document-class: LibXML::XML::Parser::Context
  *
- * *) xmlParserInput class/structure
- * *) errNo and mappings
- * *) validity context
- * *) record_info or stats class/structure
- * *) xmlParserNodeInfoSeq
- * *) xmlParserInputState
+ * The XML::Parser::Context class provides in-depth control over how
+ * a document is parsed.
  */
-VALUE cXMLParserContext;
+
+
+void
+ruby_xml_parser_context_free(xmlParserCtxtPtr ctxt) {
+  if (ctxt != NULL)
+    xmlFreeParserCtxt(ctxt);
+}
+
+VALUE
+ruby_xml_parser_context_wrap(xmlParserCtxtPtr ctxt) {
+  return Data_Wrap_Struct(cXMLParserContext, NULL, ruby_xml_parser_context_free, ctxt);
+}
 
 /*
  * call-seq:
@@ -24,13 +34,13 @@ VALUE cXMLParserContext;
  */
 VALUE
 ruby_xml_parser_context_data_directory_get(VALUE self) {
-  ruby_xml_parser_context *rxpc;
-  Data_Get_Struct(self, ruby_xml_parser_context, rxpc);
+  xmlParserCtxtPtr ctxt;
+  Data_Get_Struct(self, xmlParserCtxt, ctxt);
 
-  if (rxpc->ctxt->directory == NULL)
+  if (ctxt->directory == NULL)
     return(Qnil);
   else
-    return(rb_str_new2(rxpc->ctxt->directory));
+    return(rb_str_new2(ctxt->directory));
 }
 
 
@@ -42,10 +52,10 @@ ruby_xml_parser_context_data_directory_get(VALUE self) {
  */
 VALUE
 ruby_xml_parser_context_depth_get(VALUE self) {
-  ruby_xml_parser_context *rxpc;
-  Data_Get_Struct(self, ruby_xml_parser_context, rxpc);
+  xmlParserCtxtPtr ctxt;
+  Data_Get_Struct(self, xmlParserCtxt, ctxt);
 
-  return(INT2NUM(rxpc->ctxt->depth));
+  return(INT2NUM(ctxt->depth));
 }
 
 
@@ -58,10 +68,10 @@ ruby_xml_parser_context_depth_get(VALUE self) {
  */
 VALUE
 ruby_xml_parser_context_disable_sax_q(VALUE self) {
-  ruby_xml_parser_context *rxpc;
-  Data_Get_Struct(self, ruby_xml_parser_context, rxpc);
+  xmlParserCtxtPtr ctxt;
+  Data_Get_Struct(self, xmlParserCtxt, ctxt);
 
-  if (rxpc->ctxt->disableSAX)
+  if (ctxt->disableSAX)
     return(Qtrue);
   else
     return(Qfalse);
@@ -77,10 +87,10 @@ ruby_xml_parser_context_disable_sax_q(VALUE self) {
  */
 VALUE
 ruby_xml_parser_context_docbook_q(VALUE self) {
-  ruby_xml_parser_context *rxpc;
-  Data_Get_Struct(self, ruby_xml_parser_context, rxpc);
+  xmlParserCtxtPtr ctxt;
+  Data_Get_Struct(self, xmlParserCtxt, ctxt);
 
-  if (rxpc->ctxt->html == 2)    // TODO check this
+  if (ctxt->html == 2)    // TODO check this
     return(Qtrue);
   else
     return(Qfalse);
@@ -96,13 +106,13 @@ ruby_xml_parser_context_docbook_q(VALUE self) {
  */
 VALUE
 ruby_xml_parser_context_encoding_get(VALUE self) {
-  ruby_xml_parser_context *rxpc;
-  Data_Get_Struct(self, ruby_xml_parser_context, rxpc);
+  xmlParserCtxtPtr ctxt;
+  Data_Get_Struct(self, xmlParserCtxt, ctxt);
 
-  if (rxpc->ctxt->encoding == NULL)
+  if (ctxt->encoding == NULL)
     return(Qnil);
   else
-    return(rb_str_new2((const char*)rxpc->ctxt->encoding));
+    return(rb_str_new2((const char*)ctxt->encoding));
 }
 
 
@@ -114,23 +124,13 @@ ruby_xml_parser_context_encoding_get(VALUE self) {
  */
 VALUE
 ruby_xml_parser_context_errno_get(VALUE self) {
-  ruby_xml_parser_context *rxpc;
-  Data_Get_Struct(self, ruby_xml_parser_context, rxpc);
+  xmlParserCtxtPtr ctxt;
+  Data_Get_Struct(self, xmlParserCtxt, ctxt);
 
-  return(INT2NUM(rxpc->ctxt->errNo));
+  return(INT2NUM(ctxt->errNo));
 }
 
 
-void
-ruby_xml_parser_context_free(ruby_xml_parser_context *rxpc) {
-  if (rxpc->ctxt != NULL) {
-    xmlFreeParserCtxt(rxpc->ctxt);
-    rxpc->ctxt = NULL;
-  }
-
-  ruby_xfree(rxpc);
-}
-
 
 /*
  * call-seq:
@@ -140,10 +140,10 @@ ruby_xml_parser_context_free(ruby_xml_parser_context *rxpc) {
  */
 VALUE
 ruby_xml_parser_context_html_q(VALUE self) {
-  ruby_xml_parser_context *rxpc;
-  Data_Get_Struct(self, ruby_xml_parser_context, rxpc);
+  xmlParserCtxtPtr ctxt;
+  Data_Get_Struct(self, xmlParserCtxt, ctxt);
 
-  if (rxpc->ctxt->html == 1)
+  if (ctxt->html == 1)
     return(Qtrue);
   else
     return(Qfalse);
@@ -160,10 +160,10 @@ ruby_xml_parser_context_html_q(VALUE self) {
 VALUE
 ruby_xml_parser_context_io_max_num_streams_get(VALUE self) {
   // TODO alias to max_streams and dep this? 
-  ruby_xml_parser_context *rxpc;
-  Data_Get_Struct(self, ruby_xml_parser_context, rxpc);
+  xmlParserCtxtPtr ctxt;
+  Data_Get_Struct(self, xmlParserCtxt, ctxt);
 
-  return(INT2NUM(rxpc->ctxt->inputMax));
+  return(INT2NUM(ctxt->inputMax));
 }
 
 
@@ -176,10 +176,10 @@ ruby_xml_parser_context_io_max_num_streams_get(VALUE self) {
  */
 VALUE
 ruby_xml_parser_context_io_num_streams_get(VALUE self) {
-  ruby_xml_parser_context *rxpc;
-  Data_Get_Struct(self, ruby_xml_parser_context, rxpc);
+  xmlParserCtxtPtr ctxt;
+  Data_Get_Struct(self, xmlParserCtxt, ctxt);
 
-  return(INT2NUM(rxpc->ctxt->inputNr));
+  return(INT2NUM(ctxt->inputNr));
 }
 
 
@@ -192,10 +192,10 @@ ruby_xml_parser_context_io_num_streams_get(VALUE self) {
  */
 VALUE
 ruby_xml_parser_context_keep_blanks_q(VALUE self) {
-  ruby_xml_parser_context *rxpc;
-  Data_Get_Struct(self, ruby_xml_parser_context, rxpc);
+  xmlParserCtxtPtr ctxt;
+  Data_Get_Struct(self, xmlParserCtxt, ctxt);
 
-  if (rxpc->ctxt->keepBlanks)
+  if (ctxt->keepBlanks)
     return(Qtrue);
   else
     return(Qfalse);
@@ -210,10 +210,10 @@ ruby_xml_parser_context_keep_blanks_q(VALUE self) {
  */
 VALUE
 ruby_xml_parser_context_name_depth_get(VALUE self) {
-  ruby_xml_parser_context *rxpc;
-  Data_Get_Struct(self, ruby_xml_parser_context, rxpc);
+  xmlParserCtxtPtr ctxt;
+  Data_Get_Struct(self, xmlParserCtxt, ctxt);
 
-  return(INT2NUM(rxpc->ctxt->nameNr));
+  return(INT2NUM(ctxt->nameNr));
 }
 
 
@@ -225,10 +225,10 @@ ruby_xml_parser_context_name_depth_get(VALUE self) {
  */
 VALUE
 ruby_xml_parser_context_name_depth_max_get(VALUE self) {
-  ruby_xml_parser_context *rxpc;
-  Data_Get_Struct(self, ruby_xml_parser_context, rxpc);
+  xmlParserCtxtPtr ctxt;
+  Data_Get_Struct(self, xmlParserCtxt, ctxt);
 
-  return(INT2NUM(rxpc->ctxt->nameMax));
+  return(INT2NUM(ctxt->nameMax));
 }
 
 
@@ -240,13 +240,13 @@ ruby_xml_parser_context_name_depth_max_get(VALUE self) {
  */
 VALUE
 ruby_xml_parser_context_name_node_get(VALUE self) {
-  ruby_xml_parser_context *rxpc;
-  Data_Get_Struct(self, ruby_xml_parser_context, rxpc);
+  xmlParserCtxtPtr ctxt;
+  Data_Get_Struct(self, xmlParserCtxt, ctxt);
 
-  if (rxpc->ctxt->name == NULL)
+  if (ctxt->name == NULL)
     return(Qnil);
   else
-    return(rb_str_new2((const char*)rxpc->ctxt->name));
+    return(rb_str_new2((const char*)ctxt->name));
 }
 
 
@@ -259,21 +259,21 @@ ruby_xml_parser_context_name_node_get(VALUE self) {
 VALUE
 ruby_xml_parser_context_name_tab_get(VALUE self) {
   int i;
-  ruby_xml_parser_context *rxpc;
+  xmlParserCtxtPtr ctxt;
   VALUE tab_ary;
 
-  Data_Get_Struct(self, ruby_xml_parser_context, rxpc);
+  Data_Get_Struct(self, xmlParserCtxt, ctxt);
 
-  if (rxpc->ctxt->nameTab == NULL)
+  if (ctxt->nameTab == NULL)
     return(Qnil);
 
   tab_ary = rb_ary_new();
 
-  for (i = (rxpc->ctxt->nameNr - 1); i >= 0; i--) {
-    if (rxpc->ctxt->nameTab[i] == NULL)
+  for (i = (ctxt->nameNr - 1); i >= 0; i--) {
+    if (ctxt->nameTab[i] == NULL)
       continue;
     else
-      rb_ary_push(tab_ary, rb_str_new2((const char*)rxpc->ctxt->nameTab[i]));
+      rb_ary_push(tab_ary, rb_str_new2((const char*)ctxt->nameTab[i]));
   }
 
   return(tab_ary);
@@ -288,10 +288,10 @@ ruby_xml_parser_context_name_tab_get(VALUE self) {
  */
 VALUE
 ruby_xml_parser_context_node_depth_get(VALUE self) {
-  ruby_xml_parser_context *rxpc;
-  Data_Get_Struct(self, ruby_xml_parser_context, rxpc);
+  xmlParserCtxtPtr ctxt;
+  Data_Get_Struct(self, xmlParserCtxt, ctxt);
 
-  return(INT2NUM(rxpc->ctxt->nodeNr));
+  return(INT2NUM(ctxt->nodeNr));
 }
 
 
@@ -303,14 +303,14 @@ ruby_xml_parser_context_node_depth_get(VALUE self) {
  */
 VALUE
 ruby_xml_parser_context_node_get(VALUE self) {
-  ruby_xml_parser_context *rxpc;
-  Data_Get_Struct(self, ruby_xml_parser_context, rxpc);
+  xmlParserCtxtPtr ctxt;
+  Data_Get_Struct(self, xmlParserCtxt, ctxt);
 
-  if (rxpc->ctxt->node == NULL)
+  if (ctxt->node == NULL)
     return(Qnil);
   else
     return(ruby_xml_node2_wrap(cXMLNode,
-			      rxpc->ctxt->node));
+			      ctxt->node));
 }
 
 
@@ -322,10 +322,10 @@ ruby_xml_parser_context_node_get(VALUE self) {
  */
 VALUE
 ruby_xml_parser_context_node_depth_max_get(VALUE self) {
-  ruby_xml_parser_context *rxpc;
-  Data_Get_Struct(self, ruby_xml_parser_context, rxpc);
+  xmlParserCtxtPtr ctxt;
+  Data_Get_Struct(self, xmlParserCtxt, ctxt);
 
-  return(INT2NUM(rxpc->ctxt->nodeMax));
+  return(INT2NUM(ctxt->nodeMax));
 }
 
 
@@ -337,39 +337,10 @@ ruby_xml_parser_context_node_depth_max_get(VALUE self) {
  */
 VALUE
 ruby_xml_parser_context_num_chars_get(VALUE self) {
-  ruby_xml_parser_context *rxpc;
-  Data_Get_Struct(self, ruby_xml_parser_context, rxpc);
+  xmlParserCtxtPtr ctxt;
+  Data_Get_Struct(self, xmlParserCtxt, ctxt);
 
-  return(LONG2NUM(rxpc->ctxt->nbChars));
-}
-
-
-VALUE
-ruby_xml_parser_context_new() {
-  ruby_xml_parser_context *rxpc = ALLOC(ruby_xml_parser_context);
-  return Data_Wrap_Struct(cXMLParserContext,
-			  NULL,
-			  ruby_xml_parser_context_free,
-			  rxpc);
-}
-
-
-VALUE
-ruby_xml_parser_context_options_set(VALUE self, VALUE options) {
-  ruby_xml_parser_context *rxpc;
-  Data_Get_Struct(self, ruby_xml_parser_context, rxpc);
-
-  if (xmlCtxtUseOptions(rxpc->ctxt, NUM2INT(options)))
-       return Qfalse;
-  else
-       return Qtrue;
-}
-
-VALUE
-ruby_xml_parser_context_options_get(VALUE self) {
-  ruby_xml_parser_context *rxpc;
-  Data_Get_Struct(self, ruby_xml_parser_context, rxpc);
-  return INT2NUM(rxpc->ctxt->options);
+  return(LONG2NUM(ctxt->nbChars));
 }
 
 /*
@@ -381,10 +352,10 @@ ruby_xml_parser_context_options_get(VALUE self) {
  */
 VALUE
 ruby_xml_parser_context_replace_entities_q(VALUE self) {
-  ruby_xml_parser_context *rxpc;
-  Data_Get_Struct(self, ruby_xml_parser_context, rxpc);
+  xmlParserCtxtPtr ctxt;
+  Data_Get_Struct(self, xmlParserCtxt, ctxt);
 
-  if (rxpc->ctxt->replaceEntities)
+  if (ctxt->replaceEntities)
     return(Qtrue);
   else
     return(Qfalse);
@@ -400,14 +371,14 @@ ruby_xml_parser_context_replace_entities_q(VALUE self) {
  */
 VALUE
 ruby_xml_parser_context_replace_entities_set(VALUE self, VALUE bool) {
-  ruby_xml_parser_context *rxpc;
-  Data_Get_Struct(self, ruby_xml_parser_context, rxpc);
+  xmlParserCtxtPtr ctxt;
+  Data_Get_Struct(self, xmlParserCtxt, ctxt);
 
   if (TYPE(bool) == T_FALSE) {
-    rxpc->ctxt->replaceEntities = 0;
+    ctxt->replaceEntities = 0;
     return(Qfalse);
   } else {
-    rxpc->ctxt->replaceEntities = 1;
+    ctxt->replaceEntities = 1;
     return(Qfalse);
   }
 }
@@ -420,10 +391,10 @@ ruby_xml_parser_context_replace_entities_set(VALUE self, VALUE bool) {
  */
 VALUE
 ruby_xml_parser_context_space_depth_get(VALUE self) {
-  ruby_xml_parser_context *rxpc;
-  Data_Get_Struct(self, ruby_xml_parser_context, rxpc);
+  xmlParserCtxtPtr ctxt;
+  Data_Get_Struct(self, xmlParserCtxt, ctxt);
 
-  return(INT2NUM(rxpc->ctxt->spaceNr));
+  return(INT2NUM(ctxt->spaceNr));
 }
 
 
@@ -435,10 +406,10 @@ ruby_xml_parser_context_space_depth_get(VALUE self) {
  */
 VALUE
 ruby_xml_parser_context_space_depth_max_get(VALUE self) {
-  ruby_xml_parser_context *rxpc;
-  Data_Get_Struct(self, ruby_xml_parser_context, rxpc);
+  xmlParserCtxtPtr ctxt;
+  Data_Get_Struct(self, xmlParserCtxt, ctxt);
 
-  return(INT2NUM(rxpc->ctxt->spaceMax));
+  return(INT2NUM(ctxt->spaceMax));
 }
 
 
@@ -451,10 +422,10 @@ ruby_xml_parser_context_space_depth_max_get(VALUE self) {
  */
 VALUE
 ruby_xml_parser_context_subset_external_q(VALUE self) {
-  ruby_xml_parser_context *rxpc;
-  Data_Get_Struct(self, ruby_xml_parser_context, rxpc);
+  xmlParserCtxtPtr ctxt;
+  Data_Get_Struct(self, xmlParserCtxt, ctxt);
 
-  if (rxpc->ctxt->inSubset == 2)
+  if (ctxt->inSubset == 2)
     return(Qtrue);
   else
     return(Qfalse);
@@ -470,10 +441,10 @@ ruby_xml_parser_context_subset_external_q(VALUE self) {
  */
 VALUE
 ruby_xml_parser_context_subset_internal_q(VALUE self) {
-  ruby_xml_parser_context *rxpc;
-  Data_Get_Struct(self, ruby_xml_parser_context, rxpc);
+  xmlParserCtxtPtr ctxt;
+  Data_Get_Struct(self, xmlParserCtxt, ctxt);
 
-  if (rxpc->ctxt->inSubset == 1)
+  if (ctxt->inSubset == 1)
     return(Qtrue);
   else
     return(Qfalse);
@@ -490,13 +461,13 @@ ruby_xml_parser_context_subset_internal_q(VALUE self) {
  */
 VALUE
 ruby_xml_parser_context_subset_name_get(VALUE self) {
-  ruby_xml_parser_context *rxpc;
-  Data_Get_Struct(self, ruby_xml_parser_context, rxpc);
+  xmlParserCtxtPtr ctxt;
+  Data_Get_Struct(self, xmlParserCtxt, ctxt);
 
-  if (rxpc->ctxt->intSubName == NULL)
+  if (ctxt->intSubName == NULL)
     return(Qnil);
   else
-    return(rb_str_new2((const char*)rxpc->ctxt->intSubName));
+    return(rb_str_new2((const char*)ctxt->intSubName));
 }
 
 
@@ -510,13 +481,13 @@ ruby_xml_parser_context_subset_name_get(VALUE self) {
  */
 VALUE
 ruby_xml_parser_context_subset_external_uri_get(VALUE self) {
-  ruby_xml_parser_context *rxpc;
-  Data_Get_Struct(self, ruby_xml_parser_context, rxpc);
+  xmlParserCtxtPtr ctxt;
+  Data_Get_Struct(self, xmlParserCtxt, ctxt);
 
-  if (rxpc->ctxt->extSubURI == NULL)
+  if (ctxt->extSubURI == NULL)
     return(Qnil);
   else
-    return(rb_str_new2((const char*)rxpc->ctxt->extSubURI));
+    return(rb_str_new2((const char*)ctxt->extSubURI));
 }
 
 
@@ -530,13 +501,13 @@ ruby_xml_parser_context_subset_external_uri_get(VALUE self) {
  */
 VALUE
 ruby_xml_parser_context_subset_external_system_id_get(VALUE self) {
-  ruby_xml_parser_context *rxpc;
-  Data_Get_Struct(self, ruby_xml_parser_context, rxpc);
+  xmlParserCtxtPtr ctxt;
+  Data_Get_Struct(self, xmlParserCtxt, ctxt);
 
-  if (rxpc->ctxt->extSubSystem == NULL)
+  if (ctxt->extSubSystem == NULL)
     return(Qnil);
   else
-    return(rb_str_new2((const char*)rxpc->ctxt->extSubSystem));
+    return(rb_str_new2((const char*)ctxt->extSubSystem));
 }
 
 
@@ -548,10 +519,10 @@ ruby_xml_parser_context_subset_external_system_id_get(VALUE self) {
  */
 VALUE
 ruby_xml_parser_context_standalone_q(VALUE self) {
-  ruby_xml_parser_context *rxpc;
-  Data_Get_Struct(self, ruby_xml_parser_context, rxpc);
+  xmlParserCtxtPtr ctxt;
+  Data_Get_Struct(self, xmlParserCtxt, ctxt);
 
-  if (rxpc->ctxt->standalone)
+  if (ctxt->standalone)
     return(Qtrue);
   else
     return(Qfalse);
@@ -566,10 +537,10 @@ ruby_xml_parser_context_standalone_q(VALUE self) {
  */
 VALUE
 ruby_xml_parser_context_stats_q(VALUE self) {
-  ruby_xml_parser_context *rxpc;
-  Data_Get_Struct(self, ruby_xml_parser_context, rxpc);
+  xmlParserCtxtPtr ctxt;
+  Data_Get_Struct(self, xmlParserCtxt, ctxt);
 
-  if (rxpc->ctxt->record_info)
+  if (ctxt->record_info)
     return(Qtrue);
   else
     return(Qfalse);
@@ -584,10 +555,10 @@ ruby_xml_parser_context_stats_q(VALUE self) {
  */
 VALUE
 ruby_xml_parser_context_valid_q(VALUE self) {
-  ruby_xml_parser_context *rxpc;
-  Data_Get_Struct(self, ruby_xml_parser_context, rxpc);
+  xmlParserCtxtPtr ctxt;
+  Data_Get_Struct(self, xmlParserCtxt, ctxt);
 
-  if (rxpc->ctxt->valid)
+  if (ctxt->valid)
     return(Qtrue);
   else
     return(Qfalse);
@@ -602,10 +573,10 @@ ruby_xml_parser_context_valid_q(VALUE self) {
  */
 VALUE
 ruby_xml_parser_context_validate_q(VALUE self) {
-  ruby_xml_parser_context *rxpc;
-  Data_Get_Struct(self, ruby_xml_parser_context, rxpc);
+  xmlParserCtxtPtr ctxt;
+  Data_Get_Struct(self, xmlParserCtxt, ctxt);
 
-  if (rxpc->ctxt->validate)
+  if (ctxt->validate)
     return(Qtrue);
   else
     return(Qfalse);
@@ -620,13 +591,13 @@ ruby_xml_parser_context_validate_q(VALUE self) {
  */
 VALUE
 ruby_xml_parser_context_version_get(VALUE self) {
-  ruby_xml_parser_context *rxpc;
-  Data_Get_Struct(self, ruby_xml_parser_context, rxpc);
+  xmlParserCtxtPtr ctxt;
+  Data_Get_Struct(self, xmlParserCtxt, ctxt);
 
-  if (rxpc->ctxt->version == NULL)
+  if (ctxt->version == NULL)
     return(Qnil);
   else
-    return(rb_str_new2((const char*)rxpc->ctxt->version));
+    return(rb_str_new2((const char*)ctxt->version));
 }
 
 
@@ -638,26 +609,19 @@ ruby_xml_parser_context_version_get(VALUE self) {
  */
 VALUE
 ruby_xml_parser_context_well_formed_q(VALUE self) {
-  ruby_xml_parser_context *rxpc;
-  Data_Get_Struct(self, ruby_xml_parser_context, rxpc);
+  xmlParserCtxtPtr ctxt;
+  Data_Get_Struct(self, xmlParserCtxt, ctxt);
 
-  if (rxpc->ctxt->wellFormed)
+  if (ctxt->wellFormed)
     return(Qtrue);
   else
     return(Qfalse);
 }
 
-
-// Rdoc needs to know 
-#ifdef RDOC_NEVER_DEFINED
-  mLibXML = rb_define_module("LibXML");
-  mXML = rb_define_module_under(mLibXML, "XML");
-  cXMLParser = rb_define_class_under(mXML, "Parser", rb_cObject);
-#endif
-
 void
 ruby_init_xml_parser_context(void) {
   cXMLParserContext = rb_define_class_under(cXMLParser, "Context", rb_cObject);
+  rb_undef_alloc_func(cXMLParserContext);
 
   rb_define_method(cXMLParserContext, "data_directory", ruby_xml_parser_context_data_directory_get, 0);
   rb_define_method(cXMLParserContext, "depth", ruby_xml_parser_context_depth_get, 0);
@@ -677,8 +641,6 @@ ruby_init_xml_parser_context(void) {
   rb_define_method(cXMLParserContext, "node_depth", ruby_xml_parser_context_node_depth_get, 0);
   rb_define_method(cXMLParserContext, "node_depth_max", ruby_xml_parser_context_node_depth_max_get, 0);
   rb_define_method(cXMLParserContext, "num_chars", ruby_xml_parser_context_num_chars_get, 0);
-  rb_define_method(cXMLParserContext, "options", ruby_xml_parser_context_options_get, 0);
-  rb_define_method(cXMLParserContext, "options=", ruby_xml_parser_context_options_set, 1);
   rb_define_method(cXMLParserContext, "replace_entities?", ruby_xml_parser_context_replace_entities_q, 0);
   rb_define_method(cXMLParserContext, "replace_entities=", ruby_xml_parser_context_replace_entities_set, 1);
   rb_define_method(cXMLParserContext, "space_depth", ruby_xml_parser_context_space_depth_get, 0);