libxml-ruby 0.6.0-x86-mswin32-60 → 0.7.0-x86-mswin32-60

data/ext/libxml/ruby_xml_parser.h

@@ -1,31 +1,31 @@
-/* $Id: ruby_xml_parser.h 39 2006-02-21 20:40:16Z roscopeco $ */
-
-/* Please see the LICENSE file for copyright and distribution information */
-
-#ifndef __RUBY_XML_PARSER__
-#define __RUBY_XML_PARSER__
-
-#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;
-
-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);
-
-#endif
+/* $Id: ruby_xml_parser.h 39 2006-02-21 20:40:16Z roscopeco $ */
+
+/* Please see the LICENSE file for copyright and distribution information */
+
+#ifndef __RUBY_XML_PARSER__
+#define __RUBY_XML_PARSER__
+
+#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;
+
+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);
+
+#endif

data/ext/libxml/ruby_xml_parser_context.c

@@ -1,4 +1,4 @@
-/* $Id: ruby_xml_parser_context.c 300 2008-07-01 19:14:15Z cfis $ */
+/* $Id: ruby_xml_parser_context.c 344 2008-07-09 16:15:31Z cfis $ */
 
 /* Please see the LICENSE file for copyright and distribution information */
 
@@ -18,7 +18,7 @@ VALUE cXMLParserContext;
 
 /*
  * call-seq:
- *    context.data_directory => "dir"
+ *    context.data_directory -> "dir"
  * 
  * Obtain the data directory associated with this context.
  */
