aboutsummaryrefslogtreecommitdiffstats
path: root/ext/json
Commit message (Collapse)AuthorAgeFilesLines
* Update dependency.akr2014-11-212-1/+25
| | | | git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@48526 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* Mark auogenerated part.akr2014-11-152-0/+6
| | | | git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@48441 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * common.mk: Remove comments in Dependency lines.akr2014-11-152-7/+7
| | | | | | | | | | | | Notified by usa. * enc/depend: Ditto. * ext/**/depend: Ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@48434 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * tool/update-deps: Extend to fix dependencies.akr2014-11-152-0/+7
| | | | | | | | | | | | * common.mk: Dependencies updated by tool/update-deps. * enc/depend: Ditto. * ext/**/depend: Ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@48431 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* json/parser: typed datanobu2014-10-043-10/+41
| | | | | | | * ext/json/parser/parser.rl (JSON_Parser_type): turn into typed data. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@47798 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* json/generator: typed datanobu2014-10-042-9/+35
| | | | | | | * ext/json/generator/generator.c (JSON_Generator_State_type): turn into typed data. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@47797 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* ext: protoize no-arguments functionsnobu2014-10-042-2/+2
| | | | git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@47793 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* ext: protoize no-arguments functionsnobu2014-10-042-4/+4
| | | | git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@47792 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* fbuffer.h: expand argumentsnobu2014-09-181-1/+1
| | | | | | | * ext/json/fbuffer/fbuffer.h (fbuffer_to_s): expand arguments, for fix with rb_str_new macro. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@47626 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* json/parser/prereq.mk: use enumnobu2014-03-172-33/+34
| | | | | | | * ext/json/parser/prereq.mk (parser.c): use `enum` instead of `static const int` to get rid of unused-const-variable warnings. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@45356 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* class.c: do nothing if copying selfnobu2014-02-211-0/+1
| | | | | | | | * class.c (rb_mod_init_copy): do nothing if copying self. [ruby-dev:47989] [Bug #9535] * hash.c (rb_hash_initialize_copy): ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@45076 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* ext/json: backward compatibilitiesnobu2014-01-152-2/+11
| | | | | | | * ext/json/fbuffer/fbuffer.h, ext/json/generator/generator.c: add macros for backward compatibilities. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@44615 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* ext/json: objects depend on $(ruby_headers)tmm12014-01-072-0/+2
| | | | | | | | * ext/json/generator/depend: add build dependencies for json extension Patch by normalperson (Eric Wong) [Bug #9374] [ruby-core:59609] * ext/json/parser/depend: ditto git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@44514 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * lib/irb/notifier.rb: [Doc] Fix typoa_matsuda2013-11-271-1/+1
| | | | | | * ext/json/lib/json/common.rb: Ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@43881 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * ext/json: merge JSON 1.8.1.naruse2013-11-208-31/+38
| | | | | | | | | | | | | | | | 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
* Eliminate less-than-zero checks for unsigned variablesnobu2013-09-122-2/+2
| | | | | | | | | | | * ext/bigdecimal/bigdecimal.c, ext/digest/md5/md5.c, ext/json/fbuffer/fbuffer.h, ext/json/generator/generator.c: Eliminate less-than-zero checks for unsigned variables. According to section 4.1.5 of C89 standard, size_t is an unsigned type. These checks were found with 'cppcheck' static analysis tool. [ruby-core:57117] [Feature #8890] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@42920 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* json/add/range.rb: use Range#endnobu2013-08-061-1/+1
| | | | | | | | * ext/json/lib/json/add/range.rb (Range#as_json): use Range#end instead of Range#last which can be affected by Range#exclusive?. ref [Bug #8739] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@42404 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* fixup stying of `Json#generate` parameter docs by @daveworth [fixes GH-339]hsbt2013-07-091-2/+3
| | | | git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@41862 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * ext/json/fbuffer/fbuffer.h (fbuffer_append_str): change the place ofnaruse2013-06-071-2/+2
| | | | | | RB_GC_GUARD. it should be after the object is used. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@41135 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * ext/json/generator/generator.c (isArrayOrObject): cast char tonaruse2013-05-081-2/+2
| | | | | | unsigned char. [Bug #8378] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@40609 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * ext/json/generator/depend: fix dependencies [Bug #8379]naruse2013-05-082-2/+8
| | | | | | * ext/json/parser/depend: ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@40608 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * ext/socket/option.c: Document synonymous methods, by windwiny [GH-277]zzak2013-04-161-5/+5
| | | | | | | | | | | | | | | * ext/stringio/stringio.c: ditto * ext/io/wait/wait.c: ditto * ext/gdbm/gdbm.c: ditto * ext/dl/cfunc.c: ditto * ext/zlib/zlib.c: ditto * ext/win32ole/win32ole.c: ditto * ext/dbm/dbm.c: ditto * ext/json/generator/generator.c: ditto * ext/date/date_core.c: ditto git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@40319 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * ext/json: merge JSON 1.7.7.naruse2013-02-129-39/+112
| | | | | | | | 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/lib/json.rb: Move module overview definition for rdoczzak2013-02-041-2/+2
| | | | git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39046 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * ext/json: merge JSON 1.7.5.naruse2012-12-128-28/+40
| | | | | | fix tests and other fixes. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38346 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* depend: dependencynobu2012-10-031-1/+1
| | | | | | * ext/json/generator/depend: fix missing dependency. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37073 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* fix dependencynobu2012-08-311-1/+1
| | | | | | | | * 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
* avoid compilation error on AIX by -ansi -std=iso9899:199409 (r36038). ↵kanemoto2012-07-251-1/+1
| | | | | | | | | | [ruby-core:46744] [Bug #6791]. This issue is fixed in upper stream as issue #142. (https://github.com/flori/json/issues/142) git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@36541 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* Revert r35684 "* trunk/ext/json/extconf.rb: remove fake file."nobu2012-05-181-0/+3
| | | | git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35693 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * trunk/ext/json/extconf.rb: remove fake file.nobu2012-05-181-3/+0
| | | | git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35684 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * ext/json/lib/json/generic_object.rb: missing file.nobu2012-05-071-0/+39
| | | | git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35573 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * ext/json: Merge JSON 1.7.1.naruse2012-05-0710-33/+52
| | | | | | 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.naruse2012-05-072-9/+1
| | | | | | | | | | 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.usa2012-05-071-1/+1
| | | | git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35561 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* ext/json/fbuffer/fbuffer.hnobu2012-05-072-1/+9
| | | | | | | | * ext/json/fbuffer/fbuffer.h: comment-out unused functions. * ext/json/parser/depend: add dependency. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35560 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* Add debug prints to inspect TC_JSONGenerate#test_gc's timeout issue.naruse2012-04-152-0/+2
| | | | git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35336 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* Additional experimental fix for r35261.naruse2012-04-083-3/+3
| | | | git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35264 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * ext/json/generator/generator.c (generate_json_bignum):naruse2012-04-081-0/+1
| | | | | | | add RB_GC_GUARD. http://fb.rubyci.org/~chkbuild/ruby-trunk/log/20120407T210301Z.diff.html.gz git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35261 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* Add missing files of r34971,naruse2012-03-1111-0/+472
| | | | git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@34973 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * ext/json: Merge 164a75c8bd2007d32c4d7665d53140d8fc126dcd.naruse2012-03-1111-535/+240
| | | | | | [ruby-core:41917] [Bug #5846] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@34971 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * ext/json/parser/parser.rl (json_string_unescape): workaround fixnaruse2012-01-152-2/+2
| | | | | | | for over optimization of GCC 4.7. [ruby-core:42085] [Bug #5888] http://gcc.gnu.org/bugzilla/show_bug.cgi?id=51862 git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@34306 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* Fix typo: U+0456->U+0069. [Bug #5275]naruse2011-09-051-1/+1
| | | | git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@33192 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * ext/json: Merge json gem v1.5.4 (3dab4c5a6a97fac03dac).naruse2011-08-315-36/+49
| | | | git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@33142 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* Don't include complex and rational; fix r33122.naruse2011-08-301-2/+0
| | | | git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@33124 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * ext/json: Merge json gem 1.5.4+ (2149f4185c598fb97db1).naruse2011-08-309-274/+635
| | | | | | [Bug #5173] [ruby-core:38866] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@33122 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * ext/json: Merge json gem 1.5.4+ (f7f78896607b6f6226cd).naruse2011-07-1011-138/+423
| | | | | | [Bug #4700] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@32493 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * ext/json/{generator/generator.c,parser/parser.rl}: fix indent.nobu2011-07-083-24/+24
| | | | git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@32460 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * ext/json/parser/parser.rl (JSON_parse_object): add missing parens.nobu2011-07-082-2/+2
| | | | git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@32459 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * ext/json/parser/parser.rl (convert_encoding): should not modifynobu2011-07-082-5/+7
| | | | | | the argument. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@32458 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * ext/json/parser/parser.rl (convert_encoding): no needs to usenobu2011-07-082-35/+15
| | | | | | force_encoding. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@32457 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-15 12:27:05 +0000