json 2.7.2 → 2.7.3.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1ae811d90e98bbf8438c5abff24a9eabd5ef9c929115c14d3616a0c23f3a3fa2
-  data.tar.gz: eaa6afeb5ed814f5272bf54172b98ab217b26f850cb91d6fb081a9551237030c
+  metadata.gz: 5be5bacbb4459129b1e489146ef79efa7b23c48ebaf1f41e53709625f7cef0c7
+  data.tar.gz: 4d8080d605d1dd3750f2a95d2f17fedc0262ffe73438690f6f1b6e66d3511cf9
 SHA512:
-  metadata.gz: c4119c5fdb66b553ee50cab0185cdec0ff7b09f102cfec8faa28efe2a6042d1e5cb46ada853afdc47b76707b5b180e0f68fb039e08e329935434716e2419b8e1
-  data.tar.gz: f7d69e1e729e4b37687358bd6ebf81e8909fe4418bfff5c8a2d676b070d6af979146d0b18c01820d5bd4a7f567a62cbb90d0e164e96d05c0e99d9968657467c0
+  metadata.gz: c30ac0e64c2ec2d2a677aba6c5eb50618bd7e33873a8b367339f2f25d2e76875cc8d01651e8f6df6a9b0814a75df8021b68b6fe181a34c46737ddc887f8e3c8f
+  data.tar.gz: 83b459d7b7c20602c772dbb323159fccde46eff4ef43d6773614941ee0e4eee8bdb39926702ce91f523821ce1e9a4efa49c4e63121d503e20a59788588dfc8a6

data/BSDL

@@ -0,0 +1,22 @@
+Copyright (C) 1993-2013 Yukihiro Matsumoto. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+2. 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.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR 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 AUTHOR 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.

data/CHANGES.md

@@ -1,5 +1,24 @@
 # Changes
 
+* Numerous performance optimizations in `JSON.generate` and `JSON.dump`.
+* Limit the size of ParserError exception messages, only include up to 32 bytes of the unparseable source.
+* Fix json-pure's `Object#to_json` to accept non state arguments 
+* Fix multiline comment support in `json-pure`.
+* Fix `JSON.parse` to no longer mutate the argument encoding when passed an ASCII-8BIT string.
+* Fix `String#to_json` to raise on invalid encoding in `json-pure`.
+* Delete code that was based on CVTUTF.
+* Use the pure-Ruby generator on TruffleRuby.
+* Fix `strict` mode in `json-pure` to not break on Integer.
+
+### 2024-04-04 (2.7.2)
+
+* Use rb_sym2str instead of SYM2ID #561
+* Fix memory leak when exception is raised during JSON generation #574
+* Remove references to "19" methods in JRuby #576
+* Make OpenStruct support as optional by @hsbt in #565
+* Autoload JSON::GenericObject to avoid require ostruct warning in Ruby 3.4 #577
+* Warn to install ostruct if json couldn't load it by @hsbt #578
+
 ### 2023-12-05 (2.7.1)
 
 * JSON.dump: handle unenclosed hashes regression #554
@@ -168,7 +187,7 @@
   * Remove Rubinius exception since transcoding should be working now.
 
 ## 2013-05-13 (1.8.0)
-  * Fix https://github.com/flori/json/issues/162 reported by Marc-Andre
+  * Fix https://github.com/ruby/json/issues/162 reported by Marc-Andre
     Lafortune <github_rocks@marc-andre.ca>. Thanks!
   * Applied patches by Yui NARUSE <naruse@airemix.jp> to suppress warning with
     -Wchar-subscripts and better validate UTF-8 strings.
@@ -188,7 +207,7 @@
         JSON::GenericObject.json_creatable = true
     as well.
   * Remove useless assert in fbuffer implementation.
-  * Apply patch attached to https://github.com/flori/json/issues#issue/155
+  * Apply patch attached to https://github.com/ruby/json/issues#issue/155
     provided by John Shahid <jvshahid@gmail.com>, Thx!
   * Add license information to rubygems spec data, reported by Jordi Massaguer Pla <jmassaguerpla@suse.de>.
   * Improve documentation, thx to Zachary Scott <zachary@zacharyscott.net>.
