nokogiri 1.11.1 → 1.11.2

data/ext/nokogiri/html_document.c

@@ -1,4 +1,6 @@
-#include <html_document.h>
+#include <nokogiri.h>
+
+VALUE cNokogiriHtmlDocument ;
 
 static ID id_encoding_found;
 static ID id_to_s;
@@ -23,8 +25,7 @@ rb_html_document_s_new(int argc, VALUE *argv, VALUE klass)
           RTEST(uri) ? (const xmlChar *)StringValueCStr(uri) : NULL,
           RTEST(external_id) ? (const xmlChar *)StringValueCStr(external_id) : NULL
         );
-  rb_doc = Nokogiri_wrap_xml_document(klass, doc);
-  rb_obj_call_init(rb_doc, argc, argv);
+  rb_doc = noko_xml_document_wrap_with_init_args(klass, doc, argc, argv);
   return rb_doc ;
 }
 
@@ -47,7 +48,7 @@ rb_html_document_s_read_io(VALUE klass, VALUE rb_io, VALUE rb_url, VALUE rb_enco
 
   xmlSetStructuredErrorFunc((void *)rb_error_list, Nokogiri_error_array_pusher);
 
-  c_doc = htmlReadIO(io_read_callback, io_close_callback, (void *)rb_io, c_url, c_encoding, options);
+  c_doc = htmlReadIO(noko_io_read, noko_io_close, (void *)rb_io, c_url, c_encoding, options);
 
   xmlSetStructuredErrorFunc(NULL, NULL);
 
@@ -81,7 +82,7 @@ rb_html_document_s_read_io(VALUE klass, VALUE rb_io, VALUE rb_url, VALUE rb_enco
     return Qnil;
   }
 
-  rb_doc = Nokogiri_wrap_xml_document(klass, c_doc);
+  rb_doc = noko_xml_document_wrap(klass, c_doc);
   rb_iv_set(rb_doc, "@errors", rb_error_list);
   return rb_doc;
 }
@@ -129,7 +130,7 @@ rb_html_document_s_read_memory(VALUE klass, VALUE rb_html, VALUE rb_url, VALUE r
     return Qnil;
   }
 
-  rb_doc = Nokogiri_wrap_xml_document(klass, c_doc);
+  rb_doc = noko_xml_document_wrap(klass, c_doc);
   rb_iv_set(rb_doc, "@errors", rb_error_list);
   return rb_doc;
 }
@@ -148,17 +149,11 @@ rb_html_document_type(VALUE self)
   return INT2NUM((long)doc->type);
 }
 
-VALUE cNokogiriHtmlDocument ;
-
 void
