aboutsummaryrefslogtreecommitdiffstats
path: root/ext/json
Commit message (Collapse)AuthorAgeFilesLines
...
* * 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
* * ext/json/parser/prereq.mk: remove trailing spaces.nobu2011-07-081-0/+1
| | | | git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@32455 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * remove trailing spaces.nobu2011-05-153-114/+114
| | | | git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@31573 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * ext/json/lib/json/common.rb (JSON::MissingUnicodeSupport.iconv):nobu2011-02-061-1/+1
| | | | | | should not drop rest of the result. use Iconv.conv instead. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30807 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * ext/json/parser/parser.h (GET_PARSER): raise TypeError.nobu2011-02-053-3/+3
| | | | | | * ext/json/parser/parser.rl (cParser_initialize): ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30792 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * ext/json/parser/parser.h (GET_PARSER): check if initialized.nobu2011-02-053-7/+20
| | | | | | | [ruby-core:35079] * ext/json/parser/parser.rl (cParser_initialize): ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30791 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * ext/json/parser/parser.rl: add local variables for emacs.nobu2011-02-052-18/+32
| | | | git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30790 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * ext/json/generator/generator.{c,h} (fbuffer_free_only_buffer):nobu2010-12-251-1/+0
| | | | | | | unused. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30346 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * ext/json/generator/generator.c (fbuffer_free): unused.nobu2010-12-251-5/+0
| | | | git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30338 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * ext/json/lib/json/add/rails.rb: removed.naruse2010-12-021-58/+0
| | | | git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30053 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * ext/json/generator/extconf.rb: remove the lines which set -O3naruse2010-12-022-20/+0
| | | | | | | | | when -O option is not set. Note that -O3 doesn't always exist. * ext/json/parser/extconf.rb: ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30011 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * ext/json/lib/json/common.rb: don't use iconv on 1.9.naruse2010-12-011-3/+9
| | | | | | patched by Shota Fukumori [ruby-core:33164] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30004 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * ext/json: Update github/flori/json from 1.4.2+ tonaruse2010-12-0110-1673/+435
| | | | | | e22b2f2bdfe6a9b0. this fixes some bugs. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30003 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * common.mk (EXT_SRCS): add ext/json/parser/parser.c.nobu2010-07-281-0/+8
| | | | git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@28780 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * ext/json/generator/generator.c (fbuffer_free): removed unused function.nobu2010-07-202-6/+0
| | | | git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@28692 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * ext/json/generator/generator.c (fbuffer_inc_capa):naruse2010-05-091-1/+1
| | | | | | fix tha use of REALLOC_N. [ruby-dev:41227] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@27694 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * ext/json/{generator/generator.c,parser/parser.rl}: fixed indent.nobu2010-05-095-114/+116
| | | | | | | * ext/json/{generator,parser}/depend: added. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@27692 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * ext/json: Update to JSON 1.4.2.naruse2010-04-282-2/+2
| | | | git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@27535 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * ext/json/generator/generator.c (convert_UTF8_to_JSON_ASCII): get ridusa2010-04-261-1/+1
| | | | | | | of a warning. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@27502 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* Recommit of JSON; fix mixed declarations.naruse2010-04-2619-1752/+2228
| | | | git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@27501 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * ext/jason: revert r27493. came again after canceling gcc-ism.usa2010-04-2619-2237/+1750
| | | | git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@27500 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * ext/json: Update to JSON 1.4.1.naruse2010-04-2619-1750/+2237
| | | | git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@27493 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * ext/**/*.[ch]: removed trailing spaces.nobu2010-04-225-30/+30
| | | | git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@27437 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * ext/json/lib/**/*.rb: not executable.nobu2010-03-043-0/+0
| | | | git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@26811 b2dd03c8-39d4-4d8f-98ff-823fe69b080e