Граф коммитов

69 Коммитов

Автор SHA1 Сообщение Дата
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
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 b5f628a84a * ext/json/lib/json/common.rb (JSON::MissingUnicodeSupport.iconv):
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
2011-02-06 04:48:49 +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
nobu 03ca479728 * ext/json/generator/generator.{c,h} (fbuffer_free_only_buffer):
unused.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30346 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-12-25 04:49:34 +00:00
nobu 514a5b3b71 * ext/json/generator/generator.c (fbuffer_free): unused.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30338 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-12-25 01:51:06 +00:00
naruse c20b8f75dd * ext/json/lib/json/add/rails.rb: removed.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30053 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-12-02 12:28:45 +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 521876c373 * ext/json/lib/json/common.rb: don't use iconv on 1.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
2010-12-01 16:26:15 +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 b117475e18 * ext/json/generator/generator.c (fbuffer_free): removed unused function.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@28692 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-07-20 09:47:50 +00:00
naruse 7021db80f3 * ext/json/generator/generator.c (fbuffer_inc_capa):
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
2010-05-09 00:50:36 +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 dc22009c26 * ext/json: Update to JSON 1.4.2.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@27535 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-04-28 14:26:30 +00:00
usa 76b33197e2 * ext/json/generator/generator.c (convert_UTF8_to_JSON_ASCII): get rid
of a warning.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@27502 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-04-26 06:43:36 +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
nobu 977267c2e0 * ext/**/*.[ch]: removed trailing spaces.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@27437 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-04-22 08:04:13 +00:00
nobu 4e637b320f * ext/json/lib/**/*.rb: not executable.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@26811 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-03-04 01:05:00 +00:00
nobu dc087bf85d * ext/json/lib/json/common.rb (recurse_proc): removed needless
module_function, since visibility is already module_function.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@25153 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2009-09-29 08:02:47 +00:00
naruse e662770dc9 * ext/json/ext/generator/generator.c: Documention patch by okkez.
[Bug #2075]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@25114 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2009-09-26 20:37:06 +00:00
nobu a4fbd748e2 * configure.in (GCC): subst for GCC depending extension libraries.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@24861 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2009-09-12 08:31:44 +00:00
naruse d17fe8a467 NaN is now 0.0/0 because of 1.8/1.9 compat.
* ext/json/lib/json/common.rb (NaN): Change definition
  of NaN to 0.0/0 for 1.8/1.9 compatibility.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@24730 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2009-09-01 17:35:30 +00:00
naruse c719ecb535 * ext/json: Update to JSON 1.1.9.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@24727 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2009-09-01 16:17:56 +00:00
matz edf05962c0 * ext/json/lib/json/common.rb (JSON#recurse_proc): remove
unnecessary private specifier.  [ruby-dev:38929]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@24310 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2009-07-28 18:40:17 +00:00
naruse 4f364c6bf7 Update to JSON 1.1.4.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@23346 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2009-05-05 02:32:49 +00:00
nobu 287a34ae0d * {ext,lib,test}/**/*.rb: removed trailing spaces.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@22784 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2009-03-06 03:56:38 +00:00
naruse 5b35f2c137 * ext/json/ext/parser/parser.c (JSON_parse_string):
associate encoding.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19745 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-10-10 08:28:19 +00:00
naruse 3b1e5ba31c * ext/json/ext/generator/extconf.rb: fix target.
* ext/json/ext/parser/extconf.rb: ditto.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19725 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-10-09 07:34:56 +00:00
naruse cd9f5a1eee * ext/json/lib/json/pure/generator.rb (utf8_to_json):
process each unpacked Unicode character.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19714 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-10-08 08:03:08 +00:00
naruse 87259f9a5f * ext/json/lib/json/pure/parser.rb
(JSON::Pure::Parser#parse_string): force_encoding("UTF-8").

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19713 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-10-08 06:01:48 +00:00
naruse 84f677d2f3 * ext/json/lib/json/pure/generator.rb (utf8_to_json):
force_encoding before gsub.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19704 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-10-07 07:50:43 +00:00
naruse 6d58b1e54f * ext/json/lib/json/pure/generator.rb (utf8_to_json):
downcase the result of Unicode escape.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19703 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-10-07 07:37:23 +00:00
naruse be93ac50db * ext/json/lib/json/pure.rb (module JSON): remove Iconv dependency.
* ext/json/lib/json/pure/generator.rb (utf8_to_json): process as
  binary and remove Iconv dependency.

* ext/json/lib/json/pure/parser.rb (parse_string): ditto.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19666 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-10-03 10:36:10 +00:00
naruse 67526f3090 * ext/json/ext/parser/parse.c: use ruby_xfree().
* ext/json/ext/parser/parse.rl: ditto.

* ext/json/ext/parser/unicode.c: ditto.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19438 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-09-20 17:57:51 +00:00
naruse 55f9cc806d * ext/json/ext/parser/parse.c: use ruby_xfree().
* ext/json/ext/parser/parse.rl: ditto.

* ext/json/ext/parser/unicode.c: ditto.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19437 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-09-20 17:54:46 +00:00
naruse e8eb95ec33 * ext/json: import JSON v 1.1.3.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19436 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-09-20 17:41:14 +00:00