@@ -202,7 +221,7 @@
   * Fix compilation of extension on older rubies.
 
 ## 2012-07-26 (1.7.4)
-  * Fix compilation problem on AIX, see https://github.com/flori/json/issues/142
+  * Fix compilation problem on AIX, see https://github.com/ruby/json/issues/142
 
 ## 2012-05-12 (1.7.3)
   * Work around Rubinius encoding issues using iconv for conversion instead.
@@ -224,9 +243,9 @@
   * Propagate src encoding to values made from it (fixes 1.9 mode converting
     everything to ascii-8bit; harmless for 1.8 mode too) (Thomas E. Enebo
     <tom.enebo@gmail.com>), should fix
-    https://github.com/flori/json/issues#issue/119.
-  * Fix https://github.com/flori/json/issues#issue/124 Thx to Jason Hutchens.
-  * Fix https://github.com/flori/json/issues#issue/117
+    https://github.com/ruby/json/issues#issue/119.
+  * Fix https://github.com/ruby/json/issues#issue/124 Thx to Jason Hutchens.
+  * Fix https://github.com/ruby/json/issues#issue/117
 
 ## 2012-01-15 (1.6.5)
   * Vit Ondruch <v.ondruch@tiscali.cz> reported a bug that shows up when using
@@ -253,7 +272,7 @@
     patch go to Josh Partlow (jpartlow@github).
   * Improve parsing speed for JSON numbers (integers and floats) in a similar way to
     what Evan Phoenix <evan@phx.io> suggested in:
-    https://github.com/flori/json/pull/103
+    https://github.com/ruby/json/pull/103
 
 ## 2011-09-18 (1.6.1)
   * Using -target 1.5 to force Java bits to compile with 1.5.
@@ -266,15 +285,14 @@
   * Fix memory leak when used from multiple JRuby. (Patch by
     jfirebaugh@github).
   * Apply patch by Eric Wong <nocode@yhbt.net> that fixes garbage collection problem
-    reported in https://github.com/flori/json/issues/46.
+    reported in https://github.com/ruby/json/issues/46.
   * Add :quirks_mode option to parser and generator.
   * Add support for Rational and Complex number additions via json/add/complex
     and json/add/rational requires.
 
 ## 2011-06-20 (1.5.3)
   * Alias State#configure method as State#merge to increase duck type synonymy with Hash.
-	* Add `as_json` methods in json/add/core, so rails can create its json objects
-	  the new way.
+  * Add `as_json` methods in json/add/core, so rails can create its json objects the new way.
 
 ## 2011-05-11 (1.5.2)
   * Apply documentation patch by Cory Monty <cory.monty@gmail.com>.
@@ -285,7 +303,7 @@
 
 ## 2011-01-24 (1.5.1)
   * Made rake-compiler build a fat binary gem. This should fix issue
-    https://github.com/flori/json/issues#issue/54.
+    https://github.com/ruby/json/issues#issue/54.
 
 ## 2011-01-22 (1.5.0)
   * Included Java source codes for the Jruby extension made by Daniel Luz
@@ -295,7 +313,7 @@
     reported by Riley Goodside.
 
 ## 2010-08-09 (1.4.6)
-  * Fixed oversight reported in http://github.com/flori/json/issues/closed#issue/23,
+  * Fixed oversight reported in http://github.com/ruby/json/issues/closed#issue/23,
     always create a new object from the state prototype.
   * Made pure and ext api more similar again.
 
@@ -305,12 +323,12 @@
     argument.
   * Some fixes in the state objects and additional tests.
 ## 2010-08-06 (1.4.4)
-  * Fixes build problem for rubinius under OS X, http://github.com/flori/json/issues/closed#issue/25
-  * Fixes crashes described in http://github.com/flori/json/issues/closed#issue/21 and
-    http://github.com/flori/json/issues/closed#issue/23
+  * Fixes build problem for rubinius under OS X, http://github.com/ruby/json/issues/closed#issue/25
+  * Fixes crashes described in http://github.com/ruby/json/issues/closed#issue/21 and
+    http://github.com/ruby/json/issues/closed#issue/23
 ## 2010-05-05 (1.4.3)
   * Fixed some test assertions, from Ruby r27587 and r27590, patch by nobu.
