ox 2.10.0 → 2.10.1

data/ext/ox/encode.h

@@ -0,0 +1,26 @@
+/* encode.h
+ * Copyright (c) 2011, Peter Ohler
+ * All rights reserved.
+ */
+
+#ifndef __OX_ENCODE_H__
+#define __OX_ENCODE_H__
+
+#include "ruby.h"
+#if HAS_ENCODING_SUPPORT
+#include "ruby/encoding.h"
+#endif
+
+static inline VALUE
+ox_encode(VALUE rstr) {
+#if HAS_ENCODING_SUPPORT
+    rb_enc_associate(rstr, ox_utf8_encoding);
+#else
+    if (Qnil != ox_utf8_encoding) {
+	rstr = rb_funcall(ox_utf8_encoding, ox_iconv_id, 1, rstr);
+    }
+#endif
+    return rstr;
+}
+
+#endif /* __OX_ENCODE_H__ */

data/ext/ox/err.h

@@ -3,14 +3,14 @@
  * All rights reserved.
  */
 
-#ifndef __OX_ERR_H__
-#define __OX_ERR_H__
+#ifndef OX_ERR_H
+#define OX_ERR_H
 
 #include "ruby.h"
 
 #define set_error(err, msg, xml, current) _ox_err_set_with_location(err, msg, xml, current, __FILE__, __LINE__)
 
