delta/ruby-gems/json.git, branch be-compatible-with-ruby-2.2.1

Merge branch 'parse_error_encoding' of https://github.com/nobu/json into be-compatible-with-ruby-2.2.1

2015-05-15T15:42:39+00:00

Merge branch 'backport-r49161' of https://github.com/hsbt/json into be-compatible-with-ruby-2.2.1

2015-05-15T15:41:59+00:00

parser.rl: rb_enc_raise

2015-04-18T06:33:30+00:00

* ext/json/ext/parser/parser.rl: raise with messages in UTF-8
  encoding.  [ruby-core:67386] [Bug #10705]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@50342 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

parser.rl: use rb_encoding

2015-04-18T06:30:45+00:00

* ext/json/ext/parser/parser.rl (convert_encoding): use rb_encoding
  functions to compare and convert encodings.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@50340 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

parser.rl: use StringValue

2015-04-18T06:30:25+00:00

* ext/json/ext/parser/parser.rl (cParser_initialize): use StringValue
  instead of direct rb_convert_type and remove duplicate
  conversion.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@50339 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

backport ruby/ruby r49161: https://github.com/ruby/ruby/commit/c0ee6f2af98a8322e842bb2847492bfc56cb21b9

2015-04-12T09:34:54+00:00

backported ruby/ruby trunk r49562: https://github.com/ruby/ruby/commit/e5c516c89a62839fd025ae112041ed9a5f06c9d0

2015-02-13T02:45:48+00:00

use ZALLOC if it can be used, and defined ZALLOC macro.

2015-02-12T21:36:04+00:00

sync trunk again: fixed regression of r49027

2015-02-12T21:36:04+00:00

Merge branch 'master' of storage.gate.ping.de:/git/json

2015-01-09T00:52:24+00:00