-init_html_document()
+noko_init_html_document()
 {
-  VALUE nokogiri = rb_define_module("Nokogiri");
-  VALUE nokogiri_xml = rb_define_module_under(nokogiri, "XML");
-  VALUE nokogiri_xml_node = rb_define_class_under(nokogiri_xml, "Node", rb_cObject);
-  VALUE nokogiri_xml_document = rb_define_class_under(nokogiri_xml, "Document", nokogiri_xml_node);
-  VALUE nokogiri_html = rb_define_module_under(nokogiri, "HTML");
-  cNokogiriHtmlDocument = rb_define_class_under(nokogiri_html, "Document", nokogiri_xml_document);
+  assert(cNokogiriXmlDocument);
+  cNokogiriHtmlDocument = rb_define_class_under(mNokogiriHtml, "Document", cNokogiriXmlDocument);
 
   rb_define_singleton_method(cNokogiriHtmlDocument, "read_memory", rb_html_document_s_read_memory, 4);
   rb_define_singleton_method(cNokogiriHtmlDocument, "read_io", rb_html_document_s_read_io, 4);

data/ext/nokogiri/html_element_description.c

@@ -1,4 +1,6 @@
-#include <html_element_description.h>
+#include <nokogiri.h>
+
+VALUE cNokogiriHtmlElementDescription ;
 
 /*
  * call-seq:
@@ -6,9 +8,10 @@
  *
  * A list of required attributes for this element
  */
-static VALUE required_attributes(VALUE self)
+static VALUE
+required_attributes(VALUE self)
 {
-  const htmlElemDesc * description;
+  const htmlElemDesc *description;
   VALUE list;
   int i;
 
@@ -16,9 +19,9 @@ static VALUE required_attributes(VALUE self)
 
   list = rb_ary_new();
 
-  if(NULL == description->attrs_req) return list;
+  if (NULL == description->attrs_req) { return list; }
 
-  for(i = 0; description->attrs_depr[i]; i++) {
+  for (i = 0; description->attrs_depr[i]; i++) {
     rb_ary_push(list, NOKOGIRI_STR_NEW2(description->attrs_req[i]));
   }
 
@@ -31,9 +34,10 @@ static VALUE required_attributes(VALUE self)
  *
  * A list of deprecated attributes for this element
  */
-static VALUE deprecated_attributes(VALUE self)
+static VALUE
+deprecated_attributes(VALUE self)
 {
-  const htmlElemDesc * description;
+  const htmlElemDesc *description;
   VALUE list;
   int i;
 
@@ -41,9 +45,9 @@ static VALUE deprecated_attributes(VALUE self)
 
   list = rb_ary_new();
 
-  if(NULL == description->attrs_depr) return list;
+  if (NULL == description->attrs_depr) { return list; }
 
-  for(i = 0; description->attrs_depr[i]; i++) {
+  for (i = 0; description->attrs_depr[i]; i++) {
     rb_ary_push(list, NOKOGIRI_STR_NEW2(description->attrs_depr[i]));
   }
 
@@ -56,9 +60,10 @@ static VALUE deprecated_attributes(VALUE self)
  *
  * A list of optional attributes for this element
  */
-static VALUE optional_attributes(VALUE self)
+static VALUE
+optional_attributes(VALUE self)
 {
-  const htmlElemDesc * description;
+  const htmlElemDesc *description;
   VALUE list;
   int i;
 
@@ -66,9 +71,9 @@ static VALUE optional_attributes(VALUE self)
 
   list = rb_ary_new();
 
-  if(NULL == description->attrs_opt) return list;
+  if (NULL == description->attrs_opt) { return list; }
 
-  for(i = 0; description->attrs_opt[i]; i++) {
+  for (i = 0; description->attrs_opt[i]; i++) {
     rb_ary_push(list, NOKOGIRI_STR_NEW2(description->attrs_opt[i]));
   }
 
@@ -81,13 +86,15 @@ static VALUE optional_attributes(VALUE self)
  *
  * The default sub element for this element
  */
-static VALUE default_sub_element(VALUE self)
+static VALUE
+default_sub_element(VALUE self)
 {
-  const htmlElemDesc * description;
+  const htmlElemDesc *description;
   Data_Get_Struct(self, htmlElemDesc, description);
 
-  if (description->defaultsubelt)
+  if (description->defaultsubelt) {
     return NOKOGIRI_STR_NEW2(description->defaultsubelt);
+  }
 
   return Qnil;
 }
@@ -98,9 +105,10 @@ static VALUE default_sub_element(VALUE self)
  *
  * A list of allowed sub elements for this element.
  */
-static VALUE sub_elements(VALUE self)
+static VALUE
+sub_elements(VALUE self)
 {
-  const htmlElemDesc * description;
+  const htmlElemDesc *description;
   VALUE list;
   int i;
 
@@ -108,9 +116,9 @@ static VALUE sub_elements(VALUE self)
 
   list = rb_ary_new();
 
-  if(NULL == description->subelts) return list;
+  if (NULL == description->subelts) { return list; }
 
-  for(i = 0; description->subelts[i]; i++) {
+  for (i = 0; description->subelts[i]; i++) {
     rb_ary_push(list, NOKOGIRI_STR_NEW2(description->subelts[i]));
   }
 
@@ -123,9 +131,10 @@ static VALUE sub_elements(VALUE self)
  *
  * The description for this element
  */
-static VALUE description(VALUE self)
+static VALUE
+description(VALUE self)
 {
-  const htmlElemDesc * description;
+  const htmlElemDesc *description;
   Data_Get_Struct(self, htmlElemDesc, description);
 
   return NOKOGIRI_STR_NEW2(description->desc);
@@ -137,12 +146,13 @@ static VALUE description(VALUE self)
  *
  * Is this element an inline element?
  */
-static VALUE inline_eh(VALUE self)
+static VALUE
+inline_eh(VALUE self)
 {
-  const htmlElemDesc * description;
+  const htmlElemDesc *description;
   Data_Get_Struct(self, htmlElemDesc, description);
 
-  if(description->isinline) return Qtrue;
+  if (description->isinline) { return Qtrue; }
   return Qfalse;
 }
 
@@ -152,12 +162,13 @@ static VALUE inline_eh(VALUE self)
  *
  * Is this element deprecated?
  */
-static VALUE deprecated_eh(VALUE self)
+static VALUE
+deprecated_eh(VALUE self)
 {
-  const htmlElemDesc * description;
+  const htmlElemDesc *description;
   Data_Get_Struct(self, htmlElemDesc, description);
 
-  if(description->depr) return Qtrue;
+  if (description->depr) { return Qtrue; }
   return Qfalse;
 }
 
@@ -167,12 +178,13 @@ static VALUE deprecated_eh(VALUE self)
  *
  * Is this an empty element?
  */
-static VALUE empty_eh(VALUE self)
+static VALUE
+empty_eh(VALUE self)
 {
-  const htmlElemDesc * description;
+  const htmlElemDesc *description;
   Data_Get_Struct(self, htmlElemDesc, description);
 
-  if(description->empty) return Qtrue;
+  if (description->empty) { return Qtrue; }
   return Qfalse;
 }
 
@@ -182,12 +194,13 @@ static VALUE empty_eh(VALUE self)
  *
  * Should the end tag be saved?
  */
-static VALUE save_end_tag_eh(VALUE self)
+static VALUE
+save_end_tag_eh(VALUE self)
 {
-  const htmlElemDesc * description;
+  const htmlElemDesc *description;
   Data_Get_Struct(self, htmlElemDesc, description);
 
-  if(description->saveEndTag) return Qtrue;
+  if (description->saveEndTag) { return Qtrue; }
   return Qfalse;
 }
 
@@ -197,12 +210,13 @@ static VALUE save_end_tag_eh(VALUE self)
  *
  * Can the end tag be implied for this tag?
  */
-static VALUE implied_end_tag_eh(VALUE self)
+static VALUE
+implied_end_tag_eh(VALUE self)
 {
-  const htmlElemDesc * description;
+  const htmlElemDesc *description;
   Data_Get_Struct(self, htmlElemDesc, description);
 
-  if(description->endTag) return Qtrue;
+  if (description->endTag) { return Qtrue; }
   return Qfalse;
 }
 
@@ -212,12 +226,13 @@ static VALUE implied_end_tag_eh(VALUE self)
  *
  * Can the start tag be implied for this tag?
  */
-static VALUE implied_start_tag_eh(VALUE self)
+static VALUE
+implied_start_tag_eh(VALUE self)
 {
-  const htmlElemDesc * description;
+  const htmlElemDesc *description;
   Data_Get_Struct(self, htmlElemDesc, description);
 
-  if(description->startTag) return Qtrue;
+  if (description->startTag) { return Qtrue; }
   return Qfalse;
 }
 
@@ -227,12 +242,13 @@ static VALUE implied_start_tag_eh(VALUE self)
  *
  * Get the tag name for this ElemementDescription
  */
-static VALUE name(VALUE self)
+static VALUE
+name(VALUE self)
 {
-  const htmlElemDesc * description;
+  const htmlElemDesc *description;
   Data_Get_Struct(self, htmlElemDesc, description);
 
-  if(NULL == description->name) return Qnil;
+  if (NULL == description->name) { return Qnil; }
   return NOKOGIRI_STR_NEW2(description->name);
 }
 
@@ -242,38 +258,35 @@ static VALUE name(VALUE self)
  *
  * Get ElemementDescription for +tag_name+
  */
-static VALUE get_description(VALUE klass, VALUE tag_name)
+static VALUE
+get_description(VALUE klass, VALUE tag_name)
 {
-  const htmlElemDesc * description = htmlTagLookup(
-      (const xmlChar *)StringValueCStr(tag_name)
-  );
+  const htmlElemDesc *description = htmlTagLookup(
+                                      (const xmlChar *)StringValueCStr(tag_name)
+                                    );
 
-  if(NULL == description) return Qnil;
+  if (NULL == description) { return Qnil; }
   return Data_Wrap_Struct(klass, 0, 0, (void *)(uintptr_t)description);
 }
 
-VALUE cNokogiriHtmlElementDescription ;
-void init_html_element_description()
+void
+noko_init_html_element_description()
 {
-  VALUE nokogiri = rb_define_module("Nokogiri");
-  VALUE html     = rb_define_module_under(nokogiri, "HTML");
-  VALUE klass    = rb_define_class_under(html, "ElementDescription",rb_cObject);
-
-  cNokogiriHtmlElementDescription = klass;
-
-  rb_define_singleton_method(klass, "[]", get_description, 1);
-
-  rb_define_method(klass, "name", name, 0);
-  rb_define_method(klass, "implied_start_tag?", implied_start_tag_eh, 0);
-  rb_define_method(klass, "implied_end_tag?", implied_end_tag_eh, 0);
-  rb_define_method(klass, "save_end_tag?", save_end_tag_eh, 0);
-  rb_define_method(klass, "empty?", empty_eh, 0);
-  rb_define_method(klass, "deprecated?", deprecated_eh, 0);
-  rb_define_method(klass, "inline?", inline_eh, 0);
-  rb_define_method(klass, "description", description, 0);
-  rb_define_method(klass, "sub_elements", sub_elements, 0);
-  rb_define_method(klass, "default_sub_element", default_sub_element, 0);
-  rb_define_method(klass, "optional_attributes", optional_attributes, 0);
-  rb_define_method(klass, "deprecated_attributes", deprecated_attributes, 0);
-  rb_define_method(klass, "required_attributes", required_attributes, 0);
+  cNokogiriHtmlElementDescription = rb_define_class_under(mNokogiriHtml, "ElementDescription", rb_cObject);
+
+  rb_define_singleton_method(cNokogiriHtmlElementDescription, "[]", get_description, 1);
+
+  rb_define_method(cNokogiriHtmlElementDescription, "name", name, 0);
+  rb_define_method(cNokogiriHtmlElementDescription, "implied_start_tag?", implied_start_tag_eh, 0);
+  rb_define_method(cNokogiriHtmlElementDescription, "implied_end_tag?", implied_end_tag_eh, 0);
+  rb_define_method(cNokogiriHtmlElementDescription, "save_end_tag?", save_end_tag_eh, 0);
+  rb_define_method(cNokogiriHtmlElementDescription, "empty?", empty_eh, 0);
+  rb_define_method(cNokogiriHtmlElementDescription, "deprecated?", deprecated_eh, 0);
+  rb_define_method(cNokogiriHtmlElementDescription, "inline?", inline_eh, 0);
+  rb_define_method(cNokogiriHtmlElementDescription, "description", description, 0);
+  rb_define_method(cNokogiriHtmlElementDescription, "sub_elements", sub_elements, 0);
+  rb_define_method(cNokogiriHtmlElementDescription, "default_sub_element", default_sub_element, 0);
+  rb_define_method(cNokogiriHtmlElementDescription, "optional_attributes", optional_attributes, 0);
+  rb_define_method(cNokogiriHtmlElementDescription, "deprecated_attributes", deprecated_attributes, 0);
+  rb_define_method(cNokogiriHtmlElementDescription, "required_attributes", required_attributes, 0);
 }

data/ext/nokogiri/html_entity_lookup.c

@@ -1,4 +1,6 @@
-#include <html_entity_lookup.h>
+#include <nokogiri.h>
+
+static VALUE cNokogiriHtmlEntityLookup;
 
 /*
  * call-seq:
@@ -6,27 +8,30 @@
  *
  * Get the HTML::EntityDescription for +key+
  */
-static VALUE get(VALUE self, VALUE key)
+static VALUE
+get(VALUE _, VALUE rb_entity_name)
 {
-  const htmlEntityDesc * desc =
-    htmlEntityLookup((const xmlChar *)StringValueCStr(key));
-  VALUE klass, args[3];
+  VALUE cNokogiriHtmlEntityDescription;
+  const htmlEntityDesc *c_entity_desc;
+  VALUE rb_constructor_args[3];
 
-  if(NULL == desc) return Qnil;
-  klass = rb_const_get(mNokogiriHtml, rb_intern("EntityDescription"));
+  c_entity_desc = htmlEntityLookup((const xmlChar *)StringValueCStr(rb_entity_name));
+  if (NULL == c_entity_desc) {
+    return Qnil;
+  }
 
-  args[0] = INT2NUM((long)desc->value);
-  args[1] = NOKOGIRI_STR_NEW2(desc->name);
-  args[2] = NOKOGIRI_STR_NEW2(desc->desc);
+  rb_constructor_args[0] = INT2NUM((long)c_entity_desc->value);
+  rb_constructor_args[1] = NOKOGIRI_STR_NEW2(c_entity_desc->name);
+  rb_constructor_args[2] = NOKOGIRI_STR_NEW2(c_entity_desc->desc);
 
-  return rb_class_new_instance(3, args, klass);
+  cNokogiriHtmlEntityDescription = rb_const_get_at(mNokogiriHtml, rb_intern("EntityDescription"));
+  return rb_class_new_instance(3, rb_constructor_args, cNokogiriHtmlEntityDescription);
 }
 
-void init_html_entity_lookup()
+void
+noko_init_html_entity_lookup()
 {
-  VALUE nokogiri = rb_define_module("Nokogiri");
-  VALUE html = rb_define_module_under(nokogiri, "HTML");
-  VALUE klass = rb_define_class_under(html, "EntityLookup", rb_cObject);
+  cNokogiriHtmlEntityLookup = rb_define_class_under(mNokogiriHtml, "EntityLookup", rb_cObject);
 
-  rb_define_method(klass, "get", get, 1);
+  rb_define_method(cNokogiriHtmlEntityLookup, "get", get, 1);
 }

data/ext/nokogiri/html_sax_parser_context.c

@@ -1,8 +1,9 @@
-#include <html_sax_parser_context.h>
+#include <nokogiri.h>
 
 VALUE cNokogiriHtmlSaxParserContext ;
 
-static void deallocate(xmlParserCtxtPtr ctxt)
+static void
+deallocate(xmlParserCtxtPtr ctxt)
 {
   NOKOGIRI_DEBUG_START(ctxt);
 
@@ -16,103 +17,103 @@ static void deallocate(xmlParserCtxtPtr ctxt)
 static VALUE
 parse_memory(VALUE klass, VALUE data, VALUE encoding)
 {
-    htmlParserCtxtPtr ctxt;
-
-    if (NIL_P(data))
-	rb_raise(rb_eArgError, "data cannot be nil");
-    if (!(int)RSTRING_LEN(data))
-	rb_raise(rb_eRuntimeError, "data cannot be empty");
-
-    ctxt = htmlCreateMemoryParserCtxt(StringValuePtr(data),
-				      (int)RSTRING_LEN(data));
-    if (ctxt->sax) {
-	xmlFree(ctxt->sax);
-	ctxt->sax = NULL;
+  htmlParserCtxtPtr ctxt;
+
+  if (NIL_P(data)) {
+    rb_raise(rb_eArgError, "data cannot be nil");
+  }
+  if (!(int)RSTRING_LEN(data)) {
+    rb_raise(rb_eRuntimeError, "data cannot be empty");
+  }
+
+  ctxt = htmlCreateMemoryParserCtxt(StringValuePtr(data),
+                                    (int)RSTRING_LEN(data));
+  if (ctxt->sax) {
+    xmlFree(ctxt->sax);
+    ctxt->sax = NULL;
+  }
+
+  if (RTEST(encoding)) {
+    xmlCharEncodingHandlerPtr enc = xmlFindCharEncodingHandler(StringValueCStr(encoding));
+    if (enc != NULL) {
+      xmlSwitchToEncoding(ctxt, enc);
+      if (ctxt->errNo == XML_ERR_UNSUPPORTED_ENCODING) {
+        rb_raise(rb_eRuntimeError, "Unsupported encoding %s",
+                 StringValueCStr(encoding));
+      }
     }
+  }
 
-    if (RTEST(encoding)) {
-	xmlCharEncodingHandlerPtr enc = xmlFindCharEncodingHandler(StringValueCStr(encoding));
-	if (enc != NULL) {
-	    xmlSwitchToEncoding(ctxt, enc);
-	    if (ctxt->errNo == XML_ERR_UNSUPPORTED_ENCODING) {
-		rb_raise(rb_eRuntimeError, "Unsupported encoding %s",
-			 StringValueCStr(encoding));
-	    }
-	}
-    }
-
-    return Data_Wrap_Struct(klass, NULL, deallocate, ctxt);
+  return Data_Wrap_Struct(klass, NULL, deallocate, ctxt);
 }
 
-static VALUE parse_file(VALUE klass, VALUE filename, VALUE encoding)
+static VALUE
+parse_file(VALUE klass, VALUE filename, VALUE encoding)
 {
   htmlParserCtxtPtr ctxt = htmlCreateFileParserCtxt(
-      StringValueCStr(filename),
-      StringValueCStr(encoding)
-  );
+                             StringValueCStr(filename),
+                             StringValueCStr(encoding)
+                           );
   return Data_Wrap_Struct(klass, NULL, deallocate, ctxt);
 }
 
 static VALUE
 parse_doc(VALUE ctxt_val)
 {
-    htmlParserCtxtPtr ctxt = (htmlParserCtxtPtr)ctxt_val;
-    htmlParseDocument(ctxt);
-    return Qnil;
+  htmlParserCtxtPtr ctxt = (htmlParserCtxtPtr)ctxt_val;
+  htmlParseDocument(ctxt);
+  return Qnil;
 }
 
 static VALUE
 parse_doc_finalize(VALUE ctxt_val)
 {
-    htmlParserCtxtPtr ctxt = (htmlParserCtxtPtr)ctxt_val;
+  htmlParserCtxtPtr ctxt = (htmlParserCtxtPtr)ctxt_val;
 
-    if (ctxt->myDoc)
-	xmlFreeDoc(ctxt->myDoc);
+  if (ctxt->myDoc) {
+    xmlFreeDoc(ctxt->myDoc);
+  }
 
-    NOKOGIRI_SAX_TUPLE_DESTROY(ctxt->userData);
-    return Qnil;
+  NOKOGIRI_SAX_TUPLE_DESTROY(ctxt->userData);
+  return Qnil;
 }
 
 static VALUE
 parse_with(VALUE self, VALUE sax_handler)
 {
-    htmlParserCtxtPtr ctxt;
-    htmlSAXHandlerPtr sax;
+  htmlParserCtxtPtr ctxt;
+  htmlSAXHandlerPtr sax;
 
-    if (!rb_obj_is_kind_of(sax_handler, cNokogiriXmlSaxParser))
-	rb_raise(rb_eArgError, "argument must be a Nokogiri::XML::SAX::Parser");
+  if (!rb_obj_is_kind_of(sax_handler, cNokogiriXmlSaxParser)) {
+    rb_raise(rb_eArgError, "argument must be a Nokogiri::XML::SAX::Parser");
+  }
 
-    Data_Get_Struct(self, htmlParserCtxt, ctxt);
-    Data_Get_Struct(sax_handler, htmlSAXHandler, sax);
+  Data_Get_Struct(self, htmlParserCtxt, ctxt);
+  Data_Get_Struct(sax_handler, htmlSAXHandler, sax);
 
-    /* Free the sax handler since we'll assign our own */
-    if (ctxt->sax && ctxt->sax != (xmlSAXHandlerPtr)&xmlDefaultSAXHandler)
-	xmlFree(ctxt->sax);
+  /* Free the sax handler since we'll assign our own */
+  if (ctxt->sax && ctxt->sax != (xmlSAXHandlerPtr)&xmlDefaultSAXHandler) {
+    xmlFree(ctxt->sax);
+  }
 
-    ctxt->sax = sax;
-    ctxt->userData = (void *)NOKOGIRI_SAX_TUPLE_NEW(ctxt, sax_handler);
+  ctxt->sax = sax;
+  ctxt->userData = (void *)NOKOGIRI_SAX_TUPLE_NEW(ctxt, sax_handler);
 
-    xmlSetStructuredErrorFunc(NULL, NULL);
+  xmlSetStructuredErrorFunc(NULL, NULL);
 
-    rb_ensure(parse_doc, (VALUE)ctxt, parse_doc_finalize, (VALUE)ctxt);
+  rb_ensure(parse_doc, (VALUE)ctxt, parse_doc_finalize, (VALUE)ctxt);
 
-    return self;
+  return self;
 }
 
-void init_html_sax_parser_context()
+void
+noko_init_html_sax_parser_context()
 {
-  VALUE nokogiri  = rb_define_module("Nokogiri");
-  VALUE xml       = rb_define_module_under(nokogiri, "XML");
-  VALUE html      = rb_define_module_under(nokogiri, "HTML");
-  VALUE sax       = rb_define_module_under(xml, "SAX");
-  VALUE hsax      = rb_define_module_under(html, "SAX");
-  VALUE pc        = rb_define_class_under(sax, "ParserContext", rb_cObject);
-  VALUE klass     = rb_define_class_under(hsax, "ParserContext", pc);
-
-  cNokogiriHtmlSaxParserContext = klass;
+  assert(cNokogiriXmlSaxParserContext);
+  cNokogiriHtmlSaxParserContext = rb_define_class_under(mNokogiriHtmlSax, "ParserContext", cNokogiriXmlSaxParserContext);
 
-  rb_define_singleton_method(klass, "memory", parse_memory, 2);
-  rb_define_singleton_method(klass, "file", parse_file, 2);
+  rb_define_singleton_method(cNokogiriHtmlSaxParserContext, "memory", parse_memory, 2);
+  rb_define_singleton_method(cNokogiriHtmlSaxParserContext, "file", parse_file, 2);
 
-  rb_define_method(klass, "parse_with", parse_with, 1);
+  rb_define_method(cNokogiriHtmlSaxParserContext, "parse_with", parse_with, 1);
 }