oj 3.10.6 → 3.12.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e6c2164398794345431cbf21fe2598c7a68498dc21a49868103f9227470c5cdc
-  data.tar.gz: 81ddcee2018723c2ca4a9c668d78043d60647a83ab99057cdce3bd92ebad56fd
+  metadata.gz: 7316e25014cf4268799f3f1e4a01a74fada832b1d68bf64d82cbeb42b2caf1dd
+  data.tar.gz: a02fdb9676efeacfec86475ff35afdb88cfef33e0c94188355cad69401ee2304
 SHA512:
-  metadata.gz: 546bcdf0ee93a8b170970ac0a9e26497ee4b903f606f1fc2640e77093765ea9d63d58501c4472fb742d810ac1adddbb31caaaa19b2cf984af1b0345b529a4aa3
-  data.tar.gz: 51745a18bc008d4ba5bac4a459ec2231997998efdf56de1e56b3bdd2b5e972733ed12a43be7ff10f54827825ae7e9a5c3532629c044f4c71ebe0934a05e2d334
+  metadata.gz: 8f83d20545998db46a7dd0bd0e2560f47198fbb0f192bc80f17ffbce046e38727e0c143e022f8d00ba2332e2cb0be27ddda294b6a96d6f4b091ec95e282d2f01
+  data.tar.gz: e62a125cf992f510296bbe6b3eeeaaadaa8ccd2891b764a290518f785b706a797af7fbd247ac360364cd610e67ad038488d6eefb55e4dc028a3b20540995e4df

data/README.md

@@ -1,6 +1,10 @@
 # [![{}j](http://www.ohler.com/dev/images/oj_comet_64.svg)](http://www.ohler.com/oj) gem
 