@@ -36,7 +36,7 @@ ruby_xml_parser_context_data_directory_get(VALUE self) {
 
 /*
  * call-seq:
- *    context.depth => num
+ *    context.depth -> num
  * 
  * Obtain the depth of this context.
  */
@@ -51,7 +51,7 @@ ruby_xml_parser_context_depth_get(VALUE self) {
 
 /*
  * call-seq:
- *    context.disable_sax? => (true|false)
+ *    context.disable_sax? -> (true|false)
  * 
  * Determine whether SAX-based processing is disabled
  * in this context.
@@ -68,27 +68,10 @@ ruby_xml_parser_context_disable_sax_q(VALUE self) {
 }
 
 
-/*
- * call-seq:
- *    context.doc => document
- * 
- * Obtain the +XML::Document+ associated with this context.
- */
-VALUE
-ruby_xml_parser_context_doc_get(VALUE self) {
-  ruby_xml_parser_context *rxpc;
-  Data_Get_Struct(self, ruby_xml_parser_context, rxpc);
-
-  if (rxpc->ctxt->myDoc == NULL)
-    return(Qnil);
-
-  return(ruby_xml_document_wrap(rxpc->ctxt->myDoc));
-}
-
 
 /*
  * call-seq:
- *    context.docbook? => (true|false)
+ *    context.docbook? -> (true|false)
  * 
  * Determine whether this is a docbook context.
  */
@@ -106,7 +89,7 @@ ruby_xml_parser_context_docbook_q(VALUE self) {
 
 /*
  * call-seq:
- *    context.encoding => "encoding"
+ *    context.encoding -> "encoding"
  * 
  * Obtain the character encoding identifier used in
  * this context.
@@ -125,7 +108,7 @@ ruby_xml_parser_context_encoding_get(VALUE self) {
 
 /*
  * call-seq:
- *    context.errno => num
+ *    context.errno -> num
  * 
  * Obtain the last-error number in this context.
  */
@@ -148,15 +131,10 @@ ruby_xml_parser_context_free(ruby_xml_parser_context *rxpc) {
   ruby_xfree(rxpc);
 }
 
-void
-ruby_xml_parser_context_mark(void *v) {
-  if ( v == NULL ) return;
-  ruby_xml_state_marker();
-}
 
 /*
  * call-seq:
- *    context.html? => (true|false)
+ *    context.html? -> (true|false)
  * 
  * Determine whether this is an html context.
  */
@@ -174,7 +152,7 @@ ruby_xml_parser_context_html_q(VALUE self) {
 
 /*
  * call-seq:
- *    context.max_num_streams => num
+ *    context.max_num_streams -> num
  * 
  * Obtain the limit on the number of IO streams opened in
  * this context.
@@ -191,7 +169,7 @@ ruby_xml_parser_context_io_max_num_streams_get(VALUE self) {
 
 /*
  * call-seq:
- *    context.num_streams => "dir"
+ *    context.num_streams -> "dir"
  * 
  * Obtain the actual number of IO streams in this
  * context.
@@ -207,7 +185,7 @@ ruby_xml_parser_context_io_num_streams_get(VALUE self) {
 
 /*
  * call-seq:
- *    context.keep_blanks? => (true|false)
+ *    context.keep_blanks? -> (true|false)
  * 
  * Determine whether parsers in this context retain 
  * whitespace.
@@ -226,7 +204,7 @@ ruby_xml_parser_context_keep_blanks_q(VALUE self) {
 
 /*
  * call-seq:
- *    context.name_depth => num
+ *    context.name_depth -> num
  * 
  * Obtain the name depth for this context.
  */
@@ -241,7 +219,7 @@ ruby_xml_parser_context_name_depth_get(VALUE self) {
 
 /*
  * call-seq:
- *    context.name_depth_max => num
+ *    context.name_depth_max -> num
  * 
  * Obtain the maximum name depth for this context.
  */
@@ -256,7 +234,7 @@ ruby_xml_parser_context_name_depth_max_get(VALUE self) {
 
 /*
  * call-seq:
- *    context.name_node => "name"
+ *    context.name_node -> "name"
  * 
  * Obtain the name node for this context.
  */
@@ -274,7 +252,7 @@ ruby_xml_parser_context_name_node_get(VALUE self) {
 
 /*
  * call-seq:
- *    context.name_tab => ["name", ..., "name"]
+ *    context.name_tab -> ["name", ..., "name"]
  * 
  * Obtain the name table for this context.
  */
@@ -304,7 +282,7 @@ ruby_xml_parser_context_name_tab_get(VALUE self) {
 
 /*
  * call-seq:
- *    context.node_depth => num
+ *    context.node_depth -> num
  * 
  * Obtain the node depth for this context.
  */
@@ -319,7 +297,7 @@ ruby_xml_parser_context_node_depth_get(VALUE self) {
 
 /*
  * call-seq:
- *    context.node => node
+ *    context.node -> node
  * 
  * Obtain the root node of this context.
  */
@@ -338,7 +316,7 @@ ruby_xml_parser_context_node_get(VALUE self) {
 
 /*
  * call-seq:
- *    context.node_depth_max => num
+ *    context.node_depth_max -> num
  * 
  * Obtain the maximum node depth for this context.
  */
@@ -353,7 +331,7 @@ ruby_xml_parser_context_node_depth_max_get(VALUE self) {
 
 /*
  * call-seq:
- *    context.num_chars => num
+ *    context.num_chars -> num
  * 
  * Obtain the number of characters in this context.
  */
@@ -367,31 +345,15 @@ ruby_xml_parser_context_num_chars_get(VALUE self) {
 
 
 VALUE
-ruby_xml_parser_context_new(VALUE class, xmlParserCtxtPtr ctxt) {
-  ruby_xml_parser_context *rxpc;
-
-  rxpc = ALLOC(ruby_xml_parser_context);
-
-  rxpc->ctxt = ctxt;
-  return Data_Wrap_Struct(class,
-			  ruby_xml_parser_context_mark,
+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_new2(VALUE class) {
-  return(ruby_xml_parser_context_new(class, NULL));
-}
-
-
-VALUE
-ruby_xml_parser_context_new3() {
-  return(ruby_xml_parser_context_new2(cXMLParserContext));
-}
-
-
 VALUE
 ruby_xml_parser_context_options_set(VALUE self, VALUE options) {
   ruby_xml_parser_context *rxpc;
@@ -412,7 +374,7 @@ ruby_xml_parser_context_options_get(VALUE self) {
 
 /*
  * call-seq:
- *    context.replace_entities? => (true|false)
+ *    context.replace_entities? -> (true|false)
  * 
  * Determine whether external entity replacement is enabled in this 
  * context.
@@ -450,23 +412,9 @@ ruby_xml_parser_context_replace_entities_set(VALUE self, VALUE bool) {
   }
 }
 
-
-/*
- * call-seq:
- *    context.reset
- * 
- * Resets the parser context.
- */
-VALUE
-ruby_xml_parser_context_reset(VALUE self) {
-  ruby_xml_parser_context *rxpc;
-  Data_Get_Struct(self, ruby_xml_parser_context, rxpc);
-  xmlCtxtReset(rxpc->ctxt);
-}
-
 /*
  * call-seq:
- *    context.space_depth => num
+ *    context.space_depth -> num
  * 
  * Obtain the space depth for this context.
  */
@@ -481,7 +429,7 @@ ruby_xml_parser_context_space_depth_get(VALUE self) {
 
 /*
  * call-seq:
- *    context.space_depth => num
+ *    context.space_depth -> num
  * 
  * Obtain the maximum space depth for this context.
  */
@@ -496,7 +444,7 @@ ruby_xml_parser_context_space_depth_max_get(VALUE self) {
 
 /*
  * call-seq:
- *    context.subset_external? => (true|false)
+ *    context.subset_external? -> (true|false)
  * 
  * Determine whether this context is a subset of an
  * external context.
@@ -515,7 +463,7 @@ ruby_xml_parser_context_subset_external_q(VALUE self) {
 
 /*
  * call-seq:
- *    context.subset_internal? => (true|false)
+ *    context.subset_internal? -> (true|false)
  * 
  * Determine whether this context is a subset of an
  * internal context.
@@ -534,7 +482,7 @@ ruby_xml_parser_context_subset_internal_q(VALUE self) {
 
 /*
  * call-seq:
- *    context.subset_name => "name"
+ *    context.subset_name -> "name"
  * 
  * Obtain this context's subset name (valid only if
  * either of subset_external? or subset_internal?
@@ -554,7 +502,7 @@ ruby_xml_parser_context_subset_name_get(VALUE self) {
 
 /*
  * call-seq:
- *    context.subset_external_uri => "uri"
+ *    context.subset_external_uri -> "uri"
  * 
  * Obtain this context's external subset URI. (valid only if
  * either of subset_external? or subset_internal?
@@ -574,7 +522,7 @@ ruby_xml_parser_context_subset_external_uri_get(VALUE self) {
 
 /*
  * call-seq:
- *    context.subset_external_system_id => "system_id"
+ *    context.subset_external_system_id -> "system_id"
  * 
  * Obtain this context's external subset system identifier. 
  * (valid only if either of subset_external? or subset_internal?
@@ -594,7 +542,7 @@ ruby_xml_parser_context_subset_external_system_id_get(VALUE self) {
 
 /*
  * call-seq:
- *    context.standalone? => (true|false)
+ *    context.standalone? -> (true|false)
  * 
  * Determine whether this is a standalone context.
  */
@@ -612,7 +560,7 @@ ruby_xml_parser_context_standalone_q(VALUE self) {
 
 /*
  * call-seq:
- *    context.stats? => (true|false)
+ *    context.stats? -> (true|false)
  * 
  * Determine whether this context maintains statistics.
  */
@@ -630,7 +578,7 @@ ruby_xml_parser_context_stats_q(VALUE self) {
 
 /*
  * call-seq:
- *    context.valid? => (true|false)
+ *    context.valid? -> (true|false)
  * 
  * Determine whether this context is valid.
  */
@@ -648,7 +596,7 @@ ruby_xml_parser_context_valid_q(VALUE self) {
 
 /*
  * call-seq:
- *    context.validate? => (true|false)
+ *    context.validate? -> (true|false)
  * 
  * Determine whether validation is enabled in this context.
  */
@@ -666,7 +614,7 @@ ruby_xml_parser_context_validate_q(VALUE self) {
 
 /*
  * call-seq:
- *    context.version => "version"
+ *    context.version -> "version"
  * 
  * Obtain this context's version identifier.
  */
@@ -684,7 +632,7 @@ ruby_xml_parser_context_version_get(VALUE self) {
 
 /*
  * call-seq:
- *    context.well_formed? => (true|false)
+ *    context.well_formed? -> (true|false)
  * 
  * Determine whether this context contains well-formed XML.
  */
@@ -713,7 +661,6 @@ ruby_init_xml_parser_context(void) {
   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);
   rb_define_method(cXMLParserContext, "disable_sax?", ruby_xml_parser_context_disable_sax_q, 0);
-  rb_define_method(cXMLParserContext, "doc", ruby_xml_parser_context_doc_get, 0);
   rb_define_method(cXMLParserContext, "docbook?", ruby_xml_parser_context_docbook_q, 0);
   rb_define_method(cXMLParserContext, "encoding", ruby_xml_parser_context_encoding_get, 0);
   rb_define_method(cXMLParserContext, "errno", ruby_xml_parser_context_errno_get, 0);
@@ -733,7 +680,6 @@ ruby_init_xml_parser_context(void) {
   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, "reset", ruby_xml_parser_context_reset, 0);
   rb_define_method(cXMLParserContext, "space_depth", ruby_xml_parser_context_space_depth_get, 0);
   rb_define_method(cXMLParserContext, "space_depth_max", ruby_xml_parser_context_space_depth_max_get, 0);
   rb_define_method(cXMLParserContext, "subset_external?", ruby_xml_parser_context_subset_external_q, 0);

data/ext/libxml/ruby_xml_parser_context.h

@@ -1,22 +1,20 @@
-/* $Id: ruby_xml_parser_context.h 39 2006-02-21 20:40:16Z roscopeco $ */
-
-/* Please see the LICENSE file for copyright and distribution information */
-
-#ifndef __RUBY_XML_PARSER_CONTEXT__
-#define __RUBY_XML_PARSER_CONTEXT__
-
-extern VALUE cXMLParserContext;
-
-typedef struct ruby_xml_parser_context {
-  xmlParserCtxtPtr ctxt;
-  int is_ptr;
-} ruby_xml_parser_context;
-
-void ruby_xml_parser_context_free(ruby_xml_parser_context *ctxt);
-void ruby_init_xml_parser_context(void);
-VALUE ruby_xml_parser_context_new(VALUE class, xmlParserCtxtPtr ctxt);
-VALUE ruby_xml_parser_context_new2(VALUE class);
-VALUE ruby_xml_parser_context_new3();
-VALUE ruby_xml_parser_context_each(VALUE self);
-
-#endif
+/* $Id: ruby_xml_parser_context.h 319 2008-07-08 07:40:27Z cfis $ */
+
+/* Please see the LICENSE file for copyright and distribution information */
+
+#ifndef __RUBY_XML_PARSER_CONTEXT__
+#define __RUBY_XML_PARSER_CONTEXT__
+
+extern VALUE cXMLParserContext;
+
+typedef struct ruby_xml_parser_context {
+  xmlParserCtxtPtr ctxt;
+  int is_ptr;
+} ruby_xml_parser_context;
+
+void ruby_xml_parser_context_free(ruby_xml_parser_context *ctxt);
+void ruby_init_xml_parser_context(void);
+VALUE ruby_xml_parser_context_new();
+VALUE ruby_xml_parser_context_each(VALUE self);
+
+#endif