-  * Fixed issue http://github.com/flori/json/issues/#issue/20 reported by
+  * Fixed issue http://github.com/ruby/json/issues/#issue/20 reported by
     electronicwhisper@github. Thx!
 
 ## 2010-04-26 (1.4.2)
@@ -332,7 +350,7 @@
   * Extension should at least be compatible with MRI, YARV and Rubinius.
 
 ## 2010-04-07 (1.2.4)
-  * Triger const_missing callback to make Rails' dynamic class loading work.
+  * Trigger const_missing callback to make Rails' dynamic class loading work.
 
 ## 2010-03-11 (1.2.3)
   * Added a `State#[]` method which returns an attribute's value in order to

data/LEGAL

@@ -0,0 +1,60 @@
+# -*- rdoc -*-
+
+= LEGAL NOTICE INFORMATION
+--------------------------
+
+All the files in this distribution are covered under either the Ruby's
+license (see the file COPYING) or public-domain except some files
+mentioned below.
+
+== MIT License
+>>>
+      Permission is hereby granted, free of charge, to any person obtaining
+      a copy of this software and associated documentation files (the
+      "Software"), to deal in the Software without restriction, including
+      without limitation the rights to use, copy, modify, merge, publish,
+      distribute, sublicense, and/or sell copies of the Software, and to
+      permit persons to whom the Software is furnished to do so, subject to
+      the following conditions:
+
+      The above copyright notice and this permission notice shall be
+      included in all copies or substantial portions of the Software.
+
+      THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+      EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+      MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+      NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+      LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+      OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+      WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+== Old-style BSD license
+>>>
+      Redistribution and use in source and binary forms, with or without
+      modification, are permitted provided that the following conditions
+      are met:
+      1. Redistributions of source code must retain the above copyright
+         notice, this list of conditions and the following disclaimer.
+      2. 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.
+      3. Neither the name of the University 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 REGENTS 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 REGENTS 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.
+
+      IMPORTANT NOTE::
+
+      From ftp://ftp.cs.berkeley.edu/pub/4bsd/README.Impt.License.Change
+      paragraph 3 above is now null and void.

data/README.md

@@ -1,18 +1,17 @@
 # JSON implementation for Ruby
 