-[![Build Status](https://img.shields.io/travis/ohler55/oj/master.svg?logo=travis)](http://travis-ci.org/ohler55/oj?branch=master) [![AppVeyor](https://img.shields.io/appveyor/ci/ohler55/oj/master.svg?logo=appveyor)](https://ci.appveyor.com/project/ohler55/oj) ![Gem](https://img.shields.io/gem/v/oj.svg) ![Gem](https://img.shields.io/gem/dt/oj.svg) [![SemVer compatibility](https://api.dependabot.com/badges/compatibility_score?dependency-name=oj&package-manager=bundler&version-scheme=semver)](https://dependabot.com/compatibility-score.html?dependency-name=oj&package-manager=bundler&version-scheme=semver) [![TideLift](https://tidelift.com/badges/github/ohler55/oj)](https://tidelift.com/subscription/pkg/rubygems-oj?utm_source=rubygems-oj&utm_medium=referral&utm_campaign=readme)
+[![Build Status](https://img.shields.io/github/workflow/status/ohler55/oj/CI?logo=github)](https://github.com/ohler55/oj/actions/workflows/CI.yml)
+![Gem](https://img.shields.io/gem/v/oj.svg)
+![Gem](https://img.shields.io/gem/dt/oj.svg)
+[![SemVer compatibility](https://api.dependabot.com/badges/compatibility_score?dependency-name=oj&package-manager=bundler&version-scheme=semver)](https://dependabot.com/compatibility-score.html?dependency-name=oj&package-manager=bundler&version-scheme=semver)
+[![TideLift](https://tidelift.com/badges/github/ohler55/oj)](https://tidelift.com/subscription/pkg/rubygems-oj?utm_source=rubygems-oj&utm_medium=referral&utm_campaign=readme)
 
 A *fast* JSON parser and Object marshaller as a Ruby gem.
 
@@ -102,3 +106,4 @@ Follow [@peterohler on Twitter](http://twitter.com/peterohler) for announcements
 + Provide a Pull Request off the `develop` branch.
 + Report a bug
 + Suggest an idea
++ Code is now formatted with the clang-format tool with the configuration file in the root of the repo.

data/ext/oj/buf.h

@@ -1,32 +1,5 @@
-/* buf.h
- * Copyright (c) 2011, Peter Ohler
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * 
- *  - Redistributions of source code must retain the above copyright notice, this
- *    list of conditions and the following disclaimer.
- * 
- *  - Redistributions in binary form must reproduce the above copyright notice,
- *    this list of conditions and the following disclaimer in the documentation
- *    and/or other materials provided with the distribution.
- * 
- *  - Neither the name of Peter Ohler nor the names of its contributors may be
- *    used to endorse or promote products derived from this software without
- *    specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+// Copyright (c) 2011 Peter Ohler. All rights reserved.
+// Licensed under the MIT License. See LICENSE file in the project root for license details.
 
 #ifndef OJ_BUF_H
 #define OJ_BUF_H
@@ -34,66 +7,61 @@
 #include "ruby.h"
 
 typedef struct _buf {
-    char	*head;
-    char	*end;
-    char	*tail;
-    char	base[1024];
-} *Buf;
+    char *head;
+    char *end;
+    char *tail;
+    char  base[1024];
+} * Buf;
 
-inline static void
-buf_init(Buf buf) {
+inline static void buf_init(Buf buf) {
     buf->head = buf->base;
-    buf->end = buf->base + sizeof(buf->base) - 1;
+    buf->end  = buf->base + sizeof(buf->base) - 1;
     buf->tail = buf->head;
 }
 
-inline static void
-buf_cleanup(Buf buf) {
+inline static void buf_cleanup(Buf buf) {
     if (buf->base != buf->head) {
         xfree(buf->head);
     }
 }
 
-inline static size_t
-buf_len(Buf buf) {
+inline static size_t buf_len(Buf buf) {
     return buf->tail - buf->head;
 }
 
-inline static void
-buf_append_string(Buf buf, const char *s, size_t slen) {
+inline static void buf_append_string(Buf buf, const char *s, size_t slen) {
     if (buf->end <= buf->tail + slen) {
-	size_t	len = buf->end - buf->head;
-	size_t	toff = buf->tail - buf->head;
-	size_t	new_len = len + slen + len / 2;
+        size_t len     = buf->end - buf->head;
+        size_t toff    = buf->tail - buf->head;
+        size_t new_len = len + slen + len / 2;
 
-	if (buf->base == buf->head) {
-	    buf->head = ALLOC_N(char, new_len);
-	    memcpy(buf->head, buf->base, len);
-	} else {
-	    REALLOC_N(buf->head, char, new_len);
-	}
-	buf->tail = buf->head + toff;
-	buf->end = buf->head + new_len - 1;
+        if (buf->base == buf->head) {
+            buf->head = ALLOC_N(char, new_len);
+            memcpy(buf->head, buf->base, len);
+        } else {
+            REALLOC_N(buf->head, char, new_len);
+        }
+        buf->tail = buf->head + toff;
+        buf->end  = buf->head + new_len - 1;
     }
     memcpy(buf->tail, s, slen);
     buf->tail += slen;
 }
-    
-inline static void
-buf_append(Buf buf, char c) {
+
+inline static void buf_append(Buf buf, char c) {
     if (buf->end <= buf->tail) {
-	size_t	len = buf->end - buf->head;
-	size_t	toff = buf->tail - buf->head;
-	size_t	new_len = len + len / 2;
+        size_t len     = buf->end - buf->head;
+        size_t toff    = buf->tail - buf->head;
+        size_t new_len = len + len / 2;
 
-	if (buf->base == buf->head) {
-	    buf->head = ALLOC_N(char, new_len);
-	    memcpy(buf->head, buf->base, len);
-	} else {
-	    REALLOC_N(buf->head, char, new_len);
-	}
-	buf->tail = buf->head + toff;
-	buf->end = buf->head + new_len - 1;
+        if (buf->base == buf->head) {
+            buf->head = ALLOC_N(char, new_len);
+            memcpy(buf->head, buf->base, len);
+        } else {
+            REALLOC_N(buf->head, char, new_len);
+        }
+        buf->tail = buf->head + toff;
+        buf->end  = buf->head + new_len - 1;
     }
     *buf->tail = c;
     buf->tail++;

data/ext/oj/cache8.c

@@ -1,107 +1,104 @@
+// Copyright (c) 2011 Peter Ohler. All rights reserved.
+// Licensed under the MIT License. See LICENSE file in the project root for license details.
+
+#include "cache8.h"
 
-#include <stdlib.h>
 #include <errno.h>
+#include <stdarg.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
-#include <stdarg.h>
 
 #include "ruby.h"
-#include "cache8.h"
 
-#define BITS		4
-#define MASK		0x000000000000000FULL
-#define SLOT_CNT	16
-#define DEPTH		16
+#define BITS 4
+#define MASK 0x000000000000000FULL
+#define SLOT_CNT 16
+#define DEPTH 16
 
 typedef union {
-    struct _cache8	*child;
-    slot_t		value;
+    struct _cache8 *child;
+    slot_t          value;
 } Bucket;
 
 struct _cache8 {
-    Bucket	buckets[SLOT_CNT];
+    Bucket buckets[SLOT_CNT];
 };
 
-static void	cache8_delete(Cache8 cache, int depth);
-static void	slot_print(Cache8 cache, sid_t key, unsigned int depth);
+static void cache8_delete(Cache8 cache, int depth);
+static void slot_print(Cache8 cache, sid_t key, unsigned int depth);
+
+void oj_cache8_new(Cache8 *cache) {
+    Bucket *b;
+    int     i;
 
-void
-oj_cache8_new(Cache8 *cache) {
-    Bucket	*b;
-    int		i;
-    
     *cache = ALLOC(struct _cache8);
     for (i = SLOT_CNT, b = (*cache)->buckets; 0 < i; i--, b++) {
-	b->value = 0;
+        b->value = 0;
     }
 }
 
-void
-oj_cache8_delete(Cache8 cache) {
-    cache8_delete(cache, 0);
-}
+void oj_cache8_delete(Cache8 cache) { cache8_delete(cache, 0); }
 
-static void
-cache8_delete(Cache8 cache, int depth) {
-    Bucket		*b;
-    unsigned int	i;
+static void cache8_delete(Cache8 cache, int depth) {
+    Bucket *     b;
+    unsigned int i;
 
     for (i = 0, b = cache->buckets; i < SLOT_CNT; i++, b++) {
-	if (0 != b->child) {
-	    if (DEPTH - 1 != depth) {
-		cache8_delete(b->child, depth + 1);
-	    }
-	}
+        if (0 != b->child) {
+            if (DEPTH - 1 != depth) {
+                cache8_delete(b->child, depth + 1);
+            }
+        }
     }
     xfree(cache);
 }
 
-slot_t
-oj_cache8_get(Cache8 cache, sid_t key, slot_t **slot) {
-    Bucket	*b;
-    int		i;
-    sid_t	k8 = (sid_t)key;
-    sid_t	k;
-    
+slot_t oj_cache8_get(Cache8 cache, sid_t key, slot_t **slot) {
+    Bucket *b;
+    int     i;
+    sid_t   k8 = (sid_t)key;
+    sid_t   k;
+
     for (i = 64 - BITS; 0 < i; i -= BITS) {
-	k = (k8 >> i) & MASK;
-	b = cache->buckets + k;
-	if (0 == b->child) {
-	    oj_cache8_new(&b->child);
-	}
-	cache = b->child;
+        k = (k8 >> i) & MASK;
+        b = cache->buckets + k;
+        if (0 == b->child) {
+            oj_cache8_new(&b->child);
+        }
+        cache = b->child;
     }
     *slot = &(cache->buckets + (k8 & MASK))->value;
 
     return **slot;
 }
 
-void
-oj_cache8_print(Cache8 cache) {
+void oj_cache8_print(Cache8 cache) {
     /*printf("-------------------------------------------\n"); */
     slot_print(cache, 0, 0);
 }
 
-static void
-slot_print(Cache8 c, sid_t key, unsigned int depth) {
-    Bucket		*b;
-    unsigned int	i;
-    sid_t		k8 = (sid_t)key;
-    sid_t		k;
+static void slot_print(Cache8 c, sid_t key, unsigned int depth) {
+    Bucket *     b;
+    unsigned int i;
+    sid_t        k8 = (sid_t)key;
+    sid_t        k;
 
     for (i = 0, b = c->buckets; i < SLOT_CNT; i++, b++) {
-	if (0 != b->child) {
-	    k = (k8 << BITS) | i;
-	    /*printf("*** key: 0x%016llx  depth: %u  i: %u\n", k, depth, i); */
-	    if (DEPTH - 1 == depth) {
+        if (0 != b->child) {
+            k = (k8 << BITS) | i;
+            /*printf("*** key: 0x%016llx  depth: %u  i: %u\n", k, depth, i); */
+            if (DEPTH - 1 == depth) {
 #if IS_WINDOWS
-		printf("0x%016lx: %4lu\n", (long unsigned int)k, (long unsigned int)b->value);
+                printf("0x%016lx: %4lu\n", (long unsigned int)k,
+                       (long unsigned int)b->value);
 #else
-		printf("0x%016llx: %4llu\n", (long long unsigned int)k, (long long unsigned int)b->value);
+                printf("0x%016llx: %4llu\n", (long long unsigned int)k,
+                       (long long unsigned int)b->value);
 #endif
-	    } else {
-		slot_print(b->child, k, depth + 1);
-	    }
-	}
+            } else {
+                slot_print(b->child, k, depth + 1);
+            }
+        }
     }
 }

data/ext/oj/cache8.h

@@ -1,32 +1,5 @@
-/* cache8.h
- * Copyright (c) 2011, Peter Ohler
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * 
- *  - Redistributions of source code must retain the above copyright notice, this
- *    list of conditions and the following disclaimer.
- * 
- *  - Redistributions in binary form must reproduce the above copyright notice,
- *    this list of conditions and the following disclaimer in the documentation
- *    and/or other materials provided with the distribution.
- * 
- *  - Neither the name of Peter Ohler nor the names of its contributors may be
- *    used to endorse or promote products derived from this software without
- *    specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+// Copyright (c) 2011 Peter Ohler. All rights reserved.
+// Licensed under the MIT License. See LICENSE file in the project root for license details.
 
 #ifndef OJ_CACHE8_H
 #define OJ_CACHE8_H
@@ -34,15 +7,15 @@
 #include "ruby.h"
 #include "stdint.h"
 
-typedef struct _cache8	*Cache8;
-typedef uint64_t	slot_t;
-typedef uint64_t	sid_t;
+typedef struct _cache8 *Cache8;
+typedef uint64_t        slot_t;
+typedef uint64_t        sid_t;
 
-extern void	oj_cache8_new(Cache8 *cache);
-extern void	oj_cache8_delete(Cache8 cache);
+extern void oj_cache8_new(Cache8 *cache);
+extern void oj_cache8_delete(Cache8 cache);
 
-extern slot_t	oj_cache8_get(Cache8 cache, sid_t key, slot_t **slot);
+extern slot_t oj_cache8_get(Cache8 cache, sid_t key, slot_t **slot);
 
-extern void	oj_cache8_print(Cache8 cache);
+extern void oj_cache8_print(Cache8 cache);
 
 #endif /* OJ_CACHE8_H */

data/ext/oj/circarray.c

@@ -1,68 +1,62 @@
-/* circarray.c
- * Copyright (c) 2012, Peter Ohler
- * All rights reserved.
- */
+// Copyright (c) 2012 Peter Ohler. All rights reserved.
+// Licensed under the MIT License. See LICENSE file in the project root for license details.
 
 #include "circarray.h"
 
-CircArray
-oj_circ_array_new() {
-    CircArray	ca;
-    
+CircArray oj_circ_array_new() {
+    CircArray ca;
+
     if (0 == (ca = ALLOC(struct _circArray))) {
-	rb_raise(rb_eNoMemError, "not enough memory\n");
+        rb_raise(rb_eNoMemError, "not enough memory\n");
     }
     ca->objs = ca->obj_array;
     ca->size = sizeof(ca->obj_array) / sizeof(VALUE);
-    ca->cnt = 0;
-    
+    ca->cnt  = 0;
+
     return ca;
 }
 
-void
-oj_circ_array_free(CircArray ca) {
+void oj_circ_array_free(CircArray ca) {
     if (ca->objs != ca->obj_array) {
-	xfree(ca->objs);
+        xfree(ca->objs);
     }
     xfree(ca);
 }
 
-void
-oj_circ_array_set(CircArray ca, VALUE obj, unsigned long id) {
+void oj_circ_array_set(CircArray ca, VALUE obj, unsigned long id) {
     if (0 < id && 0 != ca) {
-	unsigned long	i;
-
-	if (ca->size < id) {
-	    unsigned long	cnt = id + 512;
-
-	    if (ca->objs == ca->obj_array) {
-		if (0 == (ca->objs = ALLOC_N(VALUE, cnt))) {
-		    rb_raise(rb_eNoMemError, "not enough memory\n");
-		}
-		memcpy(ca->objs, ca->obj_array, sizeof(VALUE) * ca->cnt);
-	    } else { 
-		REALLOC_N(ca->objs, VALUE, cnt);
-	    }
-	    ca->size = cnt;
-	}
-	id--;
-	for (i = ca->cnt; i < id; i++) {
-	    ca->objs[i] = Qnil;
-	}
-	ca->objs[id] = obj;
-	if (ca->cnt <= id) {
-	    ca->cnt = id + 1;
-	}
+        unsigned long i;
+
+        if (ca->size < id) {
+            unsigned long cnt = id + 512;
+
+            if (ca->objs == ca->obj_array) {
+                if (0 == (ca->objs = ALLOC_N(VALUE, cnt))) {
+                    rb_raise(rb_eNoMemError, "not enough memory\n");
+                }
+                memcpy(ca->objs, ca->obj_array, sizeof(VALUE) * ca->cnt);
+            } else {
+                REALLOC_N(ca->objs, VALUE, cnt);
+            }
+            ca->size = cnt;
+        }
+        id--;
+        for (i = ca->cnt; i < id; i++) {
+            ca->objs[i] = Qnil;
+        }
+        ca->objs[id] = obj;
+        if (ca->cnt <= id) {
+            ca->cnt = id + 1;
+        }
     }
 }
 
 VALUE
 oj_circ_array_get(CircArray ca, unsigned long id) {
-    VALUE	obj = Qnil;
+    VALUE obj = Qnil;
 
     if (id <= ca->cnt && 0 != ca) {
-	obj = ca->objs[id - 1];
+        obj = ca->objs[id - 1];
     }
     return obj;
 }
-