-typedef struct _Err {
+typedef struct _err {
     VALUE	clas;
     char	msg[128];
 } *Err;
@@ -33,4 +33,4 @@ err_has(Err e) {
     return (Qnil != e->clas);
 }
 
-#endif /* __OX_ERR_H__ */
+#endif /* OX_ERR_H */

data/ext/ox/gen_load.c

@@ -26,7 +26,7 @@ static void	add_instruct(PInfo pi, const char *name, Attr attrs, const char *con
 
 extern ParseCallbacks   ox_obj_callbacks;
 
-struct _ParseCallbacks   _ox_gen_callbacks = {
+struct _parseCallbacks   _ox_gen_callbacks = {
     instruct, /* instruct, */
     add_doctype,
     add_comment,
@@ -39,7 +39,7 @@ struct _ParseCallbacks   _ox_gen_callbacks = {
 
 ParseCallbacks   ox_gen_callbacks = &_ox_gen_callbacks;
 
-struct _ParseCallbacks   _ox_limited_callbacks = {
+struct _parseCallbacks   _ox_limited_callbacks = {
     0,
     0,
     0,
@@ -52,7 +52,7 @@ struct _ParseCallbacks   _ox_limited_callbacks = {
 
 ParseCallbacks   ox_limited_callbacks = &_ox_limited_callbacks;
 
-struct _ParseCallbacks   _ox_nomode_callbacks = {
+struct _parseCallbacks   _ox_nomode_callbacks = {
     nomode_instruct,
     add_doctype,
     add_comment,
@@ -310,7 +310,7 @@ add_element(PInfo pi, const char *ename, Attr attrs, int hasChildren) {
     rb_ivar_set(e, ox_at_value_id, s);
     if (0 != attrs->name) {
         volatile VALUE	ah = rb_hash_new();
-        
+
         for (; 0 != attrs->name; attrs++) {
             volatile VALUE	sym;
 
@@ -424,7 +424,7 @@ add_instruct(PInfo pi, const char *name, Attr attrs, const char *content) {
 	rb_ivar_set(inst, ox_at_content_id, c);
     } else if (0 != attrs->name) {
         volatile VALUE   ah = rb_hash_new();
-        
+
         for (; 0 != attrs->name; attrs++) {
             volatile VALUE	sym;
 	    VALUE		*slot;

data/ext/ox/hash_load.c

@@ -69,7 +69,7 @@ add_element(PInfo pi, const char *ename, Attr attrs, int hasChildren) {
         volatile VALUE	key;
 	volatile VALUE	val;
 	volatile VALUE	a;
-	
+
         for (; 0 != attrs->name; attrs++) {
 	    if (Qnil != pi->options->attr_key_mod) {
 		key = rb_funcall(pi->options->attr_key_mod, ox_call_id, 1, rb_str_new2(attrs->name));
@@ -201,7 +201,7 @@ finish(PInfo pi) {
     }
 }
 
-struct _ParseCallbacks   _ox_hash_callbacks = {
+struct _parseCallbacks   _ox_hash_callbacks = {
     NULL,
     NULL,
     NULL,
@@ -214,7 +214,7 @@ struct _ParseCallbacks   _ox_hash_callbacks = {
 
 ParseCallbacks   ox_hash_callbacks = &_ox_hash_callbacks;
 
-struct _ParseCallbacks   _ox_hash_no_attrs_callbacks = {
+struct _parseCallbacks   _ox_hash_no_attrs_callbacks = {
     NULL,
     NULL,
     NULL,

data/ext/ox/helper.h

@@ -3,21 +3,21 @@
  * All rights reserved.
  */
 
-#ifndef __OX_HELPER_H__
-#define __OX_HELPER_H__
+#ifndef OX_HELPER_H
+#define OX_HELPER_H
 
 #include "type.h"
 
 #define HELPER_STACK_INC	16
 
-typedef struct _Helper {
+typedef struct _helper {
     ID		var;	/* Object var ID */
     VALUE	obj;	/* object created or Qundef if not appropriate */
     Type	type;	/* type of object in obj */
 } *Helper;
 
-typedef struct _HelperStack {
-    struct _Helper	base[HELPER_STACK_INC];
+typedef struct _helperStack {
+    struct _helper	base[HELPER_STACK_INC];
     Helper		head;	/* current stack */
     Helper		end;	/* stack end */
     Helper		tail;	/* pointer to one past last element name on stack */
@@ -26,7 +26,7 @@ typedef struct _HelperStack {
 inline static void
 helper_stack_init(HelperStack stack) {
     stack->head = stack->base;
-    stack->end = stack->base + sizeof(stack->base) / sizeof(struct _Helper);
+    stack->end = stack->base + sizeof(stack->base) / sizeof(struct _helper);
     stack->tail = stack->head;
 }
 
@@ -55,10 +55,10 @@ helper_stack_push(HelperStack stack, ID var, VALUE obj, Type type) {
 	size_t	toff = stack->tail - stack->head;
 
 	if (stack->base == stack->head) {
-	    stack->head = ALLOC_N(struct _Helper, len + HELPER_STACK_INC);
-	    memcpy(stack->head, stack->base, sizeof(struct _Helper) * len);
+	    stack->head = ALLOC_N(struct _helper, len + HELPER_STACK_INC);
+	    memcpy(stack->head, stack->base, sizeof(struct _helper) * len);
 	} else {
-	    REALLOC_N(stack->head, struct _Helper, len + HELPER_STACK_INC);
+	    REALLOC_N(stack->head, struct _helper, len + HELPER_STACK_INC);
 	}
 	stack->tail = stack->head + toff;
 	stack->end = stack->head + len + HELPER_STACK_INC;
@@ -88,4 +88,4 @@ helper_stack_pop(HelperStack stack) {
     return 0;
 }
 
-#endif /* __OX_HELPER_H__ */
+#endif /* OX_HELPER_H */

data/ext/ox/obj_load.c

@@ -38,7 +38,7 @@ static void		debug_stack(PInfo pi, const char *comment);
 static void		fill_indent(PInfo pi, char *buf, size_t size);
 
 
-struct _ParseCallbacks	 _ox_obj_callbacks = {
+struct _parseCallbacks	 _ox_obj_callbacks = {
     instruct, /* instruct, */
     0, /* add_doctype, */
     0, /* add_comment, */
@@ -57,7 +57,7 @@ extern ParseCallbacks	ox_gen_callbacks;
 inline static VALUE
 str2sym(const char *str, void *encoding) {
     VALUE	sym;
-    
+
 #ifdef HAVE_RUBY_ENCODING_H
     if (0 != encoding) {
 	VALUE	rstr = rb_str_new2(str);
@@ -85,7 +85,7 @@ name2var(const char *name, void *encoding) {
 	if (0 != encoding) {
 	    volatile VALUE	rstr = rb_str_new2(name);
 	    volatile VALUE	sym;
-	    
+
 	    rb_enc_associate(rstr, (rb_encoding*)encoding);
 	    sym = rb_funcall(rstr, ox_to_sym_id, 0);
 	    // Needed for Ruby 2.2 to get around the GC of symbols
@@ -135,7 +135,7 @@ resolve_classname(VALUE mod, const char *class_name, Effort effort, VALUE base_c
 inline static VALUE
 classname2obj(const char *name, PInfo pi, VALUE base_class) {
     VALUE   clas = classname2class(name, pi, base_class);
-    
+
     if (Qundef == clas) {
 	return Qnil;
     } else {
@@ -204,7 +204,7 @@ static VALUE
 classname2class(const char *name, PInfo pi, VALUE base_class) {
     VALUE	*slot;
     VALUE	clas;
-	    
+
     if (Qundef == (clas = ox_cache_get(ox_class_cache, name, &slot, 0))) {
 	char		class_name[1024];
 	char		*s;
@@ -284,7 +284,7 @@ get_id_from_attrs(PInfo pi, Attr a) {
 	    unsigned long	id = 0;
 	    const char		*text = a->value;
 	    char		c;
-	    
+
 	    for (; '\0' != *text; text++) {
 		c = *text;
 		if ('0' <= c && c <= '9') {
@@ -303,12 +303,12 @@ get_id_from_attrs(PInfo pi, Attr a) {
 static CircArray
 circ_array_new() {
     CircArray	ca;
-    
-    ca = ALLOC(struct _CircArray);
+
+    ca = ALLOC(struct _circArray);
     ca->objs = ca->obj_array;
     ca->size = sizeof(ca->obj_array) / sizeof(VALUE);
     ca->cnt = 0;
-    
+
     return ca;
 }
 
@@ -361,7 +361,7 @@ static VALUE
 parse_regexp(const char *text) {
     const char	*te;
     int		options = 0;
-	    
+
     te = text + strlen(text) - 1;
 #if HAS_ONIG
     for (; text < te && '/' != *te; te--) {
@@ -491,7 +491,7 @@ add_text(PInfo pi, char *text, int closed) {
 	unsigned long	str_size = b64_orig_size(text);
 	VALUE		v;
 	char		*str = ALLOCA_N(char, str_size + 1);
-	
+
 	from_base64(text, (uchar*)str);
 	v = rb_str_new(str, str_size);
 #if HAS_ENCODING_SUPPORT
@@ -515,7 +515,7 @@ add_text(PInfo pi, char *text, int closed) {
 	VALUE		*slot;
 	unsigned long	str_size = b64_orig_size(text);
 	char		*str = ALLOCA_N(char, str_size + 1);
-	
+
 	from_base64(text, (uchar*)str);
 	if (Qundef == (sym = ox_cache_get(ox_symbol_cache, str, &slot, 0))) {
 	    sym = str2sym(str, (void*)pi->options->rb_enc);
@@ -533,7 +533,7 @@ add_text(PInfo pi, char *text, int closed) {
 	} else {
 	    unsigned long	str_size = b64_orig_size(text);
 	    char		*str = ALLOCA_N(char, str_size + 1);
-	
+
 	    from_base64(text, (uchar*)str);
 	    h->obj = parse_regexp(str);
 	}
@@ -709,7 +709,7 @@ static void
 end_element(PInfo pi, const char *ename) {
     if (TRACE <= pi->options->trace) {
 	char	indent[128];
-	
+
 	if (DEBUG <= pi->options->trace) {
 	    char    buf[1024];
 
@@ -853,7 +853,7 @@ parse_double_time(const char *text, VALUE clas) {
     long	v2 = 0;
     const char	*dot = 0;
     char	c;
-    
+
     for (; '.' != *text; text++) {
 	c = *text;
 	if (c < '0' || '9' < c) {
@@ -879,7 +879,7 @@ parse_double_time(const char *text, VALUE clas) {
 #endif
 }
 
-typedef struct _Tp {
+typedef struct _tp {
     int		cnt;
     char	end;
     char	alt;
@@ -892,7 +892,7 @@ parse_xsd_time(const char *text, VALUE clas) {
     long	v;
     int		i;
     char	c;
-    struct _Tp	tpa[10] = { { 4, '-', '-' },
+    struct _tp	tpa[10] = { { 4, '-', '-' },
 			   { 2, '-', '-' },
 			   { 2, 'T', 'T' },
 			   { 2, ':', ':' },
@@ -971,7 +971,7 @@ debug_stack(PInfo pi, const char *comment) {
 	    if (0 != h->var) {
 		if (HashCode == h->type) {
 		    VALUE	v;
-		    
+
 		    v = rb_funcall2(h->var, rb_intern("to_s"), 0, 0);
 		    key = StringValuePtr(v);
 		} else if (ObjectCode == (h - 1)->type || ExceptionCode == (h - 1)->type || RangeCode == (h - 1)->type || StructCode == (h - 1)->type) {

data/ext/ox/ox.c

@@ -18,7 +18,7 @@
 #define SMALL_XML		4096
 #define WITH_CACHE_TESTS	0
 
-typedef struct _YesNoOpt {
+typedef struct _yesNoOpt {
     VALUE	sym;
     char	*attr;
 } *YesNoOpt;
@@ -160,7 +160,7 @@ VALUE		ox_utf8_encoding = Qnil;
 void		*ox_utf8_encoding = 0;
 #endif
 
-struct _Options	 ox_default_options = {
+struct _options	 ox_default_options = {
     { '\0' },		// encoding
     { '\0' },		// margin
     2,			// indent
@@ -255,7 +255,7 @@ hints_to_overlay(Hints hints) {
     Hint		h;
     int			i;
     VALUE		ov;
-    
+
     for (i = hints->size, h = hints->hints; 0 < i; i--, h++) {
 	switch (h->overlay) {
 	case InactiveOverlay:	ov = inactive_sym;	break;
@@ -267,7 +267,7 @@ hints_to_overlay(Hints hints) {
 	default:		ov = active_sym;	break;
 	}
 	rb_hash_aset(overlay, rb_str_new2(h->name), ov);
-    }    
+    }
     return overlay;
 }
 
@@ -300,7 +300,7 @@ hints_to_overlay(Hints hints) {
  *   - _:block_ - block this and all children callbacks
  *   - _:off_ - block this element and it's children unless the child element is active
  *   - _:abort_ - abort the html processing and return
- * 
+ *
  * *return* [Hash] all current option settings.
  *
  * Note that an indent of less than zero will result in a tight one line output
@@ -373,7 +373,7 @@ static int
 set_overlay(VALUE key, VALUE value, VALUE ctx) {
     Hints	hints = (Hints)ctx;
     Hint	hint;
-    
+
     if (NULL != (hint = ox_hint_find(hints, StringValuePtr(key)))) {
 	if (active_sym == value) {
 	    hint->overlay = ActiveOverlay;
@@ -444,7 +444,7 @@ sax_html_overlay(VALUE self) {
  */
 static VALUE
 set_def_opts(VALUE self, VALUE opts) {
-    struct _YesNoOpt	ynos[] = {
+    struct _yesNoOpt	ynos[] = {
 	{ with_xml_sym, &ox_default_options.with_xml },
 	{ with_dtd_sym, &ox_default_options.with_dtd },
 	{ with_instruct_sym, &ox_default_options.with_instruct },
@@ -456,7 +456,7 @@ set_def_opts(VALUE self, VALUE opts) {
     };
     YesNoOpt	o;
     VALUE	v;
-    
+
     Check_Type(opts, T_HASH);
 
     v = rb_hash_aref(opts, ox_encoding_sym);
@@ -625,7 +625,7 @@ set_def_opts(VALUE self, VALUE opts) {
     }
     ox_default_options.element_key_mod = rb_hash_lookup2(opts, element_key_mod_sym, ox_default_options.element_key_mod);
     ox_default_options.attr_key_mod = rb_hash_lookup2(opts, attr_key_mod_sym, ox_default_options.attr_key_mod);
-    
+
     return Qnil;
 }
 
@@ -644,8 +644,8 @@ to_obj(VALUE self, VALUE ruby_xml) {
     char		*xml, *x;
     size_t		len;
     VALUE		obj;
-    struct _Options	options = ox_default_options;
-    struct _Err		err;
+    struct _options	options = ox_default_options;
+    struct _err		err;
 
     err_init(&err);
     Check_Type(ruby_xml, T_STRING);
@@ -688,8 +688,8 @@ to_gen(VALUE self, VALUE ruby_xml) {
     char		*xml, *x;
     size_t		len;
     VALUE		obj;
-    struct _Options	options = ox_default_options;
-    struct _Err		err;
+    struct _options	options = ox_default_options;
+    struct _err		err;
 
     err_init(&err);
     Check_Type(ruby_xml, T_STRING);
@@ -715,12 +715,12 @@ to_gen(VALUE self, VALUE ruby_xml) {
 static VALUE
 load(char *xml, size_t len, int argc, VALUE *argv, VALUE self, VALUE encoding, Err err) {
     VALUE		obj;
-    struct _Options	options = ox_default_options;
+    struct _options	options = ox_default_options;
 
     if (1 == argc && rb_cHash == rb_obj_class(*argv)) {
 	VALUE	h = *argv;
 	VALUE	v;
-	
+
 	if (Qnil != (v = rb_hash_lookup(h, mode_sym))) {
 	    if (object_sym == v) {
 		options.mode = ObjMode;
@@ -916,7 +916,7 @@ load_str(int argc, VALUE *argv, VALUE self) {
     size_t	len;
     VALUE	obj;
     VALUE	encoding;
-    struct _Err	err;
+    struct _err	err;
 
     err_init(&err);
     Check_Type(*argv, T_STRING);
@@ -979,7 +979,7 @@ load_file(int argc, VALUE *argv, VALUE self) {
     FILE	*f;
     size_t	len;
     VALUE	obj;
-    struct _Err	err;
+    struct _err	err;
 
     err_init(&err);
     Check_Type(*argv, T_STRING);
@@ -1027,7 +1027,7 @@ load_file(int argc, VALUE *argv, VALUE self) {
  */
 static VALUE
 sax_parse(int argc, VALUE *argv, VALUE self) {
-    struct _SaxOptions	options;
+    struct _saxOptions	options;
 
     options.symbolize = (No != ox_default_options.sym_keys);
     options.convert_special = ox_default_options.convert_special;
@@ -1035,14 +1035,14 @@ sax_parse(int argc, VALUE *argv, VALUE self) {
     options.skip = ox_default_options.skip;
     options.hints = NULL;
     strcpy(options.strip_ns, ox_default_options.strip_ns);
-    
+
     if (argc < 2) {
 	rb_raise(ox_parse_error_class, "Wrong number of arguments to sax_parse.\n");
     }
     if (3 <= argc && rb_cHash == rb_obj_class(argv[2])) {
 	VALUE	h = argv[2];
 	VALUE	v;
-	
+
 	if (Qnil != (v = rb_hash_lookup(h, convert_special_sym))) {
 	    options.convert_special = (Qtrue == v);
 	}
@@ -1108,9 +1108,9 @@ sax_parse(int argc, VALUE *argv, VALUE self) {
  */
 static VALUE
 sax_html(int argc, VALUE *argv, VALUE self) {
-    struct _SaxOptions	options;
+    struct _saxOptions	options;
     bool		free_hints = false;
-    
+
     options.symbolize = (No != ox_default_options.sym_keys);
     options.convert_special = ox_default_options.convert_special;
     options.smart = true;
@@ -1120,14 +1120,14 @@ sax_html(int argc, VALUE *argv, VALUE self) {
 	options.hints = ox_hints_html();
     }
     *options.strip_ns = '\0';
-    
+
     if (argc < 2) {
 	rb_raise(ox_parse_error_class, "Wrong number of arguments to sax_html.\n");
     }
     if (3 <= argc && rb_cHash == rb_obj_class(argv[2])) {
 	volatile VALUE	h = argv[2];
 	volatile VALUE	v;
-	
+
 	if (Qnil != (v = rb_hash_lookup(h, convert_special_sym))) {
 	    options.convert_special = (Qtrue == v);
 	}
@@ -1147,7 +1147,7 @@ sax_html(int argc, VALUE *argv, VALUE self) {
 	}
 	if (Qnil != (v = rb_hash_lookup(h, overlay_sym))) {
 	    int	cnt;
-	    
+
 	    Check_Type(v, T_HASH);
 	    cnt = (int)RHASH_SIZE(v);
 	    if (0 == cnt) {
@@ -1168,7 +1168,7 @@ sax_html(int argc, VALUE *argv, VALUE self) {
 
 static void
 parse_dump_options(VALUE ropts, Options copts) {
-    struct _YesNoOpt	ynos[] = {
+    struct _yesNoOpt	ynos[] = {
 	{ with_xml_sym, &copts->with_xml },
 	{ with_dtd_sym, &copts->with_dtd },
 	{ with_instruct_sym, &copts->with_instruct },
@@ -1177,10 +1177,10 @@ parse_dump_options(VALUE ropts, Options copts) {
 	{ Qnil, 0 }
     };
     YesNoOpt	o;
-    
+
     if (rb_cHash == rb_obj_class(ropts)) {
 	VALUE	v;
-	
+
 	if (Qnil != (v = rb_hash_lookup(ropts, ox_indent_sym))) {
 #ifdef RUBY_INTEGER_UNIFICATION
 	    if (rb_cInteger != rb_obj_class(v) && T_FIXNUM != rb_type(v)) {
@@ -1251,7 +1251,7 @@ parse_dump_options(VALUE ropts, Options copts) {
 	    copts->margin[sizeof(copts->margin) - 1] = '\0';
 	    copts->margin_len = (char)slen;
 	}
-	
+
 	for (o = ynos; 0 != o->attr; o++) {
 	    if (Qnil != (v = rb_hash_lookup(ropts, o->sym))) {
 		VALUE	    c = rb_obj_class(v);
@@ -1286,9 +1286,9 @@ parse_dump_options(VALUE ropts, Options copts) {
 static VALUE
 dump(int argc, VALUE *argv, VALUE self) {
     char		*xml;
-    struct _Options	copts = ox_default_options;
+    struct _options	copts = ox_default_options;
     VALUE		rstr;
-    
+
     if (2 == argc) {
 	parse_dump_options(argv[1], &copts);
     }
@@ -1328,8 +1328,8 @@ dump(int argc, VALUE *argv, VALUE self) {
  */
 static VALUE
 to_file(int argc, VALUE *argv, VALUE self) {
-    struct _Options	copts = ox_default_options;
-    
+    struct _options	copts = ox_default_options;
+
     if (3 == argc) {
 	parse_dump_options(argv[2], &copts);
     }
@@ -1376,9 +1376,9 @@ void Init_ox() {
     rb_define_module_function(Ox, "to_file", to_file, -1);
 
     rb_define_module_function(Ox, "sax_html_overlay", sax_html_overlay, 0);
-    
+
     ox_init_builder(Ox);
-    
+
     rb_require("time");
     rb_require("date");
     rb_require("bigdecimal");
@@ -1529,7 +1529,7 @@ void Init_ox() {
     rb_define _module_function(Ox, "cache_test", cache_test, 0);
     rb_define _module_function(Ox, "cache8_test", cache8_test, 0);
 #endif
-    
+
 #if HAS_ENCODING_SUPPORT
     ox_utf8_encoding = rb_enc_find("UTF-8");
 #elif HAS_PRIVATE_ENCODING