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
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
nobu
b16fd08622
* ext/json/parser/parser.rl (convert_encoding): no needs to use
...
force_encoding.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@32457 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-07-08 07:39:09 +00:00
nobu
c23dea553e
* ext/json/parser/prereq.mk: remove trailing spaces.
...
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@32455 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-07-08 07:01:16 +00:00
nobu
3a47cf3395
* remove trailing spaces.
...
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@31573 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-05-15 11:55:52 +00:00
nobu
1069e5d665
* ext/json/parser/parser.h (GET_PARSER): raise TypeError.
...
* 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
2011-02-05 02:29:18 +00:00
nobu
9cc62abc6b
* ext/json/parser/parser.h (GET_PARSER): check if initialized.
...
[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
2011-02-05 01:30:01 +00:00
nobu
bc1e4b4e2a
* ext/json/parser/parser.rl: add local variables for emacs.
...
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30790 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-02-05 01:13:41 +00:00
naruse
6d74458037
* ext/json/generator/extconf.rb: remove the lines which set -O3
...
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
2010-12-02 01:12:41 +00:00
naruse
4a84c27e3e
* ext/json: Update github/flori/json from 1.4.2+ to
...
e22b2f2bdfe6a9b0. this fixes some bugs.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30003 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-12-01 16:26:13 +00:00
nobu
8d228b2579
* common.mk (EXT_SRCS): add ext/json/parser/parser.c.
...
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@28780 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-07-28 21:51:31 +00:00
nobu
5d379991de
* ext/json/{generator/generator.c,parser/parser.rl}: fixed indent.
...
* ext/json/{generator,parser}/depend: added.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@27692 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-05-09 00:30:12 +00:00
naruse
3642494ce5
Recommit of JSON; fix mixed declarations.
...
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@27501 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-04-26 06:27:27 +00:00
usa
27be3056dc
* ext/jason: revert r27493. came again after canceling gcc-ism.
...
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@27500 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-04-26 04:34:36 +00:00
naruse
54592ad627
* ext/json: Update to JSON 1.4.1.
...
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@27493 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-04-26 00:06:35 +00:00