oj 3.9.1 → 3.16.11

data/ext/oj/code.c

@@ -1,235 +1,214 @@
-/* code.c
- * Copyright (c) 2017, Peter Ohler
- * All rights reserved.
- */
+// Copyright (c) 2017 Peter Ohler. All rights reserved.
+// Licensed under the MIT License. See LICENSE file in the project root for license details.
 
 #include "code.h"
+
 #include "dump.h"
 
-inline static VALUE
-resolve_classname(VALUE mod, const char *classname) {
-    VALUE	clas = Qundef;
-    ID		ci = rb_intern(classname);
+inline static VALUE resolve_classname(VALUE mod, const char *classname) {
+    VALUE clas = Qundef;
+    ID    ci   = rb_intern(classname);
 
     if (rb_const_defined_at(mod, ci)) {
-	clas = rb_const_get_at(mod, ci);
+        clas = rb_const_get_at(mod, ci);
     }
     return clas;
 }
 
-static VALUE
-path2class(const char *name) {
-    char	class_name[1024];
-    VALUE	clas;
-    char	*end = class_name + sizeof(class_name) - 1;
-    char	*s;
-    const char	*n = name;
+static VALUE path2class(const char *name) {
+    char        class_name[1024];
+    VALUE       clas;
+    char       *end = class_name + sizeof(class_name) - 1;
+    char       *s;
+    const char *n = name;
 
     clas = rb_cObject;
     for (s = class_name; '\0' != *n; n++) {
-	if (':' == *n) {
-	    *s = '\0';
-	    n++;
-	    if (':' != *n) {
-		return Qundef;
-	    }
-	    if (Qundef == (clas = resolve_classname(clas, class_name))) {
-		return Qundef;
-	    }
-	    s = class_name;
-	} else if (end <= s) {
-	    return Qundef;
-	} else {
-	    *s++ = *n;
-	}
+        if (':' == *n) {
+            *s = '\0';
+            n++;
+            if (':' != *n) {
+                return Qundef;
+            }
+            if (Qundef == (clas = resolve_classname(clas, class_name))) {
+                return Qundef;
+            }
+            s = class_name;
+        } else if (end <= s) {
+            return Qundef;
+        } else {
+            *s++ = *n;
+        }
     }
     *s = '\0';
 
     return resolve_classname(clas, class_name);
 }
 
-bool
-oj_code_dump(Code codes, VALUE obj, int depth, Out out) {
-    VALUE	clas = rb_obj_class(obj);
-    Code	c = codes;
+bool oj_code_dump(Code codes, VALUE obj, int depth, Out out) {
+    VALUE clas = rb_obj_class(obj);
+    Code  c    = codes;
 
     for (; NULL != c->name; c++) {
-	if (Qundef == c->clas) { // indicates not defined
-	    continue;
-	}
-	if (Qnil == c->clas) {
-	    c->clas = path2class(c->name);
-	}
-	if (clas == c->clas && c->active) {
-	    c->encode(obj, depth, out);
-	    return true;
-	}
+        if (Qundef == c->clas) {  // indicates not defined
+            continue;
+        }
+        if (Qnil == c->clas) {
+            c->clas = path2class(c->name);
+        }
+        if (clas == c->clas && c->active) {
+            c->encode(obj, depth, out);
+            return true;
+        }
     }
     return false;
 }
 
 VALUE
 oj_code_load(Code codes, VALUE clas, VALUE args) {
-    Code	c = codes;
+    Code c = codes;
 
     for (; NULL != c->name; c++) {
-	if (Qundef == c->clas) { // indicates not defined
-	    continue;
-	}
-	if (Qnil == c->clas) {
-	    c->clas = path2class(c->name);
-	}
-	if (clas == c->clas) {
-	    if (NULL == c->decode) {
-		break;
-	    }
-	    return c->decode(clas, args);
-	}
+        if (Qundef == c->clas) {  // indicates not defined
+            continue;
+        }
+        if (Qnil == c->clas) {
+            c->clas = path2class(c->name);
+        }
+        if (clas == c->clas) {
+            if (NULL == c->decode) {
+                break;
+            }
+            return c->decode(clas, args);
+        }
     }
     return Qnil;
 }
 
-void
-oj_code_set_active(Code codes, VALUE clas, bool active) {
-    Code	c = codes;
+void oj_code_set_active(Code codes, VALUE clas, bool active) {
+    Code c = codes;
 
     for (; NULL != c->name; c++) {
-	if (Qundef == c->clas) { // indicates not defined
-	    continue;
-	}
-	if (Qnil == c->clas) {
-	    c->clas = path2class(c->name);
-	}
-	if (clas == c->clas || Qnil == clas) {
-	    c->active = active;
-	    if (Qnil != clas) {
-		break;
-	    }
-	}
+        if (Qundef == c->clas) {  // indicates not defined
+            continue;
+        }
+        if (Qnil == c->clas) {
+            c->clas = path2class(c->name);
+        }
+        if (clas == c->clas || Qnil == clas) {
+            c->active = active;
+            if (Qnil != clas) {
+                break;
+            }
+        }
     }
 }
 
-bool
-oj_code_has(Code codes, VALUE clas, bool encode) {
-    Code	c = codes;
+bool oj_code_has(Code codes, VALUE clas, bool encode) {
+    Code c = codes;
 
     for (; NULL != c->name; c++) {
-	if (Qundef == c->clas) { // indicates not defined
-	    continue;
-	}
-	if (Qnil == c->clas) {
-	    c->clas = path2class(c->name);
-	}
-	if (clas == c->clas) {
-	    if (encode) {
-		return c->active && NULL != c->encode;
-	    } else {
-		return c->active && NULL != c->decode;
-	    }
-	}
+        if (Qundef == c->clas) {  // indicates not defined
+            continue;
+        }
+        if (Qnil == c->clas) {
+            c->clas = path2class(c->name);
+        }
+        if (clas == c->clas) {
+            if (encode) {
+                return c->active && NULL != c->encode;
+            } else {
+                return c->active && NULL != c->decode;
+            }
+        }
     }
     return false;
 }
 
-void
-oj_code_attrs(VALUE obj, Attr attrs, int depth, Out out, bool with_class) {
-    int		d2 = depth + 1;
-    int		d3 = d2 + 1;
-    size_t	sep_len = out->opts->dump_opts.before_size + out->opts->dump_opts.after_size + 2;
-    const char	*classname = rb_obj_classname(obj);
-    size_t	len = strlen(classname);
-    size_t	size = d2 * out->indent + 10 + len + out->opts->create_id_len + sep_len;
-    bool	no_comma = true;
-    
+void oj_code_attrs(VALUE obj, Attr attrs, int depth, Out out, bool with_class) {
+    int         d2        = depth + 1;
+    int         d3        = d2 + 1;
+    size_t      sep_len   = out->opts->dump_opts.before_size + out->opts->dump_opts.after_size + 2;
+    const char *classname = rb_obj_classname(obj);
+    size_t      len       = strlen(classname);
+    size_t      size      = d2 * out->indent + 10 + len + out->opts->create_id_len + sep_len;
+    bool        no_comma  = true;
+
     assure_size(out, size);
     *out->cur++ = '{';
 
     if (with_class) {
-	fill_indent(out, d2);
-	*out->cur++ = '"';
-	memcpy(out->cur, out->opts->create_id, out->opts->create_id_len);
-	out->cur += out->opts->create_id_len;
-	*out->cur++ = '"';
-	if (0 < out->opts->dump_opts.before_size) {
-	    strcpy(out->cur, out->opts->dump_opts.before_sep);
-	    out->cur += out->opts->dump_opts.before_size;
-	}
-	*out->cur++ = ':';
-	if (0 < out->opts->dump_opts.after_size) {
-	    strcpy(out->cur, out->opts->dump_opts.after_sep);
-	    out->cur += out->opts->dump_opts.after_size;
-	}
-	*out->cur++ = '"';
-	memcpy(out->cur, classname, len);
-	out->cur += len;
-	*out->cur++ = '"';
-	no_comma = false;
+        fill_indent(out, d2);
+        *out->cur++ = '"';
+        APPEND_CHARS(out->cur, out->opts->create_id, out->opts->create_id_len);
+        *out->cur++ = '"';
+        if (0 < out->opts->dump_opts.before_size) {
+            APPEND_CHARS(out->cur, out->opts->dump_opts.before_sep, out->opts->dump_opts.before_size);
+        }
+        *out->cur++ = ':';
+        if (0 < out->opts->dump_opts.after_size) {
+            APPEND_CHARS(out->cur, out->opts->dump_opts.after_sep, out->opts->dump_opts.after_size);
+        }
+        *out->cur++ = '"';
+        APPEND_CHARS(out->cur, classname, len);
+        *out->cur++ = '"';
+        no_comma    = false;
     }
     size = d3 * out->indent + 2;
     for (; NULL != attrs->name; attrs++) {
-	assure_size(out, size + attrs->len + sep_len + 2);
-	if (no_comma) {
-	    no_comma = false;
-	} else {
-	    *out->cur++ = ',';
-	}
-	fill_indent(out, d2);
-	*out->cur++ = '"';
-	memcpy(out->cur, attrs->name, attrs->len);
-	out->cur += attrs->len;
-	*out->cur++ = '"';
-	if (0 < out->opts->dump_opts.before_size) {
-	    strcpy(out->cur, out->opts->dump_opts.before_sep);
-	    out->cur += out->opts->dump_opts.before_size;
-	}
-	*out->cur++ = ':';
-	if (0 < out->opts->dump_opts.after_size) {
-	    strcpy(out->cur, out->opts->dump_opts.after_sep);
-	    out->cur += out->opts->dump_opts.after_size;
-	}
-	if (Qundef == attrs->value) {
-	    if (Qundef != attrs->time) {
-		switch (out->opts->time_format) {
-		case RubyTime:	oj_dump_ruby_time(attrs->time, out);	break;
-		case XmlTime:	oj_dump_xml_time(attrs->time, out);	break;
-		case UnixZTime:	oj_dump_time(attrs->time, out, true);	break;
-		case UnixTime:
-		default:	oj_dump_time(attrs->time, out, false);	break;
-		}
-	    } else {
-		char	buf[32];
-		char	*b = buf + sizeof(buf) - 1;
-		int	neg = 0;
-		long	num = attrs->num;
-	    
-		if (0 > num) {
-		    neg = 1;
-		    num = -num;
-		}
-		*b-- = '\0';
-		if (0 < num) {
-		    for (; 0 < num; num /= 10, b--) {
-			*b = (num % 10) + '0';
-		    }
-		    if (neg) {
-			*b = '-';
-		    } else {
-			b++;
-		    }
-		} else {
-		    *b = '0';
-		}
-		assure_size(out, (sizeof(buf) - (b - buf)));
-		for (; '\0' != *b; b++) {
-		    *out->cur++ = *b;
-		}
-	    }
-	} else {
-	    oj_dump_compat_val(attrs->value, d3, out, true);
-	}
+        assure_size(out, size + attrs->len + sep_len + 2);
+        if (no_comma) {
+            no_comma = false;
+        } else {
+            *out->cur++ = ',';
+        }
+        fill_indent(out, d2);
+        *out->cur++ = '"';
+        APPEND_CHARS(out->cur, attrs->name, attrs->len);
+        *out->cur++ = '"';
+        if (0 < out->opts->dump_opts.before_size) {
+            APPEND_CHARS(out->cur, out->opts->dump_opts.before_sep, out->opts->dump_opts.before_size);
+        }
+        *out->cur++ = ':';
+        if (0 < out->opts->dump_opts.after_size) {
+            APPEND_CHARS(out->cur, out->opts->dump_opts.after_sep, out->opts->dump_opts.after_size);
+        }
+        if (Qundef == attrs->value) {
+            if (Qundef != attrs->time) {
+                switch (out->opts->time_format) {
+                case RubyTime: oj_dump_ruby_time(attrs->time, out); break;
+                case XmlTime: oj_dump_xml_time(attrs->time, out); break;
+                case UnixZTime: oj_dump_time(attrs->time, out, true); break;
+                case UnixTime:
+                default: oj_dump_time(attrs->time, out, false); break;
+                }
+            } else {
+                char   buf[32];
+                char  *b   = buf + sizeof(buf) - 1;
+                bool   neg = false;
+                long   num = attrs->num;
+                size_t cnt = 0;
+
+                if (0 > num) {
+                    neg = true;
+                    num = -num;
+                }
+                *b-- = '\0';
+                if (0 < num) {
+                    b = oj_longlong_to_string(num, neg, b);
+                } else {
+                    *b = '0';
+                }
+                cnt = sizeof(buf) - (b - buf) - 1;
+                assure_size(out, cnt);
+                APPEND_CHARS(out->cur, b, cnt);
+            }
+        } else {
+            oj_dump_compat_val(attrs->value, d3, out, true);
+        }
     }
     assure_size(out, depth * out->indent + 2);
     fill_indent(out, depth);
     *out->cur++ = '}';
-    *out->cur = '\0';
+    *out->cur   = '\0';
 }

data/ext/oj/code.h

@@ -1,7 +1,5 @@
-/* code.h
- * Copyright (c) 2017, Peter Ohler
- * All rights reserved.
- */
+// Copyright (c) 2017 Peter Ohler. All rights reserved.
+// Licensed under the MIT License. See LICENSE file in the project root for license details.
 
 #ifndef OJ_CODE_H
 #define OJ_CODE_H
@@ -10,33 +8,33 @@
 
 #include "oj.h"
 
-typedef void	(*EncodeFunc)(VALUE obj, int depth, Out out);
-typedef VALUE	(*DecodeFunc)(VALUE clas, VALUE args);
+typedef void (*EncodeFunc)(VALUE obj, int depth, Out out);
+typedef VALUE (*DecodeFunc)(VALUE clas, VALUE args);
 
 typedef struct _code {
-    const char	*name;
-    VALUE	clas;
-    EncodeFunc	encode;
-    DecodeFunc	decode;
-    bool	active; // For compat mode.
+    const char *name;
+    VALUE       clas;
+    EncodeFunc  encode;
+    DecodeFunc  decode;
+    bool        active;  // For compat mode.
 } *Code;
 
 // Used by encode functions.
 typedef struct _attr {
-    const char	*name;
-    int		len;
-    VALUE	value;
-    long	num;
-    VALUE	time;
+    const char *name;
+    int         len;
+    VALUE       value;
+    long        num;
+    VALUE       time;
 } *Attr;
 
-extern bool	oj_code_dump(Code codes, VALUE obj, int depth, Out out);
-extern VALUE	oj_code_load(Code codes, VALUE clas, VALUE args);
-extern void	oj_code_set_active(Code codes, VALUE clas, bool active);
-extern bool	oj_code_has(Code codes, VALUE clas, bool encode);
+extern bool  oj_code_dump(Code codes, VALUE obj, int depth, Out out);
+extern VALUE oj_code_load(Code codes, VALUE clas, VALUE args);
+extern void  oj_code_set_active(Code codes, VALUE clas, bool active);
+extern bool  oj_code_has(Code codes, VALUE clas, bool encode);
 
-extern void	oj_code_attrs(VALUE obj, Attr attrs, int depth, Out out, bool with_class);
+extern void oj_code_attrs(VALUE obj, Attr attrs, int depth, Out out, bool with_class);
 
-extern struct _code	oj_compat_codes[];
+extern struct _code oj_compat_codes[];
 
 #endif /* OJ_CODE_H */