ruby.git/ext/json/parser, branch ruby_2_1 The Ruby Programming Language merge revision(s) r44577,r45097,r45330,r45331,r45354,r45356: [Backport #10033] 2014-08-02T15:25:17+00:00 nagachika nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e 2014-08-02T15:25:17+00:00 1760861c0d9698a9f73e51c1dd176a6409677271 cptr.c: unused variable * ext/dl/cptr.c (rb_dlptr_inspect): remove no longer used variable. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@47036 b2dd03c8-39d4-4d8f-98ff-823fe69b080e 
	cptr.c: unused variable

	* ext/dl/cptr.c (rb_dlptr_inspect): remove no longer used variable.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@47036 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
merge revision(s) 44514: [Backport #9374] 2014-02-22T07:53:33+00:00 naruse naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e 2014-02-22T07:53:33+00:00 7329f4043621e69574187fb185939d5638838a7b * ext/json/generator/depend: add build dependencies for json extension [Bug #9374] [ruby-core:59609] * ext/json/parser/depend: ditto git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@45123 b2dd03c8-39d4-4d8f-98ff-823fe69b080e 
	* ext/json/generator/depend: add build dependencies for json extension
	  [Bug #9374] [ruby-core:59609]

	* ext/json/parser/depend: ditto


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@45123 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* ext/json: merge JSON 1.8.1. 2013-11-20T02:55:08+00:00 naruse naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e 2013-11-20T02:55:08+00:00 14cab32596d3e394cafea7a7698a81034b83c172 https://github.com/nurse/json/compare/002ac2771ce32776b32ccd2d06e5604de6c36dcd...e09ffc0d7da25d0393873936c118c188c78dbac3 * Remove Rubinius exception since transcoding should be working now. * Fix https://github.com/flori/json/issues/162 reported by Marc-Andre Lafortune <github_rocks@marc-andre.ca>. Thanks! * Applied patches by Yui NARUSE <naruse@airemix.jp> to suppress warning with -Wchar-subscripts and better validate UTF-8 strings. * Applied patch by ginriki@github to remove unnecessary if. * Add load/dump interface to JSON::GenericObject to make serialize :some_attribute, JSON::GenericObject work in Rails active models for convenient SomeModel#some_attribute.foo.bar access to serialised JSON data. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@43731 b2dd03c8-39d4-4d8f-98ff-823fe69b080e 
  https://github.com/nurse/json/compare/002ac2771ce32776b32ccd2d06e5604de6c36dcd...e09ffc0d7da25d0393873936c118c188c78dbac3
* Remove Rubinius exception since transcoding should be working now.
* Fix https://github.com/flori/json/issues/162 reported by Marc-Andre
  Lafortune <github_rocks@marc-andre.ca>. Thanks!
* Applied patches by Yui NARUSE <naruse@airemix.jp> to suppress
  warning with -Wchar-subscripts and better validate UTF-8 strings.
* Applied patch by ginriki@github to remove unnecessary if.
* Add load/dump interface to JSON::GenericObject to make
  serialize :some_attribute, JSON::GenericObject
  work in Rails active models for convenient
  SomeModel#some_attribute.foo.bar access to serialised JSON data.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@43731 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* ext/json/generator/depend: fix dependencies [Bug #8379] 2013-05-08T04:59:52+00:00 naruse naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e 2013-05-08T04:59:52+00:00 279c7bdd884e5e158d3599750fe4d10177132296 * ext/json/parser/depend: ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@40608 b2dd03c8-39d4-4d8f-98ff-823fe69b080e 
* ext/json/parser/depend: ditto.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@40608 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* ext/json: merge JSON 1.7.7. 2013-02-12T03:05:45+00:00 naruse naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e 2013-02-12T03:05:45+00:00 062d2ee6f798205c3046730d0d348cfd0d0bc09d This includes security fix. [CVE-2013-0269] https://github.com/flori/json/commit/d0a62f3ced7560daba2ad546d83f0479a5ae2cf2 https://groups.google.com/d/topic/rubyonrails-security/4_YvCpLzL58/discussion git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39208 b2dd03c8-39d4-4d8f-98ff-823fe69b080e 
  This includes security fix. [CVE-2013-0269]
  https://github.com/flori/json/commit/d0a62f3ced7560daba2ad546d83f0479a5ae2cf2
  https://groups.google.com/d/topic/rubyonrails-security/4_YvCpLzL58/discussion

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39208 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* ext/json: merge JSON 1.7.5. 2012-12-12T10:51:49+00:00 naruse naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e 2012-12-12T10:51:49+00:00 43f6fdfb42d3f4c9025c290bdf5aeffe5959f1bf fix tests and other fixes. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38346 b2dd03c8-39d4-4d8f-98ff-823fe69b080e 
  fix tests and other fixes.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38346 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
fix dependency 2012-08-31T04:58:18+00:00 nobu nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e 2012-08-31T04:58:18+00:00 30fbd739a19cadb4b7c63ca1f982891a69ff17a8 * ext/json/parser/depend: fix dependency for error that rb_float_new is not found. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@36859 b2dd03c8-39d4-4d8f-98ff-823fe69b080e 
* ext/json/parser/depend: fix dependency for error that rb_float_new
  is not found.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@36859 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* ext/json: Merge JSON 1.7.1. 2012-05-07T16:00:49+00:00 naruse naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e 2012-05-07T16:00:49+00:00 5a00be2bf75939fd3bb05dabbdf46244eaa6bb43 https://github.com/flori/json/commit/e5b9a9465c1159fae533bca320d950b772bcb4ac git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35568 b2dd03c8-39d4-4d8f-98ff-823fe69b080e 
  https://github.com/flori/json/commit/e5b9a9465c1159fae533bca320d950b772bcb4ac

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35568 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Revert r35560. 2012-05-07T08:46:50+00:00 naruse naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e 2012-05-07T08:46:50+00:00 251001c8298412def115fc10e0798f283956b5c7 This breaks tests: http://u64.rubyci.org/~chkbuild/ruby-trunk/log/20120507T070102Z.log.html.gz And don't change local codes, contribute it to upstream: https://github.com/flori/json git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35562 b2dd03c8-39d4-4d8f-98ff-823fe69b080e 
This breaks tests:
http://u64.rubyci.org/~chkbuild/ruby-trunk/log/20120507T070102Z.log.html.gz

And don't change local codes, contribute it to upstream:
https://github.com/flori/json

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35562 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* ext/json/parser/depend: need to specify the base directory for nmake. 2012-05-07T08:25:02+00:00 usa usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e 2012-05-07T08:25:02+00:00 e9231035b2db3e693b1f3731424152bb2f3e3a16 git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35561 b2dd03c8-39d4-4d8f-98ff-823fe69b080e 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35561 b2dd03c8-39d4-4d8f-98ff-823fe69b080e