nobu
e580a631be
use 0 for reserved
...
use 0 for rb_data_type_t::reserved instead of NULL, since its type
may be changed in the future and possibly not a pointer type.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@48662 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-12-01 06:38:04 +00:00
akr
6ca202fcee
Update dependency.
...
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@48526 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-11-21 03:04:44 +00:00
akr
dd547e1b22
Mark auogenerated part.
...
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@48441 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-11-15 11:14:08 +00:00
akr
57682b05e1
* common.mk: Remove comments in Dependency lines.
...
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
2014-11-15 10:28:25 +00:00
akr
8727eb77be
* tool/update-deps: Extend to fix dependencies.
...
* 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
2014-11-15 05:15:49 +00:00
nobu
1e46f02394
json/parser: typed data
...
* 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
2014-10-04 23:33:11 +00:00
nobu
bdfc2e2942
json/generator: typed data
...
* 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
2014-10-04 23:33:09 +00:00
nobu
ba0655ebdd
ext: protoize no-arguments functions
...
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@47793 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-10-04 23:29:24 +00:00
nobu
5540c1de81
ext: protoize no-arguments functions
...
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@47792 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-10-04 23:09:32 +00:00
nobu
dc70a9c422
fbuffer.h: expand arguments
...
* 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
2014-09-18 14:51:45 +00:00
nobu
d90075cb10
json/parser/prereq.mk: use enum
...
* 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
2014-03-17 04:57:19 +00:00
nobu
1f29e8e2ba
class.c: do nothing if copying self
...
* 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
2014-02-21 11:42:03 +00:00
nobu
cfa2a21062
ext/json: backward compatibilities
...
* 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
2014-01-15 08:16:46 +00:00
tmm1
738b8872ef
ext/json: objects depend on $(ruby_headers)
...
* 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
2014-01-07 01:13:46 +00:00
a_matsuda
da66677061
* lib/irb/notifier.rb: [Doc] Fix typo
...
* ext/json/lib/json/common.rb: Ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@43881 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-11-27 12:56:08 +00:00
naruse
14cab32596
* ext/json: merge JSON 1.8.1.
...
002ac2771c...e09ffc0d7d
* 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
2013-11-20 02:55:08 +00:00
nobu
3f78d84661
Eliminate less-than-zero checks for unsigned variables
...
* 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
2013-09-12 13:37:11 +00:00
nobu
b4e9b0d19c
json/add/range.rb: use Range#end
...
* 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
2013-08-06 12:38:53 +00:00
hsbt
7eeb65397d
fixup stying of `Json#generate` parameter docs by @daveworth [fixes GH-339]
...
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@41862 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-07-09 11:48:19 +00:00
naruse
cac2f455a9
* ext/json/fbuffer/fbuffer.h (fbuffer_append_str): change the place of
...
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
2013-06-07 04:45:16 +00:00
naruse
ce573f3166
* ext/json/generator/generator.c (isArrayOrObject): cast char to
...
unsigned char. [Bug #8378 ]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@40609 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-05-08 05:00:02 +00:00
naruse
279c7bdd88
* ext/json/generator/depend: fix dependencies [Bug #8379 ]
...
* ext/json/parser/depend: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@40608 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-05-08 04:59:52 +00:00
zzak
3a7a773aeb
* ext/socket/option.c: Document synonymous methods, by windwiny [GH-277]
...
* 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
2013-04-16 03:25:50 +00:00
naruse
062d2ee6f7
* ext/json: merge JSON 1.7.7.
...
This includes security fix. [CVE-2013-0269]
d0a62f3ced
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
2013-02-12 03:05:45 +00:00
zzak
53bc349069
* ext/json/lib/json.rb: Move module overview definition for rdoc
...
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39046 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-02-04 19:39:15 +00:00
naruse
43f6fdfb42
* ext/json: merge JSON 1.7.5.
...
fix tests and other fixes.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38346 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-12-12 10:51:49 +00:00
nobu
396903d384
depend: dependency
...
* ext/json/generator/depend: fix missing dependency.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37073 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-10-03 07:33:24 +00:00
nobu
30fbd739a1
fix dependency
...
* 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
2012-08-31 04:58:18 +00:00
kanemoto
48cb947793
avoid compilation error on AIX by -ansi -std=iso9899:199409 (r36038). [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
2012-07-25 22:26:41 +00:00
nobu
c196e22a42
Revert r35684 "* trunk/ext/json/extconf.rb: remove fake file."
...
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35693 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-05-18 08:26:10 +00:00
nobu
d17b97ce64
* trunk/ext/json/extconf.rb: remove fake file.
...
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35684 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-05-18 05:06:49 +00:00
nobu
9c4fc91c6b
* ext/json/lib/json/generic_object.rb: missing file.
...
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35573 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-05-07 18:44:36 +00:00
naruse
5a00be2bf7
* ext/json: Merge JSON 1.7.1.
...
e5b9a9465c
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35568 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-05-07 16:00:49 +00:00
naruse
251001c829
Revert r35560.
...
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
2012-05-07 08:46:50 +00:00
usa
e9231035b2
* ext/json/parser/depend: need to specify the base directory for nmake.
...
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35561 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-05-07 08:25:02 +00:00
nobu
0bd56268cb
ext/json/fbuffer/fbuffer.h
...
* 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
2012-05-07 05:11:45 +00:00
naruse
164ced04de
Add debug prints to inspect TC_JSONGenerate#test_gc's timeout issue.
...
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35336 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-04-15 07:37:45 +00:00
naruse
e0ba59b708
Additional experimental fix for r35261.
...
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35264 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-04-08 19:17:32 +00:00
naruse
fdc3882820
* ext/json/generator/generator.c (generate_json_bignum):
...
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
2012-04-08 13:46:53 +00:00
naruse
199d1fa924
Add missing files of r34971,
...
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@34973 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-03-11 17:42:18 +00:00
naruse
4d8d3184d1
* 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
2012-03-11 13:36:06 +00:00
naruse
c358a4cba1
* ext/json/parser/parser.rl (json_string_unescape): workaround fix
...
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
2012-01-15 06:52:36 +00:00
naruse
179cf473c2
Fix typo: U+0456->U+0069. [Bug #5275 ]
...
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@33192 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-09-05 09:05:13 +00:00
naruse
c06658feba
* ext/json: Merge json gem v1.5.4 (3dab4c5a6a97fac03dac).
...
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@33142 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-08-31 06:56:16 +00:00
naruse
28bba481f9
Don't include complex and rational; fix r33122.
...
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@33124 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-08-30 05:21:27 +00:00
naruse
b14c060dda
* ext/json: Merge json gem 1.5.4+ (2149f4185c598fb97db1).
...
[Bug #5173 ] [ruby-core:38866]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@33122 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-08-30 02:23:12 +00:00
naruse
a2e497d5ed
* ext/json: Merge json gem 1.5.4+ (f7f78896607b6f6226cd).
...
[Bug #4700 ]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@32493 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-07-10 08:01:04 +00:00
nobu
29e497d231
* ext/json/{generator/generator.c,parser/parser.rl}: fix indent.
...
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@32460 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-07-08 09:00:54 +00:00
nobu
bc1fd9458d
* ext/json/parser/parser.rl (JSON_parse_object): add missing parens.
...
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@32459 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-07-08 09:00:51 +00:00
nobu
4902ef7d59
* ext/json/parser/parser.rl (convert_encoding): should not modify
...
the argument.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@32458 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-07-08 07:40:41 +00:00