json 2.7.2 → 2.7.5
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/BSDL +22 -0
- data/CHANGES.md +50 -17
- data/LEGAL +60 -0
- data/README.md +13 -165
- data/ext/json/ext/fbuffer/fbuffer.h +21 -62
- data/ext/json/ext/generator/extconf.rb +8 -2
- data/ext/json/ext/generator/generator.c +497 -668
- data/ext/json/ext/generator/generator.h +16 -75
- data/ext/json/ext/parser/extconf.rb +3 -1
- data/ext/json/ext/parser/parser.c +279 -253
- data/ext/json/ext/parser/parser.h +4 -40
- data/ext/json/ext/parser/parser.rl +208 -182
- data/json.gemspec +42 -49
- data/lib/json/add/bigdecimal.rb +1 -1
- data/lib/json/add/complex.rb +1 -1
- data/lib/json/add/core.rb +1 -1
- data/lib/json/add/date.rb +1 -1
- data/lib/json/add/date_time.rb +1 -1
- data/lib/json/add/exception.rb +1 -1
- data/lib/json/add/ostruct.rb +1 -1
- data/lib/json/add/range.rb +1 -1
- data/lib/json/add/rational.rb +1 -1
- data/lib/json/add/regexp.rb +1 -1
- data/lib/json/add/struct.rb +1 -1
- data/lib/json/add/symbol.rb +1 -2
- data/lib/json/add/time.rb +3 -10
- data/lib/json/common.rb +79 -43
- data/lib/json/ext/generator/state.rb +135 -0
- data/lib/json/ext.rb +15 -5
- data/lib/json/generic_object.rb +1 -1
- data/lib/json/pure/generator.rb +96 -29
- data/lib/json/pure/parser.rb +27 -33
- data/lib/json/pure.rb +1 -0
- data/lib/json/version.rb +3 -7
- data/lib/json.rb +1 -1
- metadata +17 -15
- data/ext/json/ext/generator/depend +0 -1
- data/ext/json/ext/parser/depend +0 -1
- data/ext/json/extconf.rb +0 -3
- /data/{LICENSE → COPYING} +0 -0
@@ -1,332 +1,306 @@
|
|
1
1
|
#include "../fbuffer/fbuffer.h"
|
2
2
|
#include "generator.h"
|
3
3
|
|
4
|
-
|
5
|
-
|
6
|
-
#ifdef RUBY_INTEGER_UNIFICATION
|
7
|
-
mInteger,
|
8
|
-
#else
|
9
|
-
mFixnum, mBignum,
|
4
|
+
#ifndef RB_UNLIKELY
|
5
|
+
#define RB_UNLIKELY(cond) (cond)
|
10
6
|
#endif
|
11
|
-
mFloat, mString, mString_Extend,
|
12
|
-
mTrueClass, mFalseClass, mNilClass, eGeneratorError,
|
13
|
-
eNestingError;
|
14
7
|
|
15
|
-
static
|
16
|
-
i_object_nl, i_array_nl, i_max_nesting, i_allow_nan, i_ascii_only,
|
17
|
-
i_pack, i_unpack, i_create_id, i_extend, i_key_p,
|
18
|
-
i_aref, i_send, i_respond_to_p, i_match, i_keys, i_depth,
|
19
|
-
i_buffer_initial_length, i_dup, i_script_safe, i_escape_slash, i_strict;
|
8
|
+
static VALUE mJSON, cState, mString_Extend, eGeneratorError, eNestingError, Encoding_UTF_8;
|
20
9
|
|
21
|
-
|
22
|
-
|
10
|
+
static ID i_to_s, i_to_json, i_new, i_pack, i_unpack, i_create_id, i_extend, i_encode;
|
11
|
+
|
12
|
+
/* Converts in_string to a JSON string (without the wrapping '"'
|
13
|
+
* characters) in FBuffer out_buffer.
|
23
14
|
*
|
24
|
-
*
|
15
|
+
* Character are JSON-escaped according to:
|
25
16
|
*
|
26
|
-
*
|
27
|
-
*
|
28
|
-
* kind are expressed or implied. The recipient agrees to determine
|
29
|
-
* applicability of information provided. If this file has been
|
30
|
-
* purchased on magnetic or optical media from Unicode, Inc., the
|
31
|
-
* sole remedy for any claim will be exchange of defective media
|
32
|
-
* within 90 days of receipt.
|
17
|
+
* - Always: ASCII control characters (0x00-0x1F), dquote, and
|
18
|
+
* backslash.
|
33
19
|
*
|
34
|
-
*
|
20
|
+
* - If out_ascii_only: non-ASCII characters (>0x7F)
|
35
21
|
*
|
36
|
-
*
|
37
|
-
*
|
38
|
-
*
|
39
|
-
*
|
40
|
-
*
|
22
|
+
* - If out_script_safe: forwardslash, line separator (U+2028), and
|
23
|
+
* paragraph separator (U+2029)
|
24
|
+
*
|
25
|
+
* Everything else (should be UTF-8) is just passed through and
|
26
|
+
* appended to the result.
|
41
27
|
*/
|
28
|
+
static void convert_UTF8_to_JSON(FBuffer *out_buffer, VALUE str, const char escape_table[256], bool out_script_safe)
|
29
|
+
{
|
30
|
+
const char *hexdig = "0123456789abcdef";
|
31
|
+
char scratch[12] = { '\\', 'u', 0, 0, 0, 0, '\\', 'u' };
|
42
32
|
|
43
|
-
|
44
|
-
|
45
|
-
* get the number of trailing bytes that are supposed to follow it.
|
46
|
-
* Note that *legal* UTF-8 values can't have 4 or 5-bytes. The table is
|
47
|
-
* left as-is for anyone who may want to do such conversion, which was
|
48
|
-
* allowed in earlier algorithms.
|
49
|
-
*/
|
50
|
-
static const char trailingBytesForUTF8[256] = {
|
51
|
-
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
|
52
|
-
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
|
53
|
-
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
|
54
|
-
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
|
55
|
-
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
|
56
|
-
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
|
57
|
-
1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
|
58
|
-
2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2, 3,3,3,3,3,3,3,3,4,4,4,4,5,5,5,5
|
59
|
-
};
|
33
|
+
const char *ptr = RSTRING_PTR(str);
|
34
|
+
unsigned long len = RSTRING_LEN(str);
|
60
35
|
|
61
|
-
|
62
|
-
* Magic values subtracted from a buffer value during UTF8 conversion.
|
63
|
-
* This table contains as many values as there might be trailing bytes
|
64
|
-
* in a UTF-8 sequence.
|
65
|
-
*/
|
66
|
-
static const UTF32 offsetsFromUTF8[6] = { 0x00000000UL, 0x00003080UL, 0x000E2080UL,
|
67
|
-
0x03C82080UL, 0xFA082080UL, 0x82082080UL };
|
36
|
+
unsigned long beg = 0, pos = 0;
|
68
37
|
|
69
|
-
|
70
|
-
|
71
|
-
|
72
|
-
|
73
|
-
|
74
|
-
|
75
|
-
|
76
|
-
|
77
|
-
|
78
|
-
|
79
|
-
|
80
|
-
|
81
|
-
|
82
|
-
|
83
|
-
|
84
|
-
|
85
|
-
|
86
|
-
|
87
|
-
|
88
|
-
|
89
|
-
|
90
|
-
|
91
|
-
|
92
|
-
|
93
|
-
|
94
|
-
|
95
|
-
|
96
|
-
|
38
|
+
#define FLUSH_POS(bytes) if (pos > beg) { fbuffer_append(out_buffer, &ptr[beg], pos - beg); } pos += bytes; beg = pos;
|
39
|
+
|
40
|
+
while (pos < len) {
|
41
|
+
unsigned char ch = ptr[pos];
|
42
|
+
unsigned char ch_len = escape_table[ch];
|
43
|
+
/* JSON encoding */
|
44
|
+
|
45
|
+
if (RB_UNLIKELY(ch_len)) {
|
46
|
+
switch (ch_len) {
|
47
|
+
case 0:
|
48
|
+
pos++;
|
49
|
+
break;
|
50
|
+
case 1: {
|
51
|
+
FLUSH_POS(1);
|
52
|
+
switch (ch) {
|
53
|
+
case '"': fbuffer_append(out_buffer, "\\\"", 2); break;
|
54
|
+
case '\\': fbuffer_append(out_buffer, "\\\\", 2); break;
|
55
|
+
case '/': fbuffer_append(out_buffer, "\\/", 2); break;
|
56
|
+
case '\b': fbuffer_append(out_buffer, "\\b", 2); break;
|
57
|
+
case '\f': fbuffer_append(out_buffer, "\\f", 2); break;
|
58
|
+
case '\n': fbuffer_append(out_buffer, "\\n", 2); break;
|
59
|
+
case '\r': fbuffer_append(out_buffer, "\\r", 2); break;
|
60
|
+
case '\t': fbuffer_append(out_buffer, "\\t", 2); break;
|
61
|
+
default: {
|
62
|
+
scratch[2] = hexdig[ch >> 12];
|
63
|
+
scratch[3] = hexdig[(ch >> 8) & 0xf];
|
64
|
+
scratch[4] = hexdig[(ch >> 4) & 0xf];
|
65
|
+
scratch[5] = hexdig[ch & 0xf];
|
66
|
+
fbuffer_append(out_buffer, scratch, 6);
|
67
|
+
break;
|
68
|
+
}
|
97
69
|
}
|
70
|
+
break;
|
71
|
+
}
|
72
|
+
case 3: {
|
73
|
+
unsigned char b2 = ptr[pos + 1];
|
74
|
+
if (RB_UNLIKELY(out_script_safe && b2 == 0x80)) {
|
75
|
+
unsigned char b3 = ptr[pos + 2];
|
76
|
+
if (b3 == 0xA8) {
|
77
|
+
FLUSH_POS(3);
|
78
|
+
fbuffer_append(out_buffer, "\\u2028", 6);
|
79
|
+
break;
|
80
|
+
} else if (b3 == 0xA9) {
|
81
|
+
FLUSH_POS(3);
|
82
|
+
fbuffer_append(out_buffer, "\\u2029", 6);
|
83
|
+
break;
|
84
|
+
}
|
85
|
+
}
|
86
|
+
// fallthrough
|
87
|
+
}
|
88
|
+
default:
|
89
|
+
pos += ch_len;
|
90
|
+
break;
|
91
|
+
}
|
92
|
+
} else {
|
93
|
+
pos++;
|
94
|
+
}
|
95
|
+
}
|
96
|
+
#undef FLUSH_POS
|
98
97
|
|
99
|
-
|
98
|
+
if (beg < len) {
|
99
|
+
fbuffer_append(out_buffer, &ptr[beg], len - beg);
|
100
100
|
}
|
101
|
-
if (*source > 0xF4) return 0;
|
102
|
-
return 1;
|
103
|
-
}
|
104
101
|
|
105
|
-
|
106
|
-
|
107
|
-
|
108
|
-
|
102
|
+
RB_GC_GUARD(str);
|
103
|
+
}
|
104
|
+
|
105
|
+
static const char escape_table[256] = {
|
106
|
+
// ASCII Control Characters
|
107
|
+
1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
|
108
|
+
1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
|
109
|
+
// ASCII Characters
|
110
|
+
0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0, // '"'
|
111
|
+
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
|
112
|
+
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
|
113
|
+
0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0, // '\\'
|
114
|
+
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
|
115
|
+
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
|
116
|
+
// Continuation byte
|
117
|
+
1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
|
118
|
+
1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
|
119
|
+
1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
|
120
|
+
1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
|
121
|
+
// First byte of a 2-byte code point
|
122
|
+
2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
|
123
|
+
2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
|
124
|
+
// First byte of a 4-byte code point
|
125
|
+
3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,
|
126
|
+
//First byte of a 4+byte code point
|
127
|
+
4,4,4,4,4,4,4,4,5,5,5,5,6,6,1,1,
|
128
|
+
};
|
109
129
|
|
110
|
-
|
111
|
-
|
112
|
-
|
113
|
-
|
114
|
-
|
130
|
+
static const char script_safe_escape_table[256] = {
|
131
|
+
// ASCII Control Characters
|
132
|
+
1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
|
133
|
+
1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
|
134
|
+
// ASCII Characters
|
135
|
+
0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,1, // '"' and '/'
|
136
|
+
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
|
137
|
+
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
|
138
|
+
0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0, // '\\'
|
139
|
+
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
|
140
|
+
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
|
141
|
+
// Continuation byte
|
142
|
+
1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
|
143
|
+
1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
|
144
|
+
1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
|
145
|
+
1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
|
146
|
+
// First byte of a 2-byte code point
|
147
|
+
2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
|
148
|
+
2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
|
149
|
+
// First byte of a 4-byte code point
|
150
|
+
3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,
|
151
|
+
//First byte of a 4+byte code point
|
152
|
+
4,4,4,4,4,4,4,4,5,5,5,5,6,6,1,1,
|
153
|
+
};
|
115
154
|
|
116
|
-
|
117
|
-
* the buffer buf is appended to the FBuffer buffer. */
|
118
|
-
static void unicode_escape_to_buffer(FBuffer *buffer, char buf[6], UTF16
|
119
|
-
character)
|
155
|
+
static void convert_ASCII_to_JSON(FBuffer *out_buffer, VALUE str, const char escape_table[256])
|
120
156
|
{
|
121
|
-
|
122
|
-
|
157
|
+
const char *hexdig = "0123456789abcdef";
|
158
|
+
char scratch[12] = { '\\', 'u', 0, 0, 0, 0, '\\', 'u' };
|
159
|
+
|
160
|
+
const char *ptr = RSTRING_PTR(str);
|
161
|
+
unsigned long len = RSTRING_LEN(str);
|
162
|
+
|
163
|
+
unsigned long beg = 0, pos;
|
164
|
+
|
165
|
+
for (pos = 0; pos < len;) {
|
166
|
+
unsigned char ch = ptr[pos];
|
167
|
+
/* JSON encoding */
|
168
|
+
if (escape_table[ch]) {
|
169
|
+
if (pos > beg) {
|
170
|
+
fbuffer_append(out_buffer, &ptr[beg], pos - beg);
|
171
|
+
}
|
172
|
+
|
173
|
+
beg = pos + 1;
|
174
|
+
switch (ch) {
|
175
|
+
case '"': fbuffer_append(out_buffer, "\\\"", 2); break;
|
176
|
+
case '\\': fbuffer_append(out_buffer, "\\\\", 2); break;
|
177
|
+
case '/': fbuffer_append(out_buffer, "\\/", 2); break;
|
178
|
+
case '\b': fbuffer_append(out_buffer, "\\b", 2); break;
|
179
|
+
case '\f': fbuffer_append(out_buffer, "\\f", 2); break;
|
180
|
+
case '\n': fbuffer_append(out_buffer, "\\n", 2); break;
|
181
|
+
case '\r': fbuffer_append(out_buffer, "\\r", 2); break;
|
182
|
+
case '\t': fbuffer_append(out_buffer, "\\t", 2); break;
|
183
|
+
default:
|
184
|
+
scratch[2] = hexdig[ch >> 12];
|
185
|
+
scratch[3] = hexdig[(ch >> 8) & 0xf];
|
186
|
+
scratch[4] = hexdig[(ch >> 4) & 0xf];
|
187
|
+
scratch[5] = hexdig[ch & 0xf];
|
188
|
+
fbuffer_append(out_buffer, scratch, 6);
|
189
|
+
}
|
190
|
+
}
|
191
|
+
|
192
|
+
pos++;
|
193
|
+
}
|
194
|
+
|
195
|
+
if (beg < len) {
|
196
|
+
fbuffer_append(out_buffer, &ptr[beg], len - beg);
|
197
|
+
}
|
198
|
+
|
199
|
+
RB_GC_GUARD(str);
|
123
200
|
}
|
124
201
|
|
125
|
-
|
126
|
-
* and control characters are JSON escaped. */
|
127
|
-
static void convert_UTF8_to_JSON_ASCII(FBuffer *buffer, VALUE string, char script_safe)
|
202
|
+
static void convert_UTF8_to_ASCII_only_JSON(FBuffer *out_buffer, VALUE str, const char escape_table[256], bool out_script_safe)
|
128
203
|
{
|
129
|
-
const
|
130
|
-
|
131
|
-
char buf[6] = { '\\', 'u' };
|
204
|
+
const char *hexdig = "0123456789abcdef";
|
205
|
+
char scratch[12] = { '\\', 'u', 0, 0, 0, 0, '\\', 'u' };
|
132
206
|
|
133
|
-
|
134
|
-
|
135
|
-
|
136
|
-
|
137
|
-
|
138
|
-
|
139
|
-
|
140
|
-
|
141
|
-
|
142
|
-
|
143
|
-
|
144
|
-
|
145
|
-
|
146
|
-
|
147
|
-
|
148
|
-
|
149
|
-
|
150
|
-
|
151
|
-
case 2: ch += *source++; ch <<= 6;
|
152
|
-
case 1: ch += *source++; ch <<= 6;
|
153
|
-
case 0: ch += *source++;
|
154
|
-
}
|
155
|
-
ch -= offsetsFromUTF8[extraBytesToRead];
|
156
|
-
|
157
|
-
if (ch <= UNI_MAX_BMP) { /* Target is a character <= 0xFFFF */
|
158
|
-
/* UTF-16 surrogate values are illegal in UTF-32 */
|
159
|
-
if (ch >= UNI_SUR_HIGH_START && ch <= UNI_SUR_LOW_END) {
|
160
|
-
#if UNI_STRICT_CONVERSION
|
161
|
-
source -= (extraBytesToRead+1); /* return to the illegal value itself */
|
162
|
-
rb_raise(rb_path2class("JSON::GeneratorError"),
|
163
|
-
"source sequence is illegal/malformed utf-8");
|
164
|
-
#else
|
165
|
-
unicode_escape_to_buffer(buffer, buf, UNI_REPLACEMENT_CHAR);
|
166
|
-
#endif
|
167
|
-
} else {
|
168
|
-
/* normal case */
|
169
|
-
if (ch >= 0x20 && ch <= 0x7f) {
|
207
|
+
const char *ptr = RSTRING_PTR(str);
|
208
|
+
unsigned long len = RSTRING_LEN(str);
|
209
|
+
|
210
|
+
unsigned long beg = 0, pos = 0;
|
211
|
+
|
212
|
+
#define FLUSH_POS(bytes) if (pos > beg) { fbuffer_append(out_buffer, &ptr[beg], pos - beg); } pos += bytes; beg = pos;
|
213
|
+
|
214
|
+
while (pos < len) {
|
215
|
+
unsigned char ch = ptr[pos];
|
216
|
+
unsigned char ch_len = escape_table[ch];
|
217
|
+
|
218
|
+
if (RB_UNLIKELY(ch_len)) {
|
219
|
+
switch (ch_len) {
|
220
|
+
case 0:
|
221
|
+
pos++;
|
222
|
+
break;
|
223
|
+
case 1: {
|
224
|
+
FLUSH_POS(1);
|
170
225
|
switch (ch) {
|
171
|
-
case '
|
172
|
-
|
173
|
-
|
174
|
-
case '
|
175
|
-
|
176
|
-
|
177
|
-
case '
|
178
|
-
|
179
|
-
|
180
|
-
|
181
|
-
|
182
|
-
|
183
|
-
|
226
|
+
case '"': fbuffer_append(out_buffer, "\\\"", 2); break;
|
227
|
+
case '\\': fbuffer_append(out_buffer, "\\\\", 2); break;
|
228
|
+
case '/': fbuffer_append(out_buffer, "\\/", 2); break;
|
229
|
+
case '\b': fbuffer_append(out_buffer, "\\b", 2); break;
|
230
|
+
case '\f': fbuffer_append(out_buffer, "\\f", 2); break;
|
231
|
+
case '\n': fbuffer_append(out_buffer, "\\n", 2); break;
|
232
|
+
case '\r': fbuffer_append(out_buffer, "\\r", 2); break;
|
233
|
+
case '\t': fbuffer_append(out_buffer, "\\t", 2); break;
|
234
|
+
default: {
|
235
|
+
scratch[2] = hexdig[ch >> 12];
|
236
|
+
scratch[3] = hexdig[(ch >> 8) & 0xf];
|
237
|
+
scratch[4] = hexdig[(ch >> 4) & 0xf];
|
238
|
+
scratch[5] = hexdig[ch & 0xf];
|
239
|
+
fbuffer_append(out_buffer, scratch, 6);
|
184
240
|
break;
|
241
|
+
}
|
185
242
|
}
|
186
|
-
|
187
|
-
|
188
|
-
|
189
|
-
|
190
|
-
|
191
|
-
case
|
192
|
-
|
193
|
-
break;
|
194
|
-
case '\t':
|
195
|
-
fbuffer_append(buffer, "\\t", 2);
|
196
|
-
break;
|
197
|
-
case '\f':
|
198
|
-
fbuffer_append(buffer, "\\f", 2);
|
243
|
+
break;
|
244
|
+
}
|
245
|
+
default: {
|
246
|
+
uint32_t wchar = 0;
|
247
|
+
switch(ch_len) {
|
248
|
+
case 2:
|
249
|
+
wchar = ptr[pos] & 0x1F;
|
199
250
|
break;
|
200
|
-
case
|
201
|
-
|
251
|
+
case 3:
|
252
|
+
wchar = ptr[pos] & 0x0F;
|
202
253
|
break;
|
203
|
-
|
204
|
-
|
254
|
+
case 4:
|
255
|
+
wchar = ptr[pos] & 0x07;
|
205
256
|
break;
|
206
257
|
}
|
207
|
-
|
208
|
-
|
209
|
-
|
210
|
-
#if UNI_STRICT_CONVERSION
|
211
|
-
source -= (extraBytesToRead+1); /* return to the start */
|
212
|
-
rb_raise(rb_path2class("JSON::GeneratorError"),
|
213
|
-
"source sequence is illegal/malformed utf8");
|
214
|
-
#else
|
215
|
-
unicode_escape_to_buffer(buffer, buf, UNI_REPLACEMENT_CHAR);
|
216
|
-
#endif
|
217
|
-
} else {
|
218
|
-
/* target is a character in range 0xFFFF - 0x10FFFF. */
|
219
|
-
ch -= halfBase;
|
220
|
-
unicode_escape_to_buffer(buffer, buf, (UTF16)((ch >> halfShift) + UNI_SUR_HIGH_START));
|
221
|
-
unicode_escape_to_buffer(buffer, buf, (UTF16)((ch & halfMask) + UNI_SUR_LOW_START));
|
222
|
-
}
|
223
|
-
}
|
224
|
-
RB_GC_GUARD(string);
|
225
|
-
}
|
226
|
-
|
227
|
-
/* Converts string to a JSON string in FBuffer buffer, where only the
|
228
|
-
* characters required by the JSON standard are JSON escaped. The remaining
|
229
|
-
* characters (should be UTF8) are just passed through and appended to the
|
230
|
-
* result. */
|
231
|
-
static void convert_UTF8_to_JSON(FBuffer *buffer, VALUE string, char script_safe)
|
232
|
-
{
|
233
|
-
const char *ptr = RSTRING_PTR(string), *p;
|
234
|
-
unsigned long len = RSTRING_LEN(string), start = 0, end = 0;
|
235
|
-
const char *escape = NULL;
|
236
|
-
int escape_len;
|
237
|
-
unsigned char c;
|
238
|
-
char buf[6] = { '\\', 'u' };
|
239
|
-
int ascii_only = rb_enc_str_asciionly_p(string);
|
240
|
-
|
241
|
-
for (start = 0, end = 0; end < len;) {
|
242
|
-
p = ptr + end;
|
243
|
-
c = (unsigned char) *p;
|
244
|
-
if (c < 0x20) {
|
245
|
-
switch (c) {
|
246
|
-
case '\n':
|
247
|
-
escape = "\\n";
|
248
|
-
escape_len = 2;
|
249
|
-
break;
|
250
|
-
case '\r':
|
251
|
-
escape = "\\r";
|
252
|
-
escape_len = 2;
|
253
|
-
break;
|
254
|
-
case '\t':
|
255
|
-
escape = "\\t";
|
256
|
-
escape_len = 2;
|
257
|
-
break;
|
258
|
-
case '\f':
|
259
|
-
escape = "\\f";
|
260
|
-
escape_len = 2;
|
261
|
-
break;
|
262
|
-
case '\b':
|
263
|
-
escape = "\\b";
|
264
|
-
escape_len = 2;
|
265
|
-
break;
|
266
|
-
default:
|
267
|
-
unicode_escape(buf, (UTF16) *p);
|
268
|
-
escape = buf;
|
269
|
-
escape_len = 6;
|
270
|
-
break;
|
271
|
-
}
|
272
|
-
} else {
|
273
|
-
switch (c) {
|
274
|
-
case '\\':
|
275
|
-
escape = "\\\\";
|
276
|
-
escape_len = 2;
|
277
|
-
break;
|
278
|
-
case '"':
|
279
|
-
escape = "\\\"";
|
280
|
-
escape_len = 2;
|
281
|
-
break;
|
282
|
-
case '/':
|
283
|
-
if(script_safe) {
|
284
|
-
escape = "\\/";
|
285
|
-
escape_len = 2;
|
286
|
-
break;
|
258
|
+
|
259
|
+
for (short i = 1; i < ch_len; i++) {
|
260
|
+
wchar = (wchar << 6) | (ptr[pos+i] & 0x3F);
|
287
261
|
}
|
288
|
-
|
289
|
-
|
290
|
-
|
291
|
-
|
292
|
-
|
293
|
-
|
294
|
-
|
295
|
-
|
296
|
-
|
297
|
-
|
298
|
-
|
299
|
-
|
300
|
-
|
301
|
-
|
302
|
-
|
303
|
-
|
304
|
-
|
305
|
-
|
306
|
-
|
307
|
-
|
308
|
-
|
309
|
-
|
310
|
-
|
311
|
-
|
312
|
-
|
313
|
-
|
314
|
-
rb_raise(rb_path2class("JSON::GeneratorError"),
|
315
|
-
"source sequence is illegal/malformed utf-8");
|
316
|
-
}
|
317
|
-
}
|
318
|
-
end += clen;
|
262
|
+
|
263
|
+
FLUSH_POS(ch_len);
|
264
|
+
|
265
|
+
if (wchar <= 0xFFFF) {
|
266
|
+
scratch[2] = hexdig[wchar >> 12];
|
267
|
+
scratch[3] = hexdig[(wchar >> 8) & 0xf];
|
268
|
+
scratch[4] = hexdig[(wchar >> 4) & 0xf];
|
269
|
+
scratch[5] = hexdig[wchar & 0xf];
|
270
|
+
fbuffer_append(out_buffer, scratch, 6);
|
271
|
+
} else {
|
272
|
+
uint16_t hi, lo;
|
273
|
+
wchar -= 0x10000;
|
274
|
+
hi = 0xD800 + (uint16_t)(wchar >> 10);
|
275
|
+
lo = 0xDC00 + (uint16_t)(wchar & 0x3FF);
|
276
|
+
|
277
|
+
scratch[2] = hexdig[hi >> 12];
|
278
|
+
scratch[3] = hexdig[(hi >> 8) & 0xf];
|
279
|
+
scratch[4] = hexdig[(hi >> 4) & 0xf];
|
280
|
+
scratch[5] = hexdig[hi & 0xf];
|
281
|
+
|
282
|
+
scratch[8] = hexdig[lo >> 12];
|
283
|
+
scratch[9] = hexdig[(lo >> 8) & 0xf];
|
284
|
+
scratch[10] = hexdig[(lo >> 4) & 0xf];
|
285
|
+
scratch[11] = hexdig[lo & 0xf];
|
286
|
+
|
287
|
+
fbuffer_append(out_buffer, scratch, 12);
|
319
288
|
}
|
320
|
-
|
289
|
+
|
321
290
|
break;
|
291
|
+
}
|
322
292
|
}
|
293
|
+
} else {
|
294
|
+
pos++;
|
323
295
|
}
|
324
|
-
fbuffer_append(buffer, ptr + start, end - start);
|
325
|
-
fbuffer_append(buffer, escape, escape_len);
|
326
|
-
start = ++end;
|
327
|
-
escape = NULL;
|
328
296
|
}
|
329
|
-
|
297
|
+
#undef FLUSH_POS
|
298
|
+
|
299
|
+
if (beg < len) {
|
300
|
+
fbuffer_append(out_buffer, &ptr[beg], len - beg);
|
301
|
+
}
|
302
|
+
|
303
|
+
RB_GC_GUARD(str);
|
330
304
|
}
|
331
305
|
|
332
306
|
static char *fstrndup(const char *ptr, unsigned long len) {
|
@@ -429,7 +403,9 @@ static char *fstrndup(const char *ptr, unsigned long len) {
|
|
429
403
|
*/
|
430
404
|
static VALUE mHash_to_json(int argc, VALUE *argv, VALUE self)
|
431
405
|
{
|
432
|
-
|
406
|
+
rb_check_arity(argc, 0, 1);
|
407
|
+
VALUE Vstate = cState_from_state_s(cState, argc == 1 ? argv[0] : Qnil);
|
408
|
+
return cState_partial_generate(Vstate, self, generate_json_object);
|
433
409
|
}
|
434
410
|
|
435
411
|
/*
|
@@ -441,7 +417,9 @@ static VALUE mHash_to_json(int argc, VALUE *argv, VALUE self)
|
|
441
417
|
* produced JSON string output further.
|
442
418
|
*/
|
443
419
|
static VALUE mArray_to_json(int argc, VALUE *argv, VALUE self) {
|
444
|
-
|
420
|
+
rb_check_arity(argc, 0, 1);
|
421
|
+
VALUE Vstate = cState_from_state_s(cState, argc == 1 ? argv[0] : Qnil);
|
422
|
+
return cState_partial_generate(Vstate, self, generate_json_array);
|
445
423
|
}
|
446
424
|
|
447
425
|
#ifdef RUBY_INTEGER_UNIFICATION
|
@@ -452,7 +430,9 @@ static VALUE mArray_to_json(int argc, VALUE *argv, VALUE self) {
|
|
452
430
|
*/
|
453
431
|
static VALUE mInteger_to_json(int argc, VALUE *argv, VALUE self)
|
454
432
|
{
|
455
|
-
|
433
|
+
rb_check_arity(argc, 0, 1);
|
434
|
+
VALUE Vstate = cState_from_state_s(cState, argc == 1 ? argv[0] : Qnil);
|
435
|
+
return cState_partial_generate(Vstate, self, generate_json_integer);
|
456
436
|
}
|
457
437
|
|
458
438
|
#else
|
@@ -463,7 +443,9 @@ static VALUE mInteger_to_json(int argc, VALUE *argv, VALUE self)
|
|
463
443
|
*/
|
464
444
|
static VALUE mFixnum_to_json(int argc, VALUE *argv, VALUE self)
|
465
445
|
{
|
466
|
-
|
446
|
+
rb_check_arity(argc, 0, 1);
|
447
|
+
VALUE Vstate = cState_from_state_s(cState, argc == 1 ? argv[0] : Qnil);
|
448
|
+
return cState_partial_generate(Vstate, self, generate_json_fixnum);
|
467
449
|
}
|
468
450
|
|
469
451
|
/*
|
@@ -473,7 +455,9 @@ static VALUE mFixnum_to_json(int argc, VALUE *argv, VALUE self)
|
|
473
455
|
*/
|
474
456
|
static VALUE mBignum_to_json(int argc, VALUE *argv, VALUE self)
|
475
457
|
{
|
476
|
-
|
458
|
+
rb_check_arity(argc, 0, 1);
|
459
|
+
VALUE Vstate = cState_from_state_s(cState, argc == 1 ? argv[0] : Qnil);
|
460
|
+
return cState_partial_generate(Vstate, self, generate_json_bignum);
|
477
461
|
}
|
478
462
|
#endif
|
479
463
|
|
@@ -484,7 +468,9 @@ static VALUE mBignum_to_json(int argc, VALUE *argv, VALUE self)
|
|
484
468
|
*/
|
485
469
|
static VALUE mFloat_to_json(int argc, VALUE *argv, VALUE self)
|
486
470
|
{
|
487
|
-
|
471
|
+
rb_check_arity(argc, 0, 1);
|
472
|
+
VALUE Vstate = cState_from_state_s(cState, argc == 1 ? argv[0] : Qnil);
|
473
|
+
return cState_partial_generate(Vstate, self, generate_json_float);
|
488
474
|
}
|
489
475
|
|
490
476
|
/*
|
@@ -507,7 +493,9 @@ static VALUE mString_included_s(VALUE self, VALUE modul) {
|
|
507
493
|
*/
|
508
494
|
static VALUE mString_to_json(int argc, VALUE *argv, VALUE self)
|
509
495
|
{
|
510
|
-
|
496
|
+
rb_check_arity(argc, 0, 1);
|
497
|
+
VALUE Vstate = cState_from_state_s(cState, argc == 1 ? argv[0] : Qnil);
|
498
|
+
return cState_partial_generate(Vstate, self, generate_json_string);
|
511
499
|
}
|
512
500
|
|
513
501
|
/*
|
@@ -562,7 +550,8 @@ static VALUE mString_Extend_json_create(VALUE self, VALUE o)
|
|
562
550
|
*/
|
563
551
|
static VALUE mTrueClass_to_json(int argc, VALUE *argv, VALUE self)
|
564
552
|
{
|
565
|
-
|
553
|
+
rb_check_arity(argc, 0, 1);
|
554
|
+
return rb_utf8_str_new("true", 4);
|
566
555
|
}
|
567
556
|
|
568
557
|
/*
|
@@ -572,7 +561,8 @@ static VALUE mTrueClass_to_json(int argc, VALUE *argv, VALUE self)
|
|
572
561
|
*/
|
573
562
|
static VALUE mFalseClass_to_json(int argc, VALUE *argv, VALUE self)
|
574
563
|
{
|
575
|
-
|
564
|
+
rb_check_arity(argc, 0, 1);
|
565
|
+
return rb_utf8_str_new("false", 5);
|
576
566
|
}
|
577
567
|
|
578
568
|
/*
|
@@ -582,7 +572,8 @@ static VALUE mFalseClass_to_json(int argc, VALUE *argv, VALUE self)
|
|
582
572
|
*/
|
583
573
|
static VALUE mNilClass_to_json(int argc, VALUE *argv, VALUE self)
|
584
574
|
{
|
585
|
-
|
575
|
+
rb_check_arity(argc, 0, 1);
|
576
|
+
return rb_utf8_str_new("null", 4);
|
586
577
|
}
|
587
578
|
|
588
579
|
/*
|
@@ -599,7 +590,7 @@ static VALUE mObject_to_json(int argc, VALUE *argv, VALUE self)
|
|
599
590
|
rb_scan_args(argc, argv, "01", &state);
|
600
591
|
Check_Type(string, T_STRING);
|
601
592
|
state = cState_from_state_s(cState, state);
|
602
|
-
return cState_partial_generate(state, string);
|
593
|
+
return cState_partial_generate(state, string, generate_json_string);
|
603
594
|
}
|
604
595
|
|
605
596
|
static void State_free(void *ptr)
|
@@ -610,9 +601,6 @@ static void State_free(void *ptr)
|
|
610
601
|
if (state->space_before) ruby_xfree(state->space_before);
|
611
602
|
if (state->object_nl) ruby_xfree(state->object_nl);
|
612
603
|
if (state->array_nl) ruby_xfree(state->array_nl);
|
613
|
-
if (state->array_delim) fbuffer_free(state->array_delim);
|
614
|
-
if (state->object_delim) fbuffer_free(state->object_delim);
|
615
|
-
if (state->object_delim2) fbuffer_free(state->object_delim2);
|
616
604
|
ruby_xfree(state);
|
617
605
|
}
|
618
606
|
|
@@ -625,9 +613,6 @@ static size_t State_memsize(const void *ptr)
|
|
625
613
|
if (state->space_before) size += state->space_before_len + 1;
|
626
614
|
if (state->object_nl) size += state->object_nl_len + 1;
|
627
615
|
if (state->array_nl) size += state->array_nl_len + 1;
|
628
|
-
if (state->array_delim) size += FBUFFER_CAPA(state->array_delim);
|
629
|
-
if (state->object_delim) size += FBUFFER_CAPA(state->object_delim);
|
630
|
-
if (state->object_delim2) size += FBUFFER_CAPA(state->object_delim2);
|
631
616
|
return size;
|
632
617
|
}
|
633
618
|
|
@@ -636,194 +621,20 @@ static size_t State_memsize(const void *ptr)
|
|
636
621
|
# define RUBY_TYPED_FROZEN_SHAREABLE 0
|
637
622
|
#endif
|
638
623
|
|
639
|
-
#ifdef NEW_TYPEDDATA_WRAPPER
|
640
624
|
static const rb_data_type_t JSON_Generator_State_type = {
|
641
625
|
"JSON/Generator/State",
|
642
626
|
{NULL, State_free, State_memsize,},
|
643
|
-
#ifdef RUBY_TYPED_FREE_IMMEDIATELY
|
644
627
|
0, 0,
|
645
|
-
RUBY_TYPED_FREE_IMMEDIATELY | RUBY_TYPED_FROZEN_SHAREABLE,
|
646
|
-
#endif
|
628
|
+
RUBY_TYPED_WB_PROTECTED | RUBY_TYPED_FREE_IMMEDIATELY | RUBY_TYPED_FROZEN_SHAREABLE,
|
647
629
|
};
|
648
|
-
#endif
|
649
630
|
|
650
631
|
static VALUE cState_s_allocate(VALUE klass)
|
651
632
|
{
|
652
633
|
JSON_Generator_State *state;
|
653
|
-
|
654
|
-
&JSON_Generator_State_type, state);
|
655
|
-
}
|
656
|
-
|
657
|
-
/*
|
658
|
-
* call-seq: configure(opts)
|
659
|
-
*
|
660
|
-
* Configure this State instance with the Hash _opts_, and return
|
661
|
-
* itself.
|
662
|
-
*/
|
663
|
-
static VALUE cState_configure(VALUE self, VALUE opts)
|
664
|
-
{
|
665
|
-
VALUE tmp;
|
666
|
-
GET_STATE(self);
|
667
|
-
tmp = rb_check_convert_type(opts, T_HASH, "Hash", "to_hash");
|
668
|
-
if (NIL_P(tmp)) tmp = rb_convert_type(opts, T_HASH, "Hash", "to_h");
|
669
|
-
opts = tmp;
|
670
|
-
tmp = rb_hash_aref(opts, ID2SYM(i_indent));
|
671
|
-
if (RTEST(tmp)) {
|
672
|
-
unsigned long len;
|
673
|
-
Check_Type(tmp, T_STRING);
|
674
|
-
len = RSTRING_LEN(tmp);
|
675
|
-
state->indent = fstrndup(RSTRING_PTR(tmp), len + 1);
|
676
|
-
state->indent_len = len;
|
677
|
-
}
|
678
|
-
tmp = rb_hash_aref(opts, ID2SYM(i_space));
|
679
|
-
if (RTEST(tmp)) {
|
680
|
-
unsigned long len;
|
681
|
-
Check_Type(tmp, T_STRING);
|
682
|
-
len = RSTRING_LEN(tmp);
|
683
|
-
state->space = fstrndup(RSTRING_PTR(tmp), len + 1);
|
684
|
-
state->space_len = len;
|
685
|
-
}
|
686
|
-
tmp = rb_hash_aref(opts, ID2SYM(i_space_before));
|
687
|
-
if (RTEST(tmp)) {
|
688
|
-
unsigned long len;
|
689
|
-
Check_Type(tmp, T_STRING);
|
690
|
-
len = RSTRING_LEN(tmp);
|
691
|
-
state->space_before = fstrndup(RSTRING_PTR(tmp), len + 1);
|
692
|
-
state->space_before_len = len;
|
693
|
-
}
|
694
|
-
tmp = rb_hash_aref(opts, ID2SYM(i_array_nl));
|
695
|
-
if (RTEST(tmp)) {
|
696
|
-
unsigned long len;
|
697
|
-
Check_Type(tmp, T_STRING);
|
698
|
-
len = RSTRING_LEN(tmp);
|
699
|
-
state->array_nl = fstrndup(RSTRING_PTR(tmp), len + 1);
|
700
|
-
state->array_nl_len = len;
|
701
|
-
}
|
702
|
-
tmp = rb_hash_aref(opts, ID2SYM(i_object_nl));
|
703
|
-
if (RTEST(tmp)) {
|
704
|
-
unsigned long len;
|
705
|
-
Check_Type(tmp, T_STRING);
|
706
|
-
len = RSTRING_LEN(tmp);
|
707
|
-
state->object_nl = fstrndup(RSTRING_PTR(tmp), len + 1);
|
708
|
-
state->object_nl_len = len;
|
709
|
-
}
|
710
|
-
tmp = ID2SYM(i_max_nesting);
|
634
|
+
VALUE obj = TypedData_Make_Struct(klass, JSON_Generator_State, &JSON_Generator_State_type, state);
|
711
635
|
state->max_nesting = 100;
|
712
|
-
|
713
|
-
|
714
|
-
if (RTEST(max_nesting)) {
|
715
|
-
Check_Type(max_nesting, T_FIXNUM);
|
716
|
-
state->max_nesting = FIX2LONG(max_nesting);
|
717
|
-
} else {
|
718
|
-
state->max_nesting = 0;
|
719
|
-
}
|
720
|
-
}
|
721
|
-
tmp = ID2SYM(i_depth);
|
722
|
-
state->depth = 0;
|
723
|
-
if (option_given_p(opts, tmp)) {
|
724
|
-
VALUE depth = rb_hash_aref(opts, tmp);
|
725
|
-
if (RTEST(depth)) {
|
726
|
-
Check_Type(depth, T_FIXNUM);
|
727
|
-
state->depth = FIX2LONG(depth);
|
728
|
-
} else {
|
729
|
-
state->depth = 0;
|
730
|
-
}
|
731
|
-
}
|
732
|
-
tmp = ID2SYM(i_buffer_initial_length);
|
733
|
-
if (option_given_p(opts, tmp)) {
|
734
|
-
VALUE buffer_initial_length = rb_hash_aref(opts, tmp);
|
735
|
-
if (RTEST(buffer_initial_length)) {
|
736
|
-
long initial_length;
|
737
|
-
Check_Type(buffer_initial_length, T_FIXNUM);
|
738
|
-
initial_length = FIX2LONG(buffer_initial_length);
|
739
|
-
if (initial_length > 0) state->buffer_initial_length = initial_length;
|
740
|
-
}
|
741
|
-
}
|
742
|
-
tmp = rb_hash_aref(opts, ID2SYM(i_allow_nan));
|
743
|
-
state->allow_nan = RTEST(tmp);
|
744
|
-
tmp = rb_hash_aref(opts, ID2SYM(i_ascii_only));
|
745
|
-
state->ascii_only = RTEST(tmp);
|
746
|
-
tmp = rb_hash_aref(opts, ID2SYM(i_script_safe));
|
747
|
-
state->script_safe = RTEST(tmp);
|
748
|
-
if (!state->script_safe) {
|
749
|
-
tmp = rb_hash_aref(opts, ID2SYM(i_escape_slash));
|
750
|
-
state->script_safe = RTEST(tmp);
|
751
|
-
}
|
752
|
-
tmp = rb_hash_aref(opts, ID2SYM(i_strict));
|
753
|
-
state->strict = RTEST(tmp);
|
754
|
-
return self;
|
755
|
-
}
|
756
|
-
|
757
|
-
static void set_state_ivars(VALUE hash, VALUE state)
|
758
|
-
{
|
759
|
-
VALUE ivars = rb_obj_instance_variables(state);
|
760
|
-
int i = 0;
|
761
|
-
for (i = 0; i < RARRAY_LEN(ivars); i++) {
|
762
|
-
VALUE key = rb_funcall(rb_ary_entry(ivars, i), i_to_s, 0);
|
763
|
-
long key_len = RSTRING_LEN(key);
|
764
|
-
VALUE value = rb_iv_get(state, StringValueCStr(key));
|
765
|
-
rb_hash_aset(hash, rb_str_intern(rb_str_substr(key, 1, key_len - 1)), value);
|
766
|
-
}
|
767
|
-
}
|
768
|
-
|
769
|
-
/*
|
770
|
-
* call-seq: to_h
|
771
|
-
*
|
772
|
-
* Returns the configuration instance variables as a hash, that can be
|
773
|
-
* passed to the configure method.
|
774
|
-
*/
|
775
|
-
static VALUE cState_to_h(VALUE self)
|
776
|
-
{
|
777
|
-
VALUE result = rb_hash_new();
|
778
|
-
GET_STATE(self);
|
779
|
-
set_state_ivars(result, self);
|
780
|
-
rb_hash_aset(result, ID2SYM(i_indent), rb_str_new(state->indent, state->indent_len));
|
781
|
-
rb_hash_aset(result, ID2SYM(i_space), rb_str_new(state->space, state->space_len));
|
782
|
-
rb_hash_aset(result, ID2SYM(i_space_before), rb_str_new(state->space_before, state->space_before_len));
|
783
|
-
rb_hash_aset(result, ID2SYM(i_object_nl), rb_str_new(state->object_nl, state->object_nl_len));
|
784
|
-
rb_hash_aset(result, ID2SYM(i_array_nl), rb_str_new(state->array_nl, state->array_nl_len));
|
785
|
-
rb_hash_aset(result, ID2SYM(i_allow_nan), state->allow_nan ? Qtrue : Qfalse);
|
786
|
-
rb_hash_aset(result, ID2SYM(i_ascii_only), state->ascii_only ? Qtrue : Qfalse);
|
787
|
-
rb_hash_aset(result, ID2SYM(i_max_nesting), LONG2FIX(state->max_nesting));
|
788
|
-
rb_hash_aset(result, ID2SYM(i_script_safe), state->script_safe ? Qtrue : Qfalse);
|
789
|
-
rb_hash_aset(result, ID2SYM(i_strict), state->strict ? Qtrue : Qfalse);
|
790
|
-
rb_hash_aset(result, ID2SYM(i_depth), LONG2FIX(state->depth));
|
791
|
-
rb_hash_aset(result, ID2SYM(i_buffer_initial_length), LONG2FIX(state->buffer_initial_length));
|
792
|
-
return result;
|
793
|
-
}
|
794
|
-
|
795
|
-
/*
|
796
|
-
* call-seq: [](name)
|
797
|
-
*
|
798
|
-
* Returns the value returned by method +name+.
|
799
|
-
*/
|
800
|
-
static VALUE cState_aref(VALUE self, VALUE name)
|
801
|
-
{
|
802
|
-
name = rb_funcall(name, i_to_s, 0);
|
803
|
-
if (RTEST(rb_funcall(self, i_respond_to_p, 1, name))) {
|
804
|
-
return rb_funcall(self, i_send, 1, name);
|
805
|
-
} else {
|
806
|
-
return rb_attr_get(self, rb_intern_str(rb_str_concat(rb_str_new2("@"), name)));
|
807
|
-
}
|
808
|
-
}
|
809
|
-
|
810
|
-
/*
|
811
|
-
* call-seq: []=(name, value)
|
812
|
-
*
|
813
|
-
* Sets the attribute name to value.
|
814
|
-
*/
|
815
|
-
static VALUE cState_aset(VALUE self, VALUE name, VALUE value)
|
816
|
-
{
|
817
|
-
VALUE name_writer;
|
818
|
-
|
819
|
-
name = rb_funcall(name, i_to_s, 0);
|
820
|
-
name_writer = rb_str_cat2(rb_str_dup(name), "=");
|
821
|
-
if (RTEST(rb_funcall(self, i_respond_to_p, 1, name_writer))) {
|
822
|
-
return rb_funcall(self, i_send, 2, name_writer, value);
|
823
|
-
} else {
|
824
|
-
rb_ivar_set(self, rb_intern_str(rb_str_concat(rb_str_new2("@"), name)), value);
|
825
|
-
}
|
826
|
-
return Qnil;
|
636
|
+
state->buffer_initial_length = FBUFFER_INITIAL_LENGTH_DEFAULT;
|
637
|
+
return obj;
|
827
638
|
}
|
828
639
|
|
829
640
|
struct hash_foreach_arg {
|
@@ -841,39 +652,36 @@ json_object_i(VALUE key, VALUE val, VALUE _arg)
|
|
841
652
|
JSON_Generator_State *state = arg->state;
|
842
653
|
VALUE Vstate = arg->Vstate;
|
843
654
|
|
844
|
-
char *object_nl = state->object_nl;
|
845
|
-
long object_nl_len = state->object_nl_len;
|
846
|
-
char *indent = state->indent;
|
847
|
-
long indent_len = state->indent_len;
|
848
|
-
char *delim = FBUFFER_PTR(state->object_delim);
|
849
|
-
long delim_len = FBUFFER_LEN(state->object_delim);
|
850
|
-
char *delim2 = FBUFFER_PTR(state->object_delim2);
|
851
|
-
long delim2_len = FBUFFER_LEN(state->object_delim2);
|
852
655
|
long depth = state->depth;
|
853
656
|
int j;
|
854
|
-
VALUE klass, key_to_s;
|
855
657
|
|
856
|
-
if (arg->iter > 0)
|
857
|
-
if (object_nl) {
|
858
|
-
fbuffer_append(buffer, object_nl, object_nl_len);
|
658
|
+
if (arg->iter > 0) fbuffer_append_char(buffer, ',');
|
659
|
+
if (RB_UNLIKELY(state->object_nl)) {
|
660
|
+
fbuffer_append(buffer, state->object_nl, state->object_nl_len);
|
859
661
|
}
|
860
|
-
if (indent) {
|
662
|
+
if (RB_UNLIKELY(state->indent)) {
|
861
663
|
for (j = 0; j < depth; j++) {
|
862
|
-
fbuffer_append(buffer, indent, indent_len);
|
664
|
+
fbuffer_append(buffer, state->indent, state->indent_len);
|
863
665
|
}
|
864
666
|
}
|
865
667
|
|
866
|
-
|
867
|
-
|
868
|
-
|
869
|
-
|
870
|
-
|
871
|
-
|
872
|
-
|
668
|
+
VALUE key_to_s;
|
669
|
+
switch(rb_type(key)) {
|
670
|
+
case T_STRING:
|
671
|
+
key_to_s = key;
|
672
|
+
break;
|
673
|
+
case T_SYMBOL:
|
674
|
+
key_to_s = rb_sym2str(key);
|
675
|
+
break;
|
676
|
+
default:
|
677
|
+
key_to_s = rb_convert_type(key, T_STRING, "String", "to_s");
|
678
|
+
break;
|
873
679
|
}
|
874
|
-
|
875
|
-
|
876
|
-
fbuffer_append(buffer,
|
680
|
+
|
681
|
+
generate_json_string(buffer, Vstate, state, key_to_s);
|
682
|
+
if (RB_UNLIKELY(state->space_before)) fbuffer_append(buffer, state->space_before, state->space_before_len);
|
683
|
+
fbuffer_append_char(buffer, ':');
|
684
|
+
if (RB_UNLIKELY(state->space)) fbuffer_append(buffer, state->space, state->space_len);
|
877
685
|
generate_json(buffer, Vstate, state, val);
|
878
686
|
|
879
687
|
arg->iter++;
|
@@ -882,10 +690,6 @@ json_object_i(VALUE key, VALUE val, VALUE _arg)
|
|
882
690
|
|
883
691
|
static void generate_json_object(FBuffer *buffer, VALUE Vstate, JSON_Generator_State *state, VALUE obj)
|
884
692
|
{
|
885
|
-
char *object_nl = state->object_nl;
|
886
|
-
long object_nl_len = state->object_nl_len;
|
887
|
-
char *indent = state->indent;
|
888
|
-
long indent_len = state->indent_len;
|
889
693
|
long max_nesting = state->max_nesting;
|
890
694
|
long depth = ++state->depth;
|
891
695
|
int j;
|
@@ -903,11 +707,11 @@ static void generate_json_object(FBuffer *buffer, VALUE Vstate, JSON_Generator_S
|
|
903
707
|
rb_hash_foreach(obj, json_object_i, (VALUE)&arg);
|
904
708
|
|
905
709
|
depth = --state->depth;
|
906
|
-
if (object_nl) {
|
907
|
-
fbuffer_append(buffer, object_nl, object_nl_len);
|
908
|
-
if (indent) {
|
710
|
+
if (RB_UNLIKELY(state->object_nl)) {
|
711
|
+
fbuffer_append(buffer, state->object_nl, state->object_nl_len);
|
712
|
+
if (RB_UNLIKELY(state->indent)) {
|
909
713
|
for (j = 0; j < depth; j++) {
|
910
|
-
fbuffer_append(buffer, indent, indent_len);
|
714
|
+
fbuffer_append(buffer, state->indent, state->indent_len);
|
911
715
|
}
|
912
716
|
}
|
913
717
|
}
|
@@ -916,62 +720,90 @@ static void generate_json_object(FBuffer *buffer, VALUE Vstate, JSON_Generator_S
|
|
916
720
|
|
917
721
|
static void generate_json_array(FBuffer *buffer, VALUE Vstate, JSON_Generator_State *state, VALUE obj)
|
918
722
|
{
|
919
|
-
char *array_nl = state->array_nl;
|
920
|
-
long array_nl_len = state->array_nl_len;
|
921
|
-
char *indent = state->indent;
|
922
|
-
long indent_len = state->indent_len;
|
923
723
|
long max_nesting = state->max_nesting;
|
924
|
-
char *delim = FBUFFER_PTR(state->array_delim);
|
925
|
-
long delim_len = FBUFFER_LEN(state->array_delim);
|
926
724
|
long depth = ++state->depth;
|
927
725
|
int i, j;
|
928
726
|
if (max_nesting != 0 && depth > max_nesting) {
|
929
727
|
rb_raise(eNestingError, "nesting of %ld is too deep", --state->depth);
|
930
728
|
}
|
931
729
|
fbuffer_append_char(buffer, '[');
|
932
|
-
if (array_nl) fbuffer_append(buffer, array_nl, array_nl_len);
|
730
|
+
if (RB_UNLIKELY(state->array_nl)) fbuffer_append(buffer, state->array_nl, state->array_nl_len);
|
933
731
|
for(i = 0; i < RARRAY_LEN(obj); i++) {
|
934
|
-
if (i > 0)
|
935
|
-
|
732
|
+
if (i > 0) {
|
733
|
+
fbuffer_append_char(buffer, ',');
|
734
|
+
if (RB_UNLIKELY(state->array_nl)) fbuffer_append(buffer, state->array_nl, state->array_nl_len);
|
735
|
+
}
|
736
|
+
if (RB_UNLIKELY(state->indent)) {
|
936
737
|
for (j = 0; j < depth; j++) {
|
937
|
-
fbuffer_append(buffer, indent, indent_len);
|
738
|
+
fbuffer_append(buffer, state->indent, state->indent_len);
|
938
739
|
}
|
939
740
|
}
|
940
|
-
generate_json(buffer, Vstate, state,
|
741
|
+
generate_json(buffer, Vstate, state, RARRAY_AREF(obj, i));
|
941
742
|
}
|
942
743
|
state->depth = --depth;
|
943
|
-
if (array_nl) {
|
944
|
-
fbuffer_append(buffer, array_nl, array_nl_len);
|
945
|
-
if (indent) {
|
744
|
+
if (RB_UNLIKELY(state->array_nl)) {
|
745
|
+
fbuffer_append(buffer, state->array_nl, state->array_nl_len);
|
746
|
+
if (RB_UNLIKELY(state->indent)) {
|
946
747
|
for (j = 0; j < depth; j++) {
|
947
|
-
fbuffer_append(buffer, indent, indent_len);
|
748
|
+
fbuffer_append(buffer, state->indent, state->indent_len);
|
948
749
|
}
|
949
750
|
}
|
950
751
|
}
|
951
752
|
fbuffer_append_char(buffer, ']');
|
952
753
|
}
|
953
754
|
|
954
|
-
|
955
|
-
|
755
|
+
static int usascii_encindex, utf8_encindex, binary_encindex;
|
756
|
+
|
757
|
+
static inline int enc_utf8_compatible_p(int enc_idx)
|
956
758
|
{
|
957
|
-
if (
|
958
|
-
if (
|
759
|
+
if (enc_idx == usascii_encindex) return 1;
|
760
|
+
if (enc_idx == utf8_encindex) return 1;
|
959
761
|
return 0;
|
960
762
|
}
|
961
|
-
|
763
|
+
|
764
|
+
static inline VALUE ensure_valid_encoding(VALUE str)
|
765
|
+
{
|
766
|
+
int encindex = RB_ENCODING_GET(str);
|
767
|
+
VALUE utf8_string;
|
768
|
+
if (RB_UNLIKELY(!enc_utf8_compatible_p(encindex))) {
|
769
|
+
if (encindex == binary_encindex) {
|
770
|
+
// For historical reason, we silently reinterpret binary strings as UTF-8 if it would work.
|
771
|
+
// TODO: Deprecate in 2.8.0
|
772
|
+
// TODO: Remove in 3.0.0
|
773
|
+
utf8_string = rb_enc_associate_index(rb_str_dup(str), utf8_encindex);
|
774
|
+
switch (rb_enc_str_coderange(utf8_string)) {
|
775
|
+
case ENC_CODERANGE_7BIT:
|
776
|
+
case ENC_CODERANGE_VALID:
|
777
|
+
return utf8_string;
|
778
|
+
break;
|
779
|
+
}
|
780
|
+
}
|
781
|
+
|
782
|
+
str = rb_funcall(str, i_encode, 1, Encoding_UTF_8);
|
783
|
+
}
|
784
|
+
return str;
|
785
|
+
}
|
962
786
|
|
963
787
|
static void generate_json_string(FBuffer *buffer, VALUE Vstate, JSON_Generator_State *state, VALUE obj)
|
964
788
|
{
|
789
|
+
obj = ensure_valid_encoding(obj);
|
790
|
+
|
965
791
|
fbuffer_append_char(buffer, '"');
|
966
|
-
|
967
|
-
|
968
|
-
|
969
|
-
|
970
|
-
|
971
|
-
|
972
|
-
|
973
|
-
|
974
|
-
|
792
|
+
|
793
|
+
switch(rb_enc_str_coderange(obj)) {
|
794
|
+
case ENC_CODERANGE_7BIT:
|
795
|
+
convert_ASCII_to_JSON(buffer, obj, state->script_safe ? script_safe_escape_table : escape_table);
|
796
|
+
break;
|
797
|
+
case ENC_CODERANGE_VALID:
|
798
|
+
if (RB_UNLIKELY(state->ascii_only)) {
|
799
|
+
convert_UTF8_to_ASCII_only_JSON(buffer, obj, state->script_safe ? script_safe_escape_table : escape_table, state->script_safe);
|
800
|
+
} else {
|
801
|
+
convert_UTF8_to_JSON(buffer, obj, state->script_safe ? script_safe_escape_table : escape_table, state->script_safe);
|
802
|
+
}
|
803
|
+
break;
|
804
|
+
default:
|
805
|
+
rb_raise(rb_path2class("JSON::GeneratorError"), "source sequence is illegal/malformed utf-8");
|
806
|
+
break;
|
975
807
|
}
|
976
808
|
fbuffer_append_char(buffer, '"');
|
977
809
|
}
|
@@ -1011,6 +843,7 @@ static void generate_json_integer(FBuffer *buffer, VALUE Vstate, JSON_Generator_
|
|
1011
843
|
generate_json_bignum(buffer, Vstate, state, obj);
|
1012
844
|
}
|
1013
845
|
#endif
|
846
|
+
|
1014
847
|
static void generate_json_float(FBuffer *buffer, VALUE Vstate, JSON_Generator_State *state, VALUE obj)
|
1015
848
|
{
|
1016
849
|
double value = RFLOAT_VALUE(obj);
|
@@ -1018,9 +851,9 @@ static void generate_json_float(FBuffer *buffer, VALUE Vstate, JSON_Generator_St
|
|
1018
851
|
VALUE tmp = rb_funcall(obj, i_to_s, 0);
|
1019
852
|
if (!allow_nan) {
|
1020
853
|
if (isinf(value)) {
|
1021
|
-
rb_raise(eGeneratorError, "%"PRIsVALUE" not allowed in JSON",
|
854
|
+
rb_raise(eGeneratorError, "%"PRIsVALUE" not allowed in JSON", tmp);
|
1022
855
|
} else if (isnan(value)) {
|
1023
|
-
rb_raise(eGeneratorError, "%"PRIsVALUE" not allowed in JSON",
|
856
|
+
rb_raise(eGeneratorError, "%"PRIsVALUE" not allowed in JSON", tmp);
|
1024
857
|
}
|
1025
858
|
}
|
1026
859
|
fbuffer_append_str(buffer, tmp);
|
@@ -1029,35 +862,56 @@ static void generate_json_float(FBuffer *buffer, VALUE Vstate, JSON_Generator_St
|
|
1029
862
|
static void generate_json(FBuffer *buffer, VALUE Vstate, JSON_Generator_State *state, VALUE obj)
|
1030
863
|
{
|
1031
864
|
VALUE tmp;
|
1032
|
-
|
1033
|
-
if (klass == rb_cHash) {
|
1034
|
-
generate_json_object(buffer, Vstate, state, obj);
|
1035
|
-
} else if (klass == rb_cArray) {
|
1036
|
-
generate_json_array(buffer, Vstate, state, obj);
|
1037
|
-
} else if (klass == rb_cString) {
|
1038
|
-
generate_json_string(buffer, Vstate, state, obj);
|
1039
|
-
} else if (obj == Qnil) {
|
865
|
+
if (obj == Qnil) {
|
1040
866
|
generate_json_null(buffer, Vstate, state, obj);
|
1041
867
|
} else if (obj == Qfalse) {
|
1042
868
|
generate_json_false(buffer, Vstate, state, obj);
|
1043
869
|
} else if (obj == Qtrue) {
|
1044
870
|
generate_json_true(buffer, Vstate, state, obj);
|
1045
|
-
} else if (
|
1046
|
-
|
1047
|
-
|
1048
|
-
|
1049
|
-
|
1050
|
-
|
1051
|
-
|
1052
|
-
|
1053
|
-
} else if (rb_respond_to(obj, i_to_json)) {
|
1054
|
-
tmp = rb_funcall(obj, i_to_json, 1, Vstate);
|
1055
|
-
Check_Type(tmp, T_STRING);
|
1056
|
-
fbuffer_append_str(buffer, tmp);
|
871
|
+
} else if (RB_SPECIAL_CONST_P(obj)) {
|
872
|
+
if (RB_FIXNUM_P(obj)) {
|
873
|
+
generate_json_fixnum(buffer, Vstate, state, obj);
|
874
|
+
} else if (RB_FLONUM_P(obj)) {
|
875
|
+
generate_json_float(buffer, Vstate, state, obj);
|
876
|
+
} else {
|
877
|
+
goto general;
|
878
|
+
}
|
1057
879
|
} else {
|
1058
|
-
|
1059
|
-
|
1060
|
-
|
880
|
+
VALUE klass = RBASIC_CLASS(obj);
|
881
|
+
switch (RB_BUILTIN_TYPE(obj)) {
|
882
|
+
case T_BIGNUM:
|
883
|
+
generate_json_bignum(buffer, Vstate, state, obj);
|
884
|
+
break;
|
885
|
+
case T_HASH:
|
886
|
+
if (klass != rb_cHash) goto general;
|
887
|
+
generate_json_object(buffer, Vstate, state, obj);
|
888
|
+
break;
|
889
|
+
case T_ARRAY:
|
890
|
+
if (klass != rb_cArray) goto general;
|
891
|
+
generate_json_array(buffer, Vstate, state, obj);
|
892
|
+
break;
|
893
|
+
case T_STRING:
|
894
|
+
if (klass != rb_cString) goto general;
|
895
|
+
generate_json_string(buffer, Vstate, state, obj);
|
896
|
+
break;
|
897
|
+
case T_FLOAT:
|
898
|
+
if (klass != rb_cFloat) goto general;
|
899
|
+
generate_json_float(buffer, Vstate, state, obj);
|
900
|
+
break;
|
901
|
+
default:
|
902
|
+
general:
|
903
|
+
if (state->strict) {
|
904
|
+
rb_raise(eGeneratorError, "%"PRIsVALUE" not allowed in JSON", CLASS_OF(obj));
|
905
|
+
} else if (rb_respond_to(obj, i_to_json)) {
|
906
|
+
tmp = rb_funcall(obj, i_to_json, 1, Vstate);
|
907
|
+
Check_Type(tmp, T_STRING);
|
908
|
+
fbuffer_append_str(buffer, tmp);
|
909
|
+
} else {
|
910
|
+
tmp = rb_funcall(obj, i_to_s, 0);
|
911
|
+
Check_Type(tmp, T_STRING);
|
912
|
+
generate_json_string(buffer, Vstate, state, tmp);
|
913
|
+
}
|
914
|
+
}
|
1061
915
|
}
|
1062
916
|
}
|
1063
917
|
|
@@ -1067,28 +921,6 @@ static FBuffer *cState_prepare_buffer(VALUE self)
|
|
1067
921
|
GET_STATE(self);
|
1068
922
|
buffer = fbuffer_alloc(state->buffer_initial_length);
|
1069
923
|
|
1070
|
-
if (state->object_delim) {
|
1071
|
-
fbuffer_clear(state->object_delim);
|
1072
|
-
} else {
|
1073
|
-
state->object_delim = fbuffer_alloc(16);
|
1074
|
-
}
|
1075
|
-
fbuffer_append_char(state->object_delim, ',');
|
1076
|
-
if (state->object_delim2) {
|
1077
|
-
fbuffer_clear(state->object_delim2);
|
1078
|
-
} else {
|
1079
|
-
state->object_delim2 = fbuffer_alloc(16);
|
1080
|
-
}
|
1081
|
-
if (state->space_before) fbuffer_append(state->object_delim2, state->space_before, state->space_before_len);
|
1082
|
-
fbuffer_append_char(state->object_delim2, ':');
|
1083
|
-
if (state->space) fbuffer_append(state->object_delim2, state->space, state->space_len);
|
1084
|
-
|
1085
|
-
if (state->array_delim) {
|
1086
|
-
fbuffer_clear(state->array_delim);
|
1087
|
-
} else {
|
1088
|
-
state->array_delim = fbuffer_alloc(16);
|
1089
|
-
}
|
1090
|
-
fbuffer_append_char(state->array_delim, ',');
|
1091
|
-
if (state->array_nl) fbuffer_append(state->array_delim, state->array_nl, state->array_nl_len);
|
1092
924
|
return buffer;
|
1093
925
|
}
|
1094
926
|
|
@@ -1097,13 +929,14 @@ struct generate_json_data {
|
|
1097
929
|
VALUE vstate;
|
1098
930
|
JSON_Generator_State *state;
|
1099
931
|
VALUE obj;
|
932
|
+
void (*func)(FBuffer *buffer, VALUE Vstate, JSON_Generator_State *state, VALUE obj);
|
1100
933
|
};
|
1101
934
|
|
1102
935
|
static VALUE generate_json_try(VALUE d)
|
1103
936
|
{
|
1104
937
|
struct generate_json_data *data = (struct generate_json_data *)d;
|
1105
938
|
|
1106
|
-
|
939
|
+
data->func(data->buffer, data->vstate, data->state, data->obj);
|
1107
940
|
|
1108
941
|
return Qnil;
|
1109
942
|
}
|
@@ -1118,7 +951,7 @@ static VALUE generate_json_rescue(VALUE d, VALUE exc)
|
|
1118
951
|
return Qundef;
|
1119
952
|
}
|
1120
953
|
|
1121
|
-
static VALUE cState_partial_generate(VALUE self, VALUE obj)
|
954
|
+
static VALUE cState_partial_generate(VALUE self, VALUE obj, void (*func)(FBuffer *buffer, VALUE Vstate, JSON_Generator_State *state, VALUE obj))
|
1122
955
|
{
|
1123
956
|
FBuffer *buffer = cState_prepare_buffer(self);
|
1124
957
|
GET_STATE(self);
|
@@ -1127,7 +960,8 @@ static VALUE cState_partial_generate(VALUE self, VALUE obj)
|
|
1127
960
|
.buffer = buffer,
|
1128
961
|
.vstate = self,
|
1129
962
|
.state = state,
|
1130
|
-
.obj = obj
|
963
|
+
.obj = obj,
|
964
|
+
.func = func
|
1131
965
|
};
|
1132
966
|
rb_rescue(generate_json_try, (VALUE)&data, generate_json_rescue, (VALUE)&data);
|
1133
967
|
|
@@ -1143,40 +977,15 @@ static VALUE cState_partial_generate(VALUE self, VALUE obj)
|
|
1143
977
|
*/
|
1144
978
|
static VALUE cState_generate(VALUE self, VALUE obj)
|
1145
979
|
{
|
1146
|
-
VALUE result = cState_partial_generate(self, obj);
|
980
|
+
VALUE result = cState_partial_generate(self, obj, generate_json);
|
1147
981
|
GET_STATE(self);
|
1148
982
|
(void)state;
|
1149
983
|
return result;
|
1150
984
|
}
|
1151
985
|
|
1152
|
-
/*
|
1153
|
-
* call-seq: new(opts = {})
|
1154
|
-
*
|
1155
|
-
* Instantiates a new State object, configured by _opts_.
|
1156
|
-
*
|
1157
|
-
* _opts_ can have the following keys:
|
1158
|
-
*
|
1159
|
-
* * *indent*: a string used to indent levels (default: ''),
|
1160
|
-
* * *space*: a string that is put after, a : or , delimiter (default: ''),
|
1161
|
-
* * *space_before*: a string that is put before a : pair delimiter (default: ''),
|
1162
|
-
* * *object_nl*: a string that is put at the end of a JSON object (default: ''),
|
1163
|
-
* * *array_nl*: a string that is put at the end of a JSON array (default: ''),
|
1164
|
-
* * *allow_nan*: true if NaN, Infinity, and -Infinity should be
|
1165
|
-
* generated, otherwise an exception is thrown, if these values are
|
1166
|
-
* encountered. This options defaults to false.
|
1167
|
-
* * *ascii_only*: true if only ASCII characters should be generated. This
|
1168
|
-
* option defaults to false.
|
1169
|
-
* * *buffer_initial_length*: sets the initial length of the generator's
|
1170
|
-
* internal buffer.
|
1171
|
-
*/
|
1172
986
|
static VALUE cState_initialize(int argc, VALUE *argv, VALUE self)
|
1173
987
|
{
|
1174
|
-
|
1175
|
-
GET_STATE(self);
|
1176
|
-
state->max_nesting = 100;
|
1177
|
-
state->buffer_initial_length = FBUFFER_INITIAL_LENGTH_DEFAULT;
|
1178
|
-
rb_scan_args(argc, argv, "01", &opts);
|
1179
|
-
if (!NIL_P(opts)) cState_configure(self, opts);
|
988
|
+
rb_warn("The json gem extension was loaded with the stdlib ruby code. You should upgrade rubygems with `gem update --system`");
|
1180
989
|
return self;
|
1181
990
|
}
|
1182
991
|
|
@@ -1201,9 +1010,6 @@ static VALUE cState_init_copy(VALUE obj, VALUE orig)
|
|
1201
1010
|
objState->space_before = fstrndup(origState->space_before, origState->space_before_len);
|
1202
1011
|
objState->object_nl = fstrndup(origState->object_nl, origState->object_nl_len);
|
1203
1012
|
objState->array_nl = fstrndup(origState->array_nl, origState->array_nl_len);
|
1204
|
-
if (origState->array_delim) objState->array_delim = fbuffer_dup(origState->array_delim);
|
1205
|
-
if (origState->object_delim) objState->object_delim = fbuffer_dup(origState->object_delim);
|
1206
|
-
if (origState->object_delim2) objState->object_delim2 = fbuffer_dup(origState->object_delim2);
|
1207
1013
|
return obj;
|
1208
1014
|
}
|
1209
1015
|
|
@@ -1442,7 +1248,8 @@ static VALUE cState_max_nesting_set(VALUE self, VALUE depth)
|
|
1442
1248
|
{
|
1443
1249
|
GET_STATE(self);
|
1444
1250
|
Check_Type(depth, T_FIXNUM);
|
1445
|
-
|
1251
|
+
state->max_nesting = FIX2LONG(depth);
|
1252
|
+
return Qnil;
|
1446
1253
|
}
|
1447
1254
|
|
1448
1255
|
/*
|
@@ -1513,6 +1320,18 @@ static VALUE cState_allow_nan_p(VALUE self)
|
|
1513
1320
|
return state->allow_nan ? Qtrue : Qfalse;
|
1514
1321
|
}
|
1515
1322
|
|
1323
|
+
/*
|
1324
|
+
* call-seq: allow_nan=(enable)
|
1325
|
+
*
|
1326
|
+
* This sets whether or not to serialize NaN, Infinity, and -Infinity
|
1327
|
+
*/
|
1328
|
+
static VALUE cState_allow_nan_set(VALUE self, VALUE enable)
|
1329
|
+
{
|
1330
|
+
GET_STATE(self);
|
1331
|
+
state->allow_nan = RTEST(enable);
|
1332
|
+
return Qnil;
|
1333
|
+
}
|
1334
|
+
|
1516
1335
|
/*
|
1517
1336
|
* call-seq: ascii_only?
|
1518
1337
|
*
|
@@ -1525,6 +1344,18 @@ static VALUE cState_ascii_only_p(VALUE self)
|
|
1525
1344
|
return state->ascii_only ? Qtrue : Qfalse;
|
1526
1345
|
}
|
1527
1346
|
|
1347
|
+
/*
|
1348
|
+
* call-seq: ascii_only=(enable)
|
1349
|
+
*
|
1350
|
+
* This sets whether only ASCII characters should be generated.
|
1351
|
+
*/
|
1352
|
+
static VALUE cState_ascii_only_set(VALUE self, VALUE enable)
|
1353
|
+
{
|
1354
|
+
GET_STATE(self);
|
1355
|
+
state->ascii_only = RTEST(enable);
|
1356
|
+
return Qnil;
|
1357
|
+
}
|
1358
|
+
|
1528
1359
|
/*
|
1529
1360
|
* call-seq: depth
|
1530
1361
|
*
|
@@ -1592,8 +1423,8 @@ void Init_generator(void)
|
|
1592
1423
|
rb_require("json/common");
|
1593
1424
|
|
1594
1425
|
mJSON = rb_define_module("JSON");
|
1595
|
-
mExt = rb_define_module_under(mJSON, "Ext");
|
1596
|
-
mGenerator = rb_define_module_under(mExt, "Generator");
|
1426
|
+
VALUE mExt = rb_define_module_under(mJSON, "Ext");
|
1427
|
+
VALUE mGenerator = rb_define_module_under(mExt, "Generator");
|
1597
1428
|
|
1598
1429
|
eGeneratorError = rb_path2class("JSON::GeneratorError");
|
1599
1430
|
eNestingError = rb_path2class("JSON::NestingError");
|
@@ -1604,6 +1435,8 @@ void Init_generator(void)
|
|
1604
1435
|
rb_define_alloc_func(cState, cState_s_allocate);
|
1605
1436
|
rb_define_singleton_method(cState, "from_state", cState_from_state_s, 1);
|
1606
1437
|
rb_define_method(cState, "initialize", cState_initialize, -1);
|
1438
|
+
rb_define_alias(cState, "initialize", "initialize"); // avoid method redefinition warnings
|
1439
|
+
|
1607
1440
|
rb_define_method(cState, "initialize_copy", cState_init_copy, 1);
|
1608
1441
|
rb_define_method(cState, "indent", cState_indent, 0);
|
1609
1442
|
rb_define_method(cState, "indent=", cState_indent_set, 1);
|
@@ -1628,76 +1461,72 @@ void Init_generator(void)
|
|
1628
1461
|
rb_define_method(cState, "strict=", cState_strict_set, 1);
|
1629
1462
|
rb_define_method(cState, "check_circular?", cState_check_circular_p, 0);
|
1630
1463
|
rb_define_method(cState, "allow_nan?", cState_allow_nan_p, 0);
|
1464
|
+
rb_define_method(cState, "allow_nan=", cState_allow_nan_set, 1);
|
1631
1465
|
rb_define_method(cState, "ascii_only?", cState_ascii_only_p, 0);
|
1466
|
+
rb_define_method(cState, "ascii_only=", cState_ascii_only_set, 1);
|
1632
1467
|
rb_define_method(cState, "depth", cState_depth, 0);
|
1633
1468
|
rb_define_method(cState, "depth=", cState_depth_set, 1);
|
1634
1469
|
rb_define_method(cState, "buffer_initial_length", cState_buffer_initial_length, 0);
|
1635
1470
|
rb_define_method(cState, "buffer_initial_length=", cState_buffer_initial_length_set, 1);
|
1636
|
-
rb_define_method(cState, "configure", cState_configure, 1);
|
1637
|
-
rb_define_alias(cState, "merge", "configure");
|
1638
|
-
rb_define_method(cState, "to_h", cState_to_h, 0);
|
1639
|
-
rb_define_alias(cState, "to_hash", "to_h");
|
1640
|
-
rb_define_method(cState, "[]", cState_aref, 1);
|
1641
|
-
rb_define_method(cState, "[]=", cState_aset, 2);
|
1642
1471
|
rb_define_method(cState, "generate", cState_generate, 1);
|
1643
1472
|
|
1644
|
-
mGeneratorMethods = rb_define_module_under(mGenerator, "GeneratorMethods");
|
1645
|
-
|
1473
|
+
VALUE mGeneratorMethods = rb_define_module_under(mGenerator, "GeneratorMethods");
|
1474
|
+
|
1475
|
+
VALUE mObject = rb_define_module_under(mGeneratorMethods, "Object");
|
1646
1476
|
rb_define_method(mObject, "to_json", mObject_to_json, -1);
|
1647
|
-
|
1477
|
+
|
1478
|
+
VALUE mHash = rb_define_module_under(mGeneratorMethods, "Hash");
|
1648
1479
|
rb_define_method(mHash, "to_json", mHash_to_json, -1);
|
1649
|
-
|
1480
|
+
|
1481
|
+
VALUE mArray = rb_define_module_under(mGeneratorMethods, "Array");
|
1650
1482
|
rb_define_method(mArray, "to_json", mArray_to_json, -1);
|
1483
|
+
|
1651
1484
|
#ifdef RUBY_INTEGER_UNIFICATION
|
1652
|
-
mInteger = rb_define_module_under(mGeneratorMethods, "Integer");
|
1485
|
+
VALUE mInteger = rb_define_module_under(mGeneratorMethods, "Integer");
|
1653
1486
|
rb_define_method(mInteger, "to_json", mInteger_to_json, -1);
|
1654
1487
|
#else
|
1655
|
-
mFixnum = rb_define_module_under(mGeneratorMethods, "Fixnum");
|
1488
|
+
VALUE mFixnum = rb_define_module_under(mGeneratorMethods, "Fixnum");
|
1656
1489
|
rb_define_method(mFixnum, "to_json", mFixnum_to_json, -1);
|
1657
|
-
|
1490
|
+
|
1491
|
+
VALUE mBignum = rb_define_module_under(mGeneratorMethods, "Bignum");
|
1658
1492
|
rb_define_method(mBignum, "to_json", mBignum_to_json, -1);
|
1659
1493
|
#endif
|
1660
|
-
mFloat = rb_define_module_under(mGeneratorMethods, "Float");
|
1494
|
+
VALUE mFloat = rb_define_module_under(mGeneratorMethods, "Float");
|
1661
1495
|
rb_define_method(mFloat, "to_json", mFloat_to_json, -1);
|
1662
|
-
|
1496
|
+
|
1497
|
+
VALUE mString = rb_define_module_under(mGeneratorMethods, "String");
|
1663
1498
|
rb_define_singleton_method(mString, "included", mString_included_s, 1);
|
1664
1499
|
rb_define_method(mString, "to_json", mString_to_json, -1);
|
1665
1500
|
rb_define_method(mString, "to_json_raw", mString_to_json_raw, -1);
|
1666
1501
|
rb_define_method(mString, "to_json_raw_object", mString_to_json_raw_object, 0);
|
1502
|
+
|
1667
1503
|
mString_Extend = rb_define_module_under(mString, "Extend");
|
1668
1504
|
rb_define_method(mString_Extend, "json_create", mString_Extend_json_create, 1);
|
1669
|
-
|
1505
|
+
|
1506
|
+
VALUE mTrueClass = rb_define_module_under(mGeneratorMethods, "TrueClass");
|
1670
1507
|
rb_define_method(mTrueClass, "to_json", mTrueClass_to_json, -1);
|
1671
|
-
|
1508
|
+
|
1509
|
+
VALUE mFalseClass = rb_define_module_under(mGeneratorMethods, "FalseClass");
|
1672
1510
|
rb_define_method(mFalseClass, "to_json", mFalseClass_to_json, -1);
|
1673
|
-
|
1511
|
+
|
1512
|
+
VALUE mNilClass = rb_define_module_under(mGeneratorMethods, "NilClass");
|
1674
1513
|
rb_define_method(mNilClass, "to_json", mNilClass_to_json, -1);
|
1675
1514
|
|
1515
|
+
rb_global_variable(&Encoding_UTF_8);
|
1516
|
+
Encoding_UTF_8 = rb_const_get(rb_path2class("Encoding"), rb_intern("UTF_8"));
|
1517
|
+
|
1676
1518
|
i_to_s = rb_intern("to_s");
|
1677
1519
|
i_to_json = rb_intern("to_json");
|
1678
1520
|
i_new = rb_intern("new");
|
1679
|
-
i_indent = rb_intern("indent");
|
1680
|
-
i_space = rb_intern("space");
|
1681
|
-
i_space_before = rb_intern("space_before");
|
1682
|
-
i_object_nl = rb_intern("object_nl");
|
1683
|
-
i_array_nl = rb_intern("array_nl");
|
1684
|
-
i_max_nesting = rb_intern("max_nesting");
|
1685
|
-
i_script_safe = rb_intern("script_safe");
|
1686
|
-
i_escape_slash = rb_intern("escape_slash");
|
1687
|
-
i_strict = rb_intern("strict");
|
1688
|
-
i_allow_nan = rb_intern("allow_nan");
|
1689
|
-
i_ascii_only = rb_intern("ascii_only");
|
1690
|
-
i_depth = rb_intern("depth");
|
1691
|
-
i_buffer_initial_length = rb_intern("buffer_initial_length");
|
1692
1521
|
i_pack = rb_intern("pack");
|
1693
1522
|
i_unpack = rb_intern("unpack");
|
1694
1523
|
i_create_id = rb_intern("create_id");
|
1695
1524
|
i_extend = rb_intern("extend");
|
1696
|
-
|
1697
|
-
|
1698
|
-
|
1699
|
-
|
1700
|
-
|
1701
|
-
|
1702
|
-
|
1525
|
+
i_encode = rb_intern("encode");
|
1526
|
+
|
1527
|
+
usascii_encindex = rb_usascii_encindex();
|
1528
|
+
utf8_encindex = rb_utf8_encindex();
|
1529
|
+
binary_encindex = rb_ascii8bit_encindex();
|
1530
|
+
|
1531
|
+
rb_require("json/ext/generator/state");
|
1703
1532
|
}
|