-[![CI](https://github.com/flori/json/actions/workflows/ci.yml/badge.svg)](https://github.com/flori/json/actions/workflows/ci.yml)
+[![CI](https://github.com/ruby/json/actions/workflows/ci.yml/badge.svg)](https://github.com/ruby/json/actions/workflows/ci.yml)
 
 ## Description
 
-This is a implementation of the JSON specification according to RFC 7159
-http://www.ietf.org/rfc/rfc7159.txt . Starting from version 1.0.0 on there
-will be two variants available:
+This is an implementation of the JSON specification according to RFC 7159
+http://www.ietf.org/rfc/rfc7159.txt . There is two variants available:
 
-* A pure ruby variant, that relies on the iconv and the stringscan
-  extensions, which are both part of the ruby standard library.
+* A pure ruby variant, that relies on the `strscan` extensions, which is
+  part of the ruby standard library.
 * The quite a bit faster native extension variant, which is in parts
-  implemented in C or Java and comes with its own unicode conversion
-  functions and a parser generated by the [Ragel] state machine compiler.
+  implemented in C or Java and comes with a parser generated by the [Ragel]
+  state machine compiler.
 
 Both variants of the JSON generator generate UTF-8 character sequences by
 default. If an :ascii\_only option with a true value is given, they escape all
@@ -32,45 +31,19 @@ It's recommended to use the extension variant of JSON, because it's faster than
 the pure ruby variant. If you cannot build it on your system, you can settle
 for the latter.
 
-Just type into the command line as root:
+Install the gem and add to the application's Gemfile by executing:
 
-```
-# rake install
-```
-
-The above command will build the extensions and install them on your system.
-
-```
-# rake install_pure
-```
-
-or
-
-```
-# ruby install.rb
-```
+    $ bundle add json
 
-will just install the pure ruby implementation of JSON.
+If bundler is not being used to manage dependencies, install the gem by executing:
 
-If you use Rubygems you can type
+    $ gem install json
 
-```
-# gem install json
-```
-
-instead, to install the newest JSON version.
 
 There is also a pure ruby json only variant of the gem, that can be installed
 with:
 
-```
-# gem install json_pure
-```
-
-## Compiling the extensions yourself
-
-If you want to create the `parser.c` file from its `parser.rl` file or draw nice
-graphviz images of the state machines, you need [Ragel].
+    $ gem install json_pure
 
 ## Usage
 
@@ -254,136 +227,11 @@ There are also the methods `Kernel#j` for generate, and `Kernel#jj` for
 `pretty_generate` output to the console, that work analogous to Core Ruby's `p` and
 the `pp` library's `pp` methods.
 
-The script `tools/server.rb` contains a small example if you want to test, how
-receiving a JSON object from a webrick server in your browser with the
-JavaScript prototype library http://www.prototypejs.org works.
-
-## Speed Comparisons
-
-I have created some benchmark results (see the benchmarks/data-p4-3Ghz
-subdir of the package) for the JSON-parser to estimate the speed up in the C
-extension:
-
-```
- Comparing times (call_time_mean):
-  1 ParserBenchmarkExt#parser   900 repeats:
-        553.922304770 (  real) ->   21.500x
-          0.001805307
-  2 ParserBenchmarkYAML#parser  1000 repeats:
-        224.513358139 (  real) ->    8.714x
-          0.004454078
-  3 ParserBenchmarkPure#parser  1000 repeats:
-         26.755020642 (  real) ->    1.038x
-          0.037376163
-  4 ParserBenchmarkRails#parser 1000 repeats:
-         25.763381731 (  real) ->    1.000x
-          0.038814780
-            calls/sec (  time) ->    speed  covers
-            secs/call
-```
-
-In the table above 1 is `JSON::Ext::Parser`, 2 is `YAML.load` with YAML
-compatible JSON document, 3 is is `JSON::Pure::Parser`, and 4 is
-`ActiveSupport::JSON.decode`. The ActiveSupport JSON-decoder converts the
-input first to YAML and then uses the YAML-parser, the conversion seems to
-slow it down so much that it is only as fast as the `JSON::Pure::Parser`!
-
-If you look at the benchmark data you can see that this is mostly caused by
-the frequent high outliers - the median of the Rails-parser runs is still
-overall smaller than the median of the `JSON::Pure::Parser` runs:
-
-```
- Comparing times (call_time_median):
-  1 ParserBenchmarkExt#parser   900 repeats:
-        800.592479481 (  real) ->   26.936x
-          0.001249075
-  2 ParserBenchmarkYAML#parser  1000 repeats:
-        271.002390644 (  real) ->    9.118x
-          0.003690004
-  3 ParserBenchmarkRails#parser 1000 repeats:
-         30.227910865 (  real) ->    1.017x
-          0.033082008
-  4 ParserBenchmarkPure#parser  1000 repeats:
-         29.722384421 (  real) ->    1.000x
-          0.033644676
-            calls/sec (  time) ->    speed  covers
-            secs/call
-```
-
-I have benchmarked the `JSON-Generator` as well. This generated a few more
-values, because there are different modes that also influence the achieved
-speed:
-
-```
- Comparing times (call_time_mean):
-  1 GeneratorBenchmarkExt#generator_fast    1000 repeats:
-        547.354332608 (  real) ->   15.090x
-          0.001826970
-  2 GeneratorBenchmarkExt#generator_safe    1000 repeats:
-        443.968212317 (  real) ->   12.240x
-          0.002252414
-  3 GeneratorBenchmarkExt#generator_pretty  900 repeats:
-        375.104545883 (  real) ->   10.341x
-          0.002665923
-  4 GeneratorBenchmarkPure#generator_fast   1000 repeats:
-         49.978706968 (  real) ->    1.378x
-          0.020008521
-  5 GeneratorBenchmarkRails#generator       1000 repeats:
-         38.531868759 (  real) ->    1.062x
-          0.025952543
-  6 GeneratorBenchmarkPure#generator_safe   1000 repeats:
-         36.927649925 (  real) ->    1.018x 7 (>=3859)
-          0.027079979
-  7 GeneratorBenchmarkPure#generator_pretty 1000 repeats:
-         36.272134441 (  real) ->    1.000x 6 (>=3859)
-          0.027569373
-            calls/sec (  time) ->    speed  covers
-            secs/call
-```
-
-In the table above 1-3 are `JSON::Ext::Generator` methods. 4, 6, and 7 are
-`JSON::Pure::Generator` methods and 5 is the Rails JSON generator. It is now a
-bit faster than the `generator_safe` and `generator_pretty` methods of the pure
-variant but slower than the others.
-
-To achieve the fastest JSON document output, you can use the `fast_generate`
-method. Beware, that this will disable the checking for circular Ruby data
-structures, which may cause JSON to go into an infinite loop.
-
-Here are the median comparisons for completeness' sake:
-
-```
- Comparing times (call_time_median):
-  1 GeneratorBenchmarkExt#generator_fast    1000 repeats:
-        708.258020939 (  real) ->   16.547x
-          0.001411915
-  2 GeneratorBenchmarkExt#generator_safe    1000 repeats:
-        569.105020353 (  real) ->   13.296x
-          0.001757145
-  3 GeneratorBenchmarkExt#generator_pretty  900 repeats:
-        482.825371244 (  real) ->   11.280x
-          0.002071142
-  4 GeneratorBenchmarkPure#generator_fast   1000 repeats:
-         62.717626652 (  real) ->    1.465x
-          0.015944481
-  5 GeneratorBenchmarkRails#generator       1000 repeats:
-         43.965681162 (  real) ->    1.027x
-          0.022745013
-  6 GeneratorBenchmarkPure#generator_safe   1000 repeats:
-         43.929073409 (  real) ->    1.026x 7 (>=3859)
-          0.022763968
-  7 GeneratorBenchmarkPure#generator_pretty 1000 repeats:
-         42.802514491 (  real) ->    1.000x 6 (>=3859)
-          0.023363113
-            calls/sec (  time) ->    speed  covers
-            secs/call
-```
-
 ## Development
 
 ### Release
 
-Update the json.gemspec and json-java.gemspec.
+Update the `lib/json/version.rb` file.
 
 ```
 rbenv shell 2.6.5

data/ext/json/ext/fbuffer/fbuffer.h

@@ -1,47 +1,8 @@
-
 #ifndef _FBUFFER_H_
 #define _FBUFFER_H_
 
 #include "ruby.h"
-
-#ifndef RHASH_SIZE
-#define RHASH_SIZE(hsh) (RHASH(hsh)->tbl->num_entries)
-#endif
-
-#ifndef RFLOAT_VALUE
-#define RFLOAT_VALUE(val) (RFLOAT(val)->value)
-#endif
-
-#ifndef RARRAY_LEN
-#define RARRAY_LEN(ARRAY) RARRAY(ARRAY)->len
-#endif
-#ifndef RSTRING_PTR
-#define RSTRING_PTR(string) RSTRING(string)->ptr
-#endif
-#ifndef RSTRING_LEN
-#define RSTRING_LEN(string) RSTRING(string)->len
-#endif
-
-#ifdef PRIsVALUE
-# define RB_OBJ_CLASSNAME(obj) rb_obj_class(obj)
-# define RB_OBJ_STRING(obj) (obj)
-#else
-# define PRIsVALUE "s"
-# define RB_OBJ_CLASSNAME(obj) rb_obj_classname(obj)
-# define RB_OBJ_STRING(obj) StringValueCStr(obj)
-#endif
-
-#ifdef HAVE_RUBY_ENCODING_H
 #include "ruby/encoding.h"
-#define FORCE_UTF8(obj) rb_enc_associate((obj), rb_utf8_encoding())
-#else
-#define FORCE_UTF8(obj)
-#endif
-
-/* We don't need to guard objects for rbx, so let's do nothing at all. */
-#ifndef RB_GC_GUARD
-#define RB_GC_GUARD(object)
-#endif
 
 typedef struct FBufferStruct {
     unsigned long initial_length;
@@ -59,17 +20,22 @@ typedef struct FBufferStruct {
 
 static FBuffer *fbuffer_alloc(unsigned long initial_length);
 static void fbuffer_free(FBuffer *fb);
+#ifndef JSON_GENERATOR
 static void fbuffer_clear(FBuffer *fb);
+#endif
 static void fbuffer_append(FBuffer *fb, const char *newstr, unsigned long len);
 #ifdef JSON_GENERATOR
 static void fbuffer_append_long(FBuffer *fb, long number);
 #endif
 static void fbuffer_append_char(FBuffer *fb, char newchr);
 #ifdef JSON_GENERATOR
-static FBuffer *fbuffer_dup(FBuffer *fb);
 static VALUE fbuffer_to_s(FBuffer *fb);
 #endif
 
+#ifndef RB_UNLIKELY
+#define RB_UNLIKELY(expr) expr
+#endif
+
 static FBuffer *fbuffer_alloc(unsigned long initial_length)
 {
     FBuffer *fb;
@@ -86,25 +52,29 @@ static void fbuffer_free(FBuffer *fb)
     ruby_xfree(fb);
 }
 
+#ifndef JSON_GENERATOR
 static void fbuffer_clear(FBuffer *fb)
 {
     fb->len = 0;
 }
+#endif
 
-static void fbuffer_inc_capa(FBuffer *fb, unsigned long requested)
+static inline void fbuffer_inc_capa(FBuffer *fb, unsigned long requested)
 {
-    unsigned long required;
+    if (RB_UNLIKELY(requested > fb->capa - fb->len)) {
+        unsigned long required;
 
-    if (!fb->ptr) {
-        fb->ptr = ALLOC_N(char, fb->initial_length);
-        fb->capa = fb->initial_length;
-    }
+        if (RB_UNLIKELY(!fb->ptr)) {
+            fb->ptr = ALLOC_N(char, fb->initial_length);
+            fb->capa = fb->initial_length;
+        }
 
-    for (required = fb->capa; requested > required - fb->len; required <<= 1);
+        for (required = fb->capa; requested > required - fb->len; required <<= 1);
 
-    if (required > fb->capa) {
-        REALLOC_N(fb->ptr, char, required);
-        fb->capa = required;
+        if (required > fb->capa) {
+            REALLOC_N(fb->ptr, char, required);
+            fb->capa = required;
+        }
     }
 }
 
@@ -166,21 +136,10 @@ static void fbuffer_append_long(FBuffer *fb, long number)
     fbuffer_append(fb, buf, len);
 }
 
-static FBuffer *fbuffer_dup(FBuffer *fb)
-{
-    unsigned long len = fb->len;
-    FBuffer *result;
-
-    result = fbuffer_alloc(len);
-    fbuffer_append(result, FBUFFER_PAIR(fb));
-    return result;
-}
-
 static VALUE fbuffer_to_s(FBuffer *fb)
 {
-    VALUE result = rb_str_new(FBUFFER_PTR(fb), FBUFFER_LEN(fb));
+    VALUE result = rb_utf8_str_new(FBUFFER_PTR(fb), FBUFFER_LEN(fb));
     fbuffer_free(fb);
-    FORCE_UTF8(result);
     return result;
 }
 #endif

data/ext/json/ext/generator/extconf.rb

@@ -1,4 +1,10 @@
 require 'mkmf'
 
-$defs << "-DJSON_GENERATOR"
-create_makefile 'json/ext/generator'
+if RUBY_ENGINE == 'truffleruby'
+  # The pure-Ruby generator is faster on TruffleRuby, so skip compiling the generator extension
+  File.write('Makefile', dummy_makefile("").join)
+else
+  append_cflags("-std=c99")
+  $defs << "-DJSON_GENERATOR"
+  create_makefile 'json/ext/generator'
+end