diff options
author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-03-11 13:36:06 +0000 |
---|---|---|
committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-03-11 13:36:06 +0000 |
commit | 4d8d3184d18b1a9d2eadb86a6688dc62eca7eabc (patch) | |
tree | 03e3a00e4e484ffdb46d5d774ab887dc695b8ed0 /ext/json | |
parent | 9d9ab5a384de3877f29cef8c0293c1caa432692c (diff) |
* ext/json: Merge 164a75c8bd2007d32c4d7665d53140d8fc126dcd.
[ruby-core:41917] [Bug #5846]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@34971 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/json')
-rw-r--r-- | ext/json/generator/extconf.rb | 7 | ||||
-rw-r--r-- | ext/json/generator/generator.c | 187 | ||||
-rw-r--r-- | ext/json/generator/generator.h | 47 | ||||
-rw-r--r-- | ext/json/lib/json/add/core.rb | 250 | ||||
-rw-r--r-- | ext/json/lib/json/common.rb | 45 | ||||
-rw-r--r-- | ext/json/lib/json/ext.rb | 6 | ||||
-rw-r--r-- | ext/json/lib/json/version.rb | 2 | ||||
-rw-r--r-- | ext/json/parser/extconf.rb | 7 | ||||
-rw-r--r-- | ext/json/parser/parser.c | 191 | ||||
-rw-r--r-- | ext/json/parser/parser.h | 9 | ||||
-rw-r--r-- | ext/json/parser/parser.rl | 24 |
11 files changed, 240 insertions, 535 deletions
diff --git a/ext/json/generator/extconf.rb b/ext/json/generator/extconf.rb index b94f71e8b3..75c76ce15b 100644 --- a/ext/json/generator/extconf.rb +++ b/ext/json/generator/extconf.rb @@ -1,10 +1,3 @@ require 'mkmf' -require 'rbconfig' -if RUBY_VERSION < "1.9" - have_header("re.h") -else - have_header("ruby/re.h") - have_header("ruby/encoding.h") -end create_makefile 'json/ext/generator' diff --git a/ext/json/generator/generator.c b/ext/json/generator/generator.c index 781e9e6168..21fef2b657 100644 --- a/ext/json/generator/generator.c +++ b/ext/json/generator/generator.c @@ -1,3 +1,4 @@ +#include "../fbuffer/fbuffer.h" #include "generator.h" #ifdef HAVE_RUBY_ENCODING_H @@ -14,7 +15,8 @@ static VALUE mJSON, mExt, mGenerator, cState, mGeneratorMethods, mObject, static ID i_to_s, i_to_json, i_new, i_indent, i_space, i_space_before, i_object_nl, i_array_nl, i_max_nesting, i_allow_nan, i_ascii_only, i_quirks_mode, i_pack, i_unpack, i_create_id, i_extend, i_key_p, - i_aref, i_send, i_respond_to_p, i_match, i_keys, i_depth, i_dup; + i_aref, i_send, i_respond_to_p, i_match, i_keys, i_depth, + i_buffer_initial_length, i_dup; /* * Copyright 2001-2004 Unicode, Inc. @@ -292,123 +294,6 @@ static char *fstrndup(const char *ptr, unsigned long len) { return result; } -/* fbuffer implementation */ - -static FBuffer *fbuffer_alloc() -{ - FBuffer *fb = ALLOC(FBuffer); - memset((void *) fb, 0, sizeof(FBuffer)); - fb->initial_length = FBUFFER_INITIAL_LENGTH; - return fb; -} - -static FBuffer *fbuffer_alloc_with_length(unsigned long initial_length) -{ - FBuffer *fb; - assert(initial_length > 0); - fb = ALLOC(FBuffer); - memset((void *) fb, 0, sizeof(FBuffer)); - fb->initial_length = initial_length; - return fb; -} - -static void fbuffer_free(FBuffer *fb) -{ - if (fb->ptr) ruby_xfree(fb->ptr); - ruby_xfree(fb); -} - -static void fbuffer_clear(FBuffer *fb) -{ - fb->len = 0; -} - -static void fbuffer_inc_capa(FBuffer *fb, unsigned long requested) -{ - unsigned long required; - - if (!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); - - if (required > fb->capa) { - REALLOC_N(fb->ptr, char, required); - fb->capa = required; - } -} - -static void fbuffer_append(FBuffer *fb, const char *newstr, unsigned long len) -{ - if (len > 0) { - fbuffer_inc_capa(fb, len); - MEMCPY(fb->ptr + fb->len, newstr, char, len); - fb->len += len; - } -} - -static void fbuffer_append_str(FBuffer *fb, VALUE str) -{ - const char *newstr = StringValuePtr(str); - unsigned long len = RSTRING_LEN(str); - - RB_GC_GUARD(str); - - fbuffer_append(fb, newstr, len); -} - -static void fbuffer_append_char(FBuffer *fb, char newchr) -{ - fbuffer_inc_capa(fb, 1); - *(fb->ptr + fb->len) = newchr; - fb->len++; -} - -static void freverse(char *start, char *end) -{ - char c; - - while (end > start) { - c = *end, *end-- = *start, *start++ = c; - } -} - -static long fltoa(long number, char *buf) -{ - static char digits[] = "0123456789"; - long sign = number; - char* tmp = buf; - - if (sign < 0) number = -number; - do *tmp++ = digits[number % 10]; while (number /= 10); - if (sign < 0) *tmp++ = '-'; - freverse(buf, tmp - 1); - return tmp - buf; -} - -static void fbuffer_append_long(FBuffer *fb, long number) -{ - char buf[20]; - unsigned long len = fltoa(number, buf); - fbuffer_append(fb, buf, len); -} - -static FBuffer *fbuffer_dup(FBuffer *fb) -{ - unsigned long len = fb->len; - FBuffer *result; - - if (len > 0) { - result = fbuffer_alloc_with_length(len); - fbuffer_append(result, FBUFFER_PAIR(fb)); - } else { - result = fbuffer_alloc(); - } - return result; -} - /* * Document-module: JSON::Ext::Generator * @@ -694,6 +579,16 @@ static VALUE cState_configure(VALUE self, VALUE opts) state->depth = 0; } } + tmp = ID2SYM(i_buffer_initial_length); + if (option_given_p(opts, tmp)) { + VALUE buffer_initial_length = rb_hash_aref(opts, tmp); + if (RTEST(buffer_initial_length)) { + long initial_length; + Check_Type(buffer_initial_length, T_FIXNUM); + initial_length = FIX2LONG(buffer_initial_length); + if (initial_length > 0) state->buffer_initial_length = initial_length; + } + } tmp = rb_hash_aref(opts, ID2SYM(i_allow_nan)); state->allow_nan = RTEST(tmp); tmp = rb_hash_aref(opts, ID2SYM(i_ascii_only)); @@ -723,6 +618,7 @@ static VALUE cState_to_h(VALUE self) rb_hash_aset(result, ID2SYM(i_quirks_mode), state->quirks_mode ? Qtrue : Qfalse); rb_hash_aset(result, ID2SYM(i_max_nesting), LONG2FIX(state->max_nesting)); rb_hash_aset(result, ID2SYM(i_depth), LONG2FIX(state->depth)); + rb_hash_aset(result, ID2SYM(i_buffer_initial_length), LONG2FIX(state->buffer_initial_length)); return result; } @@ -920,19 +816,20 @@ static void generate_json(FBuffer *buffer, VALUE Vstate, JSON_Generator_State *s static FBuffer *cState_prepare_buffer(VALUE self) { - FBuffer *buffer = fbuffer_alloc(); + FBuffer *buffer; GET_STATE(self); + buffer = fbuffer_alloc(state->buffer_initial_length); if (state->object_delim) { fbuffer_clear(state->object_delim); } else { - state->object_delim = fbuffer_alloc_with_length(16); + state->object_delim = fbuffer_alloc(16); } fbuffer_append_char(state->object_delim, ','); if (state->object_delim2) { fbuffer_clear(state->object_delim2); } else { - state->object_delim2 = fbuffer_alloc_with_length(16); + state->object_delim2 = fbuffer_alloc(16); } fbuffer_append_char(state->object_delim2, ':'); if (state->space) fbuffer_append(state->object_delim2, state->space, state->space_len); @@ -940,21 +837,13 @@ static FBuffer *cState_prepare_buffer(VALUE self) if (state->array_delim) { fbuffer_clear(state->array_delim); } else { - state->array_delim = fbuffer_alloc_with_length(16); + state->array_delim = fbuffer_alloc(16); } fbuffer_append_char(state->array_delim, ','); if (state->array_nl) fbuffer_append(state->array_delim, state->array_nl, state->array_nl_len); return buffer; } -static VALUE fbuffer_to_s(FBuffer *fb) -{ - VALUE result = rb_str_new(FBUFFER_PAIR(fb)); - fbuffer_free(fb); - FORCE_UTF8(result); - return result; -} - static VALUE cState_partial_generate(VALUE self, VALUE obj) { FBuffer *buffer = cState_prepare_buffer(self); @@ -1003,12 +892,15 @@ static VALUE cState_generate(VALUE self, VALUE obj) * encountered. This options defaults to false. * * *quirks_mode*: Enables quirks_mode for parser, that is for example * generating single JSON values instead of documents is possible. + * * *buffer_initial_length*: sets the initial length of the generator's + * internal buffer. */ static VALUE cState_initialize(int argc, VALUE *argv, VALUE self) { VALUE opts; GET_STATE(self); state->max_nesting = 19; + state->buffer_initial_length = FBUFFER_INITIAL_LENGTH_DEFAULT; rb_scan_args(argc, argv, "01", &opts); if (!NIL_P(opts)) cState_configure(self, opts); return self; @@ -1349,7 +1241,37 @@ static VALUE cState_depth_set(VALUE self, VALUE depth) { GET_STATE(self); Check_Type(depth, T_FIXNUM); - return state->depth = FIX2LONG(depth); + state->depth = FIX2LONG(depth); + return Qnil; +} + +/* + * call-seq: buffer_initial_length + * + * This integer returns the current inital length of the buffer. + */ +static VALUE cState_buffer_initial_length(VALUE self) +{ + GET_STATE(self); + return LONG2FIX(state->buffer_initial_length); +} + +/* + * call-seq: buffer_initial_length=(length) + * + * This sets the initial length of the buffer to +length+, if +length+ > 0, + * otherwise its value isn't changed. + */ +static VALUE cState_buffer_initial_length_set(VALUE self, VALUE buffer_initial_length) +{ + long initial_length; + GET_STATE(self); + Check_Type(buffer_initial_length, T_FIXNUM); + initial_length = FIX2LONG(buffer_initial_length); + if (initial_length > 0) { + state->buffer_initial_length = initial_length; + } + return Qnil; } /* @@ -1391,6 +1313,8 @@ void Init_generator() rb_define_method(cState, "quirks_mode=", cState_quirks_mode_set, 1); rb_define_method(cState, "depth", cState_depth, 0); rb_define_method(cState, "depth=", cState_depth_set, 1); + rb_define_method(cState, "buffer_initial_length", cState_buffer_initial_length, 0); + rb_define_method(cState, "buffer_initial_length=", cState_buffer_initial_length_set, 1); rb_define_method(cState, "configure", cState_configure, 1); rb_define_alias(cState, "merge", "configure"); rb_define_method(cState, "to_h", cState_to_h, 0); @@ -1438,6 +1362,7 @@ void Init_generator() i_ascii_only = rb_intern("ascii_only"); i_quirks_mode = rb_intern("quirks_mode"); i_depth = rb_intern("depth"); + i_buffer_initial_length = rb_intern("buffer_initial_length"); i_pack = rb_intern("pack"); i_unpack = rb_intern("unpack"); i_create_id = rb_intern("create_id"); diff --git a/ext/json/generator/generator.h b/ext/json/generator/generator.h index f882ea004b..3220178a8f 100644 --- a/ext/json/generator/generator.h +++ b/ext/json/generator/generator.h @@ -7,19 +7,10 @@ #include "ruby.h" -#if HAVE_RUBY_RE_H +#ifdef HAVE_RUBY_RE_H #include "ruby/re.h" -#endif - -#if HAVE_RE_H -#include "re.h" -#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) +#include "re.h" #endif #define option_given_p(opts, key) RTEST(rb_funcall(opts, i_key_p, 1, key)) @@ -45,38 +36,6 @@ #define RSTRING_LEN(string) RSTRING(string)->len #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 - -/* fbuffer implementation */ - -typedef struct FBufferStruct { - unsigned long initial_length; - char *ptr; - unsigned long len; - unsigned long capa; -} FBuffer; - -#define FBUFFER_INITIAL_LENGTH 4096 - -#define FBUFFER_PTR(fb) (fb->ptr) -#define FBUFFER_LEN(fb) (fb->len) -#define FBUFFER_CAPA(fb) (fb->capa) -#define FBUFFER_PAIR(fb) FBUFFER_PTR(fb), FBUFFER_LEN(fb) - -static char *fstrndup(const char *ptr, unsigned long len); -static FBuffer *fbuffer_alloc(); -static FBuffer *fbuffer_alloc_with_length(unsigned long initial_length); -static void fbuffer_free(FBuffer *fb); -static void fbuffer_clear(FBuffer *fb); -static void fbuffer_append(FBuffer *fb, const char *newstr, unsigned long len); -static void fbuffer_append_long(FBuffer *fb, long number); -static void fbuffer_append_char(FBuffer *fb, char newchr); -static FBuffer *fbuffer_dup(FBuffer *fb); -static VALUE fbuffer_to_s(FBuffer *fb); - /* unicode defintions */ #define UNI_STRICT_CONVERSION 1 @@ -106,6 +65,7 @@ static void unicode_escape(char *buf, UTF16 character); static void unicode_escape_to_buffer(FBuffer *buffer, char buf[6], UTF16 character); static void convert_UTF8_to_JSON_ASCII(FBuffer *buffer, VALUE string); static void convert_UTF8_to_JSON(FBuffer *buffer, VALUE string); +static char *fstrndup(const char *ptr, unsigned long len); /* ruby api and some helpers */ @@ -128,6 +88,7 @@ typedef struct JSON_Generator_StateStruct { char ascii_only; char quirks_mode; long depth; + long buffer_initial_length; } JSON_Generator_State; #define GET_STATE(self) \ diff --git a/ext/json/lib/json/add/core.rb b/ext/json/lib/json/add/core.rb index 1ae00d01a5..77d9dc0b20 100644 --- a/ext/json/lib/json/add/core.rb +++ b/ext/json/lib/json/add/core.rb @@ -1,243 +1,11 @@ -# This file contains implementations of ruby core's custom objects for +# This file requires the implementations of ruby core's custom objects for # serialisation/deserialisation. -unless defined?(::JSON::JSON_LOADED) and ::JSON::JSON_LOADED - require 'json' -end -require 'date' - -# Symbol serialization/deserialization -class Symbol - # Returns a hash, that will be turned into a JSON object and represent this - # object. - def as_json(*) - { - JSON.create_id => self.class.name, - 's' => to_s, - } - end - - # Stores class name (Symbol) with String representation of Symbol as a JSON string. - def to_json(*a) - as_json.to_json(*a) - end - - # Deserializes JSON string by converting the <tt>string</tt> value stored in the object to a Symbol - def self.json_create(o) - o['s'].to_sym - end -end - -# Time serialization/deserialization -class Time - - # Deserializes JSON string by converting time since epoch to Time - def self.json_create(object) - if usec = object.delete('u') # used to be tv_usec -> tv_nsec - object['n'] = usec * 1000 - end - if respond_to?(:tv_nsec) - at(*object.values_at('s', 'n')) - else - at(object['s'], object['n'] / 1000) - end - end - - # Returns a hash, that will be turned into a JSON object and represent this - # object. - def as_json(*) - { - JSON.create_id => self.class.name, - 's' => tv_sec, - 'n' => respond_to?(:tv_nsec) ? tv_nsec : tv_usec * 1000 - } - end - - # Stores class name (Time) with number of seconds since epoch and number of - # microseconds for Time as JSON string - def to_json(*args) - as_json.to_json(*args) - end -end - -# Date serialization/deserialization -class Date - - # Deserializes JSON string by converting Julian year <tt>y</tt>, month - # <tt>m</tt>, day <tt>d</tt> and Day of Calendar Reform <tt>sg</tt> to Date. - def self.json_create(object) - civil(*object.values_at('y', 'm', 'd', 'sg')) - end - - alias start sg unless method_defined?(:start) - - # Returns a hash, that will be turned into a JSON object and represent this - # object. - def as_json(*) - { - JSON.create_id => self.class.name, - 'y' => year, - 'm' => month, - 'd' => day, - 'sg' => start, - } - end - - # Stores class name (Date) with Julian year <tt>y</tt>, month <tt>m</tt>, day - # <tt>d</tt> and Day of Calendar Reform <tt>sg</tt> as JSON string - def to_json(*args) - as_json.to_json(*args) - end -end - -# DateTime serialization/deserialization -class DateTime - - # Deserializes JSON string by converting year <tt>y</tt>, month <tt>m</tt>, - # day <tt>d</tt>, hour <tt>H</tt>, minute <tt>M</tt>, second <tt>S</tt>, - # offset <tt>of</tt> and Day of Calendar Reform <tt>sg</tt> to DateTime. - def self.json_create(object) - args = object.values_at('y', 'm', 'd', 'H', 'M', 'S') - of_a, of_b = object['of'].split('/') - if of_b and of_b != '0' - args << Rational(of_a.to_i, of_b.to_i) - else - args << of_a - end - args << object['sg'] - civil(*args) - end - - alias start sg unless method_defined?(:start) - - # Returns a hash, that will be turned into a JSON object and represent this - # object. - def as_json(*) - { - JSON.create_id => self.class.name, - 'y' => year, - 'm' => month, - 'd' => day, - 'H' => hour, - 'M' => min, - 'S' => sec, - 'of' => offset.to_s, - 'sg' => start, - } - end - - # Stores class name (DateTime) with Julian year <tt>y</tt>, month <tt>m</tt>, - # day <tt>d</tt>, hour <tt>H</tt>, minute <tt>M</tt>, second <tt>S</tt>, - # offset <tt>of</tt> and Day of Calendar Reform <tt>sg</tt> as JSON string - def to_json(*args) - as_json.to_json(*args) - end -end - -# Range serialization/deserialization -class Range - - # Deserializes JSON string by constructing new Range object with arguments - # <tt>a</tt> serialized by <tt>to_json</tt>. - def self.json_create(object) - new(*object['a']) - end - - # Returns a hash, that will be turned into a JSON object and represent this - # object. - def as_json(*) - { - JSON.create_id => self.class.name, - 'a' => [ first, last, exclude_end? ] - } - end - - # Stores class name (Range) with JSON array of arguments <tt>a</tt> which - # include <tt>first</tt> (integer), <tt>last</tt> (integer), and - # <tt>exclude_end?</tt> (boolean) as JSON string. - def to_json(*args) - as_json.to_json(*args) - end -end - -# Struct serialization/deserialization -class Struct - - # Deserializes JSON string by constructing new Struct object with values - # <tt>v</tt> serialized by <tt>to_json</tt>. - def self.json_create(object) - new(*object['v']) - end - - # Returns a hash, that will be turned into a JSON object and represent this - # object. - def as_json(*) - klass = self.class.name - klass.to_s.empty? and raise JSON::JSONError, "Only named structs are supported!" - { - JSON.create_id => klass, - 'v' => values, - } - end - - # Stores class name (Struct) with Struct values <tt>v</tt> as a JSON string. - # Only named structs are supported. - def to_json(*args) - as_json.to_json(*args) - end -end - -# Exception serialization/deserialization -class Exception - - # Deserializes JSON string by constructing new Exception object with message - # <tt>m</tt> and backtrace <tt>b</tt> serialized with <tt>to_json</tt> - def self.json_create(object) - result = new(object['m']) - result.set_backtrace object['b'] - result - end - - # Returns a hash, that will be turned into a JSON object and represent this - # object. - def as_json(*) - { - JSON.create_id => self.class.name, - 'm' => message, - 'b' => backtrace, - } - end - - # Stores class name (Exception) with message <tt>m</tt> and backtrace array - # <tt>b</tt> as JSON string - def to_json(*args) - as_json.to_json(*args) - end -end - -# Regexp serialization/deserialization -class Regexp - - # Deserializes JSON string by constructing new Regexp object with source - # <tt>s</tt> (Regexp or String) and options <tt>o</tt> serialized by - # <tt>to_json</tt> - def self.json_create(object) - new(object['s'], object['o']) - end - - # Returns a hash, that will be turned into a JSON object and represent this - # object. - def as_json(*) - { - JSON.create_id => self.class.name, - 'o' => options, - 's' => source, - } - end - - # Stores class name (Regexp) with options <tt>o</tt> and source <tt>s</tt> - # (Regexp or String) as JSON string - def to_json(*) - as_json.to_json - end -end +require 'json/add/date' +require 'json/add/date_time' +require 'json/add/exception' +require 'json/add/range' +require 'json/add/regexp' +require 'json/add/struct' +require 'json/add/symbol' +require 'json/add/time' diff --git a/ext/json/lib/json/common.rb b/ext/json/lib/json/common.rb index 43e249c954..cf7a8b9003 100644 --- a/ext/json/lib/json/common.rb +++ b/ext/json/lib/json/common.rb @@ -284,22 +284,40 @@ module JSON module_function :pretty_unparse # :startdoc: + class << self + # The global default options for the JSON.load method: + # :max_nesting: false + # :allow_nan: true + # :quirks_mode: true + attr_accessor :load_default_options + end + self.load_default_options = { + :max_nesting => false, + :allow_nan => true, + :quirks_mode => true, + } + # Load a ruby data structure from a JSON _source_ and return it. A source can # either be a string-like object, an IO-like object, or an object responding # to the read method. If _proc_ was given, it will be called with any nested - # Ruby object as an argument recursively in depth first order. + # Ruby object as an argument recursively in depth first order. The default + # options for the parser can be changed via the load_default_options method. # # This method is part of the implementation of the load/dump interface of # Marshal and YAML. def load(source, proc = nil) + opts = load_default_options if source.respond_to? :to_str source = source.to_str elsif source.respond_to? :to_io source = source.to_io.read - else + elsif source.respond_to?(:read) source = source.read end - result = parse(source, :max_nesting => false, :allow_nan => true) + if opts[:quirks_mode] && (source.nil? || source.empty?) + source = 'null' + end + result = parse(source, opts) recurse_proc(result, &proc) if proc result end @@ -321,6 +339,19 @@ module JSON alias restore load module_function :restore + class << self + # The global default options for the JSON.dump method: + # :max_nesting: false + # :allow_nan: true + # :quirks_mode: true + attr_accessor :dump_default_options + end + self.dump_default_options = { + :max_nesting => false, + :allow_nan => true, + :quirks_mode => true, + } + # Dumps _obj_ as a JSON string, i.e. calls generate on the object and returns # the result. # @@ -331,6 +362,9 @@ module JSON # exception is raised. This argument is similar (but not exactly the # same!) to the _limit_ argument in Marshal.dump. # + # The default options for the generator can be changed via the + # dump_default_options method. + # # This method is part of the implementation of the load/dump interface of # Marshal and YAML. def dump(obj, anIO = nil, limit = nil) @@ -341,8 +375,9 @@ module JSON anIO = nil end end - limit ||= 0 - result = generate(obj, :allow_nan => true, :max_nesting => limit) + opts = JSON.dump_default_options + limit and opts.update(:max_nesting => limit) + result = generate(obj, opts) if anIO anIO.write result anIO diff --git a/ext/json/lib/json/ext.rb b/ext/json/lib/json/ext.rb index 7264a857fa..c5f813181d 100644 --- a/ext/json/lib/json/ext.rb +++ b/ext/json/lib/json/ext.rb @@ -1,3 +1,9 @@ +if ENV['SIMPLECOV_COVERAGE'].to_i == 1 + require 'simplecov' + SimpleCov.start do + add_filter "/tests/" + end +end require 'json/common' module JSON diff --git a/ext/json/lib/json/version.rb b/ext/json/lib/json/version.rb index 2175ac0f90..63ebcf3195 100644 --- a/ext/json/lib/json/version.rb +++ b/ext/json/lib/json/version.rb @@ -1,6 +1,6 @@ module JSON # JSON version - VERSION = '1.5.4' + VERSION = '1.6.6' VERSION_ARRAY = VERSION.split(/\./).map { |x| x.to_i } # :nodoc: VERSION_MAJOR = VERSION_ARRAY[0] # :nodoc: VERSION_MINOR = VERSION_ARRAY[1] # :nodoc: diff --git a/ext/json/parser/extconf.rb b/ext/json/parser/extconf.rb index 4a10dd2ed6..ae4f861c79 100644 --- a/ext/json/parser/extconf.rb +++ b/ext/json/parser/extconf.rb @@ -1,10 +1,3 @@ require 'mkmf' -require 'rbconfig' -if RUBY_VERSION < "1.9" - have_header("re.h") -else - have_header("ruby/re.h") - have_header("ruby/encoding.h") -end create_makefile 'json/ext/parser' diff --git a/ext/json/parser/parser.c b/ext/json/parser/parser.c index 1773616463..d4adb8e620 100644 --- a/ext/json/parser/parser.c +++ b/ext/json/parser/parser.c @@ -1,5 +1,6 @@ #line 1 "parser.rl" +#include "../fbuffer/fbuffer.h" #include "parser.h" /* unicode */ @@ -80,14 +81,14 @@ static VALUE CNaN, CInfinity, CMinusInfinity; static ID i_json_creatable_p, i_json_create, i_create_id, i_create_additions, i_chr, i_max_nesting, i_allow_nan, i_symbolize_names, i_quirks_mode, i_object_class, i_array_class, i_key_p, i_deep_const_get, i_match, - i_match_string, i_aset, i_leftshift; + i_match_string, i_aset, i_aref, i_leftshift; -#line 109 "parser.rl" +#line 110 "parser.rl" -#line 91 "parser.c" +#line 92 "parser.c" static const int JSON_object_start = 1; static const int JSON_object_first_final = 27; static const int JSON_object_error = 0; @@ -95,7 +96,7 @@ static const int JSON_object_error = 0; static const int JSON_object_en_main = 1; -#line 150 "parser.rl" +#line 151 "parser.rl" static char *JSON_parse_object(JSON_Parser *json, char *p, char *pe, VALUE *result) @@ -111,14 +112,14 @@ static char *JSON_parse_object(JSON_Parser *json, char *p, char *pe, VALUE *resu *result = NIL_P(object_class) ? rb_hash_new() : rb_class_new_instance(0, 0, object_class); -#line 115 "parser.c" +#line 116 "parser.c" { cs = JSON_object_start; } -#line 165 "parser.rl" +#line 166 "parser.rl" -#line 122 "parser.c" +#line 123 "parser.c" { if ( p == pe ) goto _test_eof; @@ -146,7 +147,7 @@ case 2: goto st2; goto st0; tr2: -#line 132 "parser.rl" +#line 133 "parser.rl" { char *np; json->parsing_name = 1; @@ -159,7 +160,7 @@ st3: if ( ++p == pe ) goto _test_eof3; case 3: -#line 163 "parser.c" +#line 164 "parser.c" switch( (*p) ) { case 13: goto st3; case 32: goto st3; @@ -226,7 +227,7 @@ case 8: goto st8; goto st0; tr11: -#line 117 "parser.rl" +#line 118 "parser.rl" { VALUE v = Qnil; char *np = JSON_parse_value(json, p, pe, &v); @@ -246,7 +247,7 @@ st9: if ( ++p == pe ) goto _test_eof9; case 9: -#line 250 "parser.c" +#line 251 "parser.c" switch( (*p) ) { case 13: goto st9; case 32: goto st9; @@ -335,14 +336,14 @@ case 18: goto st9; goto st18; tr4: -#line 140 "parser.rl" +#line 141 "parser.rl" { p--; {p++; cs = 27; goto _out;} } goto st27; st27: if ( ++p == pe ) goto _test_eof27; case 27: -#line 346 "parser.c" +#line 347 "parser.c" goto st0; st19: if ( ++p == pe ) @@ -440,11 +441,16 @@ case 26: _out: {} } -#line 166 "parser.rl" +#line 167 "parser.rl" if (cs >= JSON_object_first_final) { if (json->create_additions) { - VALUE klassname = rb_hash_aref(*result, json->create_id); + VALUE klassname; + if (NIL_P(json->object_class)) { + klassname = rb_hash_aref(*result, json->create_id); + } else { + klassname = rb_funcall(*result, i_aref, 1, json->create_id); + } if (!NIL_P(klassname)) { VALUE klass = rb_funcall(mJSON, i_deep_const_get, 1, klassname); if (RTEST(rb_funcall(klass, i_json_creatable_p, 0))) { @@ -460,7 +466,7 @@ case 26: -#line 464 "parser.c" +#line 470 "parser.c" static const int JSON_value_start = 1; static const int JSON_value_first_final = 21; static const int JSON_value_error = 0; @@ -468,7 +474,7 @@ static const int JSON_value_error = 0; static const int JSON_value_en_main = 1; -#line 265 "parser.rl" +#line 271 "parser.rl" static char *JSON_parse_value(JSON_Parser *json, char *p, char *pe, VALUE *result) @@ -476,14 +482,14 @@ static char *JSON_parse_value(JSON_Parser *json, char *p, char *pe, VALUE *resul int cs = EVIL; -#line 480 "parser.c" +#line 486 "parser.c" { cs = JSON_value_start; } -#line 272 "parser.rl" +#line 278 "parser.rl" -#line 487 "parser.c" +#line 493 "parser.c" { if ( p == pe ) goto _test_eof; @@ -508,14 +514,14 @@ st0: cs = 0; goto _out; tr0: -#line 213 "parser.rl" +#line 219 "parser.rl" { char *np = JSON_parse_string(json, p, pe, result); if (np == NULL) { p--; {p++; cs = 21; goto _out;} } else {p = (( np))-1;} } goto st21; tr2: -#line 218 "parser.rl" +#line 224 "parser.rl" { char *np; if(pe > p + 9 - json->quirks_mode && !strncmp(MinusInfinity, p, 9)) { @@ -535,7 +541,7 @@ tr2: } goto st21; tr5: -#line 236 "parser.rl" +#line 242 "parser.rl" { char *np; json->current_nesting++; @@ -545,7 +551,7 @@ tr5: } goto st21; tr9: -#line 244 "parser.rl" +#line 250 "parser.rl" { char *np; json->current_nesting++; @@ -555,7 +561,7 @@ tr9: } goto st21; tr16: -#line 206 "parser.rl" +#line 212 "parser.rl" { if (json->allow_nan) { *result = CInfinity; @@ -565,7 +571,7 @@ tr16: } goto st21; tr18: -#line 199 "parser.rl" +#line 205 "parser.rl" { if (json->allow_nan) { *result = CNaN; @@ -575,19 +581,19 @@ tr18: } goto st21; tr22: -#line 193 "parser.rl" +#line 199 "parser.rl" { *result = Qfalse; } goto st21; tr25: -#line 190 "parser.rl" +#line 196 "parser.rl" { *result = Qnil; } goto st21; tr28: -#line 196 "parser.rl" +#line 202 "parser.rl" { *result = Qtrue; } @@ -596,9 +602,9 @@ st21: if ( ++p == pe ) goto _test_eof21; case 21: -#line 252 "parser.rl" +#line 258 "parser.rl" { p--; {p++; cs = 21; goto _out;} } -#line 602 "parser.c" +#line 608 "parser.c" goto st0; st2: if ( ++p == pe ) @@ -759,7 +765,7 @@ case 20: _out: {} } -#line 273 "parser.rl" +#line 279 "parser.rl" if (cs >= JSON_value_first_final) { return p; @@ -769,7 +775,7 @@ case 20: } -#line 773 "parser.c" +#line 779 "parser.c" static const int JSON_integer_start = 1; static const int JSON_integer_first_final = 3; static const int JSON_integer_error = 0; @@ -777,7 +783,7 @@ static const int JSON_integer_error = 0; static const int JSON_integer_en_main = 1; -#line 289 "parser.rl" +#line 295 "parser.rl" static char *JSON_parse_integer(JSON_Parser *json, char *p, char *pe, VALUE *result) @@ -785,15 +791,15 @@ static char *JSON_parse_integer(JSON_Parser *json, char *p, char *pe, VALUE *res int cs = EVIL; -#line 789 "parser.c" +#line 795 "parser.c" { cs = JSON_integer_start; } -#line 296 "parser.rl" +#line 302 "parser.rl" json->memo = p; -#line 797 "parser.c" +#line 803 "parser.c" { if ( p == pe ) goto _test_eof; @@ -827,14 +833,14 @@ case 3: goto st0; goto tr4; tr4: -#line 286 "parser.rl" +#line 292 "parser.rl" { p--; {p++; cs = 4; goto _out;} } goto st4; st4: if ( ++p == pe ) goto _test_eof4; case 4: -#line 838 "parser.c" +#line 844 "parser.c" goto st0; st5: if ( ++p == pe ) @@ -853,11 +859,14 @@ case 5: _out: {} } -#line 298 "parser.rl" +#line 304 "parser.rl" if (cs >= JSON_integer_first_final) { long len = p - json->memo; - *result = rb_Integer(rb_str_new(json->memo, len)); + fbuffer_clear(json->fbuffer); + fbuffer_append(json->fbuffer, json->memo, len); + fbuffer_append_char(json->fbuffer, '\0'); + *result = rb_cstr2inum(FBUFFER_PTR(json->fbuffer), 10); return p + 1; } else { return NULL; @@ -865,7 +874,7 @@ case 5: } -#line 869 "parser.c" +#line 878 "parser.c" static const int JSON_float_start = 1; static const int JSON_float_first_final = 8; static const int JSON_float_error = 0; @@ -873,7 +882,7 @@ static const int JSON_float_error = 0; static const int JSON_float_en_main = 1; -#line 320 "parser.rl" +#line 329 "parser.rl" static char *JSON_parse_float(JSON_Parser *json, char *p, char *pe, VALUE *result) @@ -881,15 +890,15 @@ static char *JSON_parse_float(JSON_Parser *json, char *p, char *pe, VALUE *resul int cs = EVIL; -#line 885 "parser.c" +#line 894 "parser.c" { cs = JSON_float_start; } -#line 327 "parser.rl" +#line 336 "parser.rl" json->memo = p; -#line 893 "parser.c" +#line 902 "parser.c" { if ( p == pe ) goto _test_eof; @@ -947,14 +956,14 @@ case 8: goto st0; goto tr9; tr9: -#line 314 "parser.rl" +#line 323 "parser.rl" { p--; {p++; cs = 9; goto _out;} } goto st9; st9: if ( ++p == pe ) goto _test_eof9; case 9: -#line 958 "parser.c" +#line 967 "parser.c" goto st0; st5: if ( ++p == pe ) @@ -1015,11 +1024,14 @@ case 7: _out: {} } -#line 329 "parser.rl" +#line 338 "parser.rl" if (cs >= JSON_float_first_final) { long len = p - json->memo; - *result = rb_Float(rb_str_new(json->memo, len)); + fbuffer_clear(json->fbuffer); + fbuffer_append(json->fbuffer, json->memo, len); + fbuffer_append_char(json->fbuffer, '\0'); + *result = rb_float_new(rb_cstr_to_dbl(FBUFFER_PTR(json->fbuffer), 1)); return p + 1; } else { return NULL; @@ -1028,7 +1040,7 @@ case 7: -#line 1032 "parser.c" +#line 1044 "parser.c" static const int JSON_array_start = 1; static const int JSON_array_first_final = 17; static const int JSON_array_error = 0; @@ -1036,7 +1048,7 @@ static const int JSON_array_error = 0; static const int JSON_array_en_main = 1; -#line 369 "parser.rl" +#line 381 "parser.rl" static char *JSON_parse_array(JSON_Parser *json, char *p, char *pe, VALUE *result) @@ -1050,14 +1062,14 @@ static char *JSON_parse_array(JSON_Parser *json, char *p, char *pe, VALUE *resul *result = NIL_P(array_class) ? rb_ary_new() : rb_class_new_instance(0, 0, array_class); -#line 1054 "parser.c" +#line 1066 "parser.c" { cs = JSON_array_start; } -#line 382 "parser.rl" +#line 394 "parser.rl" -#line 1061 "parser.c" +#line 1073 "parser.c" { if ( p == pe ) goto _test_eof; @@ -1096,7 +1108,7 @@ case 2: goto st2; goto st0; tr2: -#line 346 "parser.rl" +#line 358 "parser.rl" { VALUE v = Qnil; char *np = JSON_parse_value(json, p, pe, &v); @@ -1116,7 +1128,7 @@ st3: if ( ++p == pe ) goto _test_eof3; case 3: -#line 1120 "parser.c" +#line 1132 "parser.c" switch( (*p) ) { case 13: goto st3; case 32: goto st3; @@ -1216,14 +1228,14 @@ case 12: goto st3; goto st12; tr4: -#line 361 "parser.rl" +#line 373 "parser.rl" { p--; {p++; cs = 17; goto _out;} } goto st17; st17: if ( ++p == pe ) goto _test_eof17; case 17: -#line 1227 "parser.c" +#line 1239 "parser.c" goto st0; st13: if ( ++p == pe ) @@ -1279,7 +1291,7 @@ case 16: _out: {} } -#line 383 "parser.rl" +#line 395 "parser.rl" if(cs >= JSON_array_first_final) { return p + 1; @@ -1360,7 +1372,7 @@ static VALUE json_string_unescape(VALUE result, char *string, char *stringEnd) } -#line 1364 "parser.c" +#line 1376 "parser.c" static const int JSON_string_start = 1; static const int JSON_string_first_final = 8; static const int JSON_string_error = 0; @@ -1368,7 +1380,7 @@ static const int JSON_string_error = 0; static const int JSON_string_en_main = 1; -#line 482 "parser.rl" +#line 494 "parser.rl" static int @@ -1390,15 +1402,15 @@ static char *JSON_parse_string(JSON_Parser *json, char *p, char *pe, VALUE *resu *result = rb_str_buf_new(0); -#line 1394 "parser.c" +#line 1406 "parser.c" { cs = JSON_string_start; } -#line 503 "parser.rl" +#line 515 "parser.rl" json->memo = p; -#line 1402 "parser.c" +#line 1414 "parser.c" { if ( p == pe ) goto _test_eof; @@ -1423,7 +1435,7 @@ case 2: goto st0; goto st2; tr2: -#line 468 "parser.rl" +#line 480 "parser.rl" { *result = json_string_unescape(*result, json->memo + 1, p); if (NIL_P(*result)) { @@ -1434,14 +1446,14 @@ tr2: {p = (( p + 1))-1;} } } -#line 479 "parser.rl" +#line 491 "parser.rl" { p--; {p++; cs = 8; goto _out;} } goto st8; st8: if ( ++p == pe ) goto _test_eof8; case 8: -#line 1445 "parser.c" +#line 1457 "parser.c" goto st0; st3: if ( ++p == pe ) @@ -1517,7 +1529,7 @@ case 7: _out: {} } -#line 505 "parser.rl" +#line 517 "parser.rl" if (json->create_additions && RTEST(match_string = json->match_string)) { VALUE klass; @@ -1618,9 +1630,6 @@ static VALUE convert_encoding(VALUE source) * defaults to true. * * *object_class*: Defaults to Hash * * *array_class*: Defaults to Array - * * *quirks_mode*: Enables quirks_mode for parser, that is for example - * parsing single JSON values instead of documents is possible. - * */ static VALUE cParser_initialize(int argc, VALUE *argv, VALUE self) { @@ -1707,6 +1716,7 @@ static VALUE cParser_initialize(int argc, VALUE *argv, VALUE self) json->object_class = Qnil; json->array_class = Qnil; } + source = rb_convert_type(source, T_STRING, "String", "to_str"); if (!json->quirks_mode) { source = convert_encoding(StringValue(source)); } @@ -1718,7 +1728,7 @@ static VALUE cParser_initialize(int argc, VALUE *argv, VALUE self) } -#line 1719 "parser.c" +#line 1732 "parser.c" static const int JSON_start = 1; static const int JSON_first_final = 10; static const int JSON_error = 0; @@ -1726,7 +1736,7 @@ static const int JSON_error = 0; static const int JSON_en_main = 1; -#line 726 "parser.rl" +#line 739 "parser.rl" static VALUE cParser_parse_strict(VALUE self) @@ -1737,16 +1747,16 @@ static VALUE cParser_parse_strict(VALUE self) GET_PARSER; -#line 1738 "parser.c" +#line 1751 "parser.c" { cs = JSON_start; } -#line 736 "parser.rl" +#line 749 "parser.rl" p = json->source; pe = p + json->len; -#line 1747 "parser.c" +#line 1760 "parser.c" { if ( p == pe ) goto _test_eof; @@ -1802,7 +1812,7 @@ case 5: goto st1; goto st5; tr3: -#line 715 "parser.rl" +#line 728 "parser.rl" { char *np; json->current_nesting = 1; @@ -1811,7 +1821,7 @@ tr3: } goto st10; tr4: -#line 708 "parser.rl" +#line 721 "parser.rl" { char *np; json->current_nesting = 1; @@ -1823,7 +1833,7 @@ st10: if ( ++p == pe ) goto _test_eof10; case 10: -#line 1824 "parser.c" +#line 1837 "parser.c" switch( (*p) ) { case 13: goto st10; case 32: goto st10; @@ -1880,7 +1890,7 @@ case 9: _out: {} } -#line 739 "parser.rl" +#line 752 "parser.rl" if (cs >= JSON_first_final && p == pe) { return result; @@ -1892,7 +1902,7 @@ case 9: -#line 1893 "parser.c" +#line 1906 "parser.c" static const int JSON_quirks_mode_start = 1; static const int JSON_quirks_mode_first_final = 10; static const int JSON_quirks_mode_error = 0; @@ -1900,7 +1910,7 @@ static const int JSON_quirks_mode_error = 0; static const int JSON_quirks_mode_en_main = 1; -#line 764 "parser.rl" +#line 777 "parser.rl" static VALUE cParser_parse_quirks_mode(VALUE self) @@ -1911,16 +1921,16 @@ static VALUE cParser_parse_quirks_mode(VALUE self) GET_PARSER; -#line 1912 "parser.c" +#line 1925 "parser.c" { cs = JSON_quirks_mode_start; } -#line 774 "parser.rl" +#line 787 "parser.rl" p = json->source; pe = p + json->len; -#line 1921 "parser.c" +#line 1934 "parser.c" { if ( p == pe ) goto _test_eof; @@ -1954,7 +1964,7 @@ st0: cs = 0; goto _out; tr2: -#line 756 "parser.rl" +#line 769 "parser.rl" { char *np = JSON_parse_value(json, p, pe, &result); if (np == NULL) { p--; {p++; cs = 10; goto _out;} } else {p = (( np))-1;} @@ -1964,7 +1974,7 @@ st10: if ( ++p == pe ) goto _test_eof10; case 10: -#line 1965 "parser.c" +#line 1978 "parser.c" switch( (*p) ) { case 13: goto st10; case 32: goto st10; @@ -2053,7 +2063,7 @@ case 9: _out: {} } -#line 777 "parser.rl" +#line 790 "parser.rl" if (cs >= JSON_quirks_mode_first_final && p == pe) { return result; @@ -2085,6 +2095,7 @@ static JSON_Parser *JSON_allocate() { JSON_Parser *json = ALLOC(JSON_Parser); MEMZERO(json, JSON_Parser, 1); + json->fbuffer = fbuffer_alloc(0); return json; } @@ -2099,6 +2110,7 @@ static void JSON_mark(JSON_Parser *json) static void JSON_free(JSON_Parser *json) { + fbuffer_free(json->fbuffer); ruby_xfree(json); } @@ -2166,6 +2178,7 @@ void Init_parser() i_key_p = rb_intern("key?"); i_deep_const_get = rb_intern("deep_const_get"); i_aset = rb_intern("[]="); + i_aref = rb_intern("[]"); i_leftshift = rb_intern("<<"); #ifdef HAVE_RUBY_ENCODING_H CEncoding_UTF_8 = rb_funcall(rb_path2class("Encoding"), rb_intern("find"), 1, rb_str_new2("utf-8")); diff --git a/ext/json/parser/parser.h b/ext/json/parser/parser.h index fc73810dd6..b192064c09 100644 --- a/ext/json/parser/parser.h +++ b/ext/json/parser/parser.h @@ -3,16 +3,10 @@ #include "ruby.h" -#if HAVE_RE_H +#ifndef HAVE_RUBY_RE_H #include "re.h" #endif -#ifdef HAVE_RUBY_ENCODING_H -#include "ruby/encoding.h" -#define FORCE_UTF8(obj) ((obj) = rb_enc_associate(rb_str_dup(obj), rb_utf8_encoding())) -#else -#define FORCE_UTF8(obj) -#endif #ifdef HAVE_RUBY_ST_H #include "ruby/st.h" #else @@ -49,6 +43,7 @@ typedef struct JSON_ParserStruct { VALUE array_class; int create_additions; VALUE match_string; + FBuffer *fbuffer; } JSON_Parser; #define GET_PARSER \ diff --git a/ext/json/parser/parser.rl b/ext/json/parser/parser.rl index 33e775ce72..c96b0a8225 100644 --- a/ext/json/parser/parser.rl +++ b/ext/json/parser/parser.rl @@ -1,3 +1,4 @@ +#include "../fbuffer/fbuffer.h" #include "parser.h" /* unicode */ @@ -78,7 +79,7 @@ static VALUE CNaN, CInfinity, CMinusInfinity; static ID i_json_creatable_p, i_json_create, i_create_id, i_create_additions, i_chr, i_max_nesting, i_allow_nan, i_symbolize_names, i_quirks_mode, i_object_class, i_array_class, i_key_p, i_deep_const_get, i_match, - i_match_string, i_aset, i_leftshift; + i_match_string, i_aset, i_aref, i_leftshift; %%{ machine JSON_common; @@ -166,7 +167,12 @@ static char *JSON_parse_object(JSON_Parser *json, char *p, char *pe, VALUE *resu if (cs >= JSON_object_first_final) { if (json->create_additions) { - VALUE klassname = rb_hash_aref(*result, json->create_id); + VALUE klassname; + if (NIL_P(json->object_class)) { + klassname = rb_hash_aref(*result, json->create_id); + } else { + klassname = rb_funcall(*result, i_aref, 1, json->create_id); + } if (!NIL_P(klassname)) { VALUE klass = rb_funcall(mJSON, i_deep_const_get, 1, klassname); if (RTEST(rb_funcall(klass, i_json_creatable_p, 0))) { @@ -298,7 +304,10 @@ static char *JSON_parse_integer(JSON_Parser *json, char *p, char *pe, VALUE *res if (cs >= JSON_integer_first_final) { long len = p - json->memo; - *result = rb_Integer(rb_str_new(json->memo, len)); + fbuffer_clear(json->fbuffer); + fbuffer_append(json->fbuffer, json->memo, len); + fbuffer_append_char(json->fbuffer, '\0'); + *result = rb_cstr2inum(FBUFFER_PTR(json->fbuffer), 10); return p + 1; } else { return NULL; @@ -329,7 +338,10 @@ static char *JSON_parse_float(JSON_Parser *json, char *p, char *pe, VALUE *resul if (cs >= JSON_float_first_final) { long len = p - json->memo; - *result = rb_Float(rb_str_new(json->memo, len)); + fbuffer_clear(json->fbuffer); + fbuffer_append(json->fbuffer, json->memo, len); + fbuffer_append_char(json->fbuffer, '\0'); + *result = rb_float_new(rb_cstr_to_dbl(FBUFFER_PTR(json->fbuffer), 1)); return p + 1; } else { return NULL; @@ -688,6 +700,7 @@ static VALUE cParser_initialize(int argc, VALUE *argv, VALUE self) json->object_class = Qnil; json->array_class = Qnil; } + source = rb_convert_type(source, T_STRING, "String", "to_str"); if (!json->quirks_mode) { source = convert_encoding(StringValue(source)); } @@ -805,6 +818,7 @@ static JSON_Parser *JSON_allocate() { JSON_Parser *json = ALLOC(JSON_Parser); MEMZERO(json, JSON_Parser, 1); + json->fbuffer = fbuffer_alloc(0); return json; } @@ -819,6 +833,7 @@ static void JSON_mark(JSON_Parser *json) static void JSON_free(JSON_Parser *json) { + fbuffer_free(json->fbuffer); ruby_xfree(json); } @@ -886,6 +901,7 @@ void Init_parser() i_key_p = rb_intern("key?"); i_deep_const_get = rb_intern("deep_const_get"); i_aset = rb_intern("[]="); + i_aref = rb_intern("[]"); i_leftshift = rb_intern("<<"); #ifdef HAVE_RUBY_ENCODING_H CEncoding_UTF_8 = rb_funcall(rb_path2class("Encoding"), rb_intern("find"), 1, rb_str_new2("utf-8")); |