archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-08-25 05:55:46 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4
77079 commits 30 branches 1174 tags 513 MiB
Commit graph

261 commits

Author SHA1 Message Date
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
mame
104e841390 * sprintf.c: include ieeefp.h to refer isinf. 
* ext/bigdecimal/bigdecimal.c: ditto.

* ext/json/ext/generator/generator.c: ditto.

* rational.c: ditto.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@17824 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
 2008-07-02 16:24:11 +00:00
mame
da3be0f3d3 * ext/json/ext/parser/parser.rl, ext/json/ext/parser/parser.c: JSON 
text SHALL be encoded in Unicode.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@17436 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
 2008-06-19 14:47:04 +00:00
ko1
72ba13aa8e * array.c, bignum.c, cont.c, dir.c, dln.c, encoding.c, enumerator.c, 
enumerator.c (enumerator_allocate), eval_jump.c, file.c, hash.c,
  io.c, load.c, pack.c, proc.c, random.c, re.c, ruby.c, st.c,
  string.c, thread.c, thread_pthread.c, time.c, util.c, variable.c,
  vm.c, gc.c:
  allocated memory objects by xmalloc (ruby_xmalloc) should be
  freed by xfree (ruby_xfree).
* ext/curses/curses.c, ext/dbm/dbm.c, ext/digest/digest.c,
  ext/gdbm/gdbm.c, ext/json/ext/parser/parser.c,
  ext/json/ext/parser/unicode.c, ext/openssl/ossl_cipher.c,
  ext/openssl/ossl_hmac.c, ext/openssl/ossl_pkey_ec.c,
  ext/sdbm/init.c, ext/strscan/strscan.c, ext/zlib/zlib.c:
  ditto.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@17017 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
 2008-06-08 10:01:40 +00:00
naruse
40d8d38909 * ext/json/lib/json/pure/generator.rb, 
ext/json/lib/json/pure/parser.rb, ext/openssl/lib/openssl/x509.rb,
ext/win32ole/sample/olegen.rb, lib/date/format.rb, lib/irb/context.rb,
lib/irb/workspace.rb, lib/net/http.rb, lib/net/imap.rb,
lib/rdoc/generator.rb, lib/rdoc/markup/to_html.rb,
lib/rdoc/markup/to_latex.rb, lib/rdoc/parsers/parse_c.rb,
lib/rdoc/ri/formatter.rb, lib/rexml/parsers/baseparser.rb,
lib/rexml/quickpath.rb, lib/rexml/text.rb, lib/rss/parser.rb,
lib/uri/common.rb, lib/uri/generic.rb, lib/webrick/httpresponse.rb,
lib/webrick/httpservlet/filehandler.rb, lib/yaml/baseemitter.rb,
lib/yaml/encoding.rb: performance tuning arround String#gsub.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@15442 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
 2008-02-12 06:18:06 +00:00
nobu
db5a25f3f3 * ext/json/ext/generator/generator.c (Init_generator): requires 
json/common.rb for GeneratorError, when static linked.  a patch from
  Kenta Murata <muraken AT gmail.com> in [ruby-dev:32789].


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@14710 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
 2007-12-25 15:57:55 +00:00
nobu
8b6cb6994c * common.mk (ruby.imp): fix for circular dependency. a patch from 
Yutaka Kanemoto <kinpoco AT gmail.com> in [ruby-dev:32590].

* regint.h, st.c, ext/json/ext/generator/generator.c: suppress
  warnings on AIX.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@14226 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
 2007-12-14 04:47:57 +00:00
naruse
825ce503c0 * lib/json.rb, lib/json/*: moved to ext/json/lib. 
--

M    trunk/ChangeLog
D    trunk/lib/json
D    trunk/lib/json.rb
A    trunk/ext/json/lib
A    trunk/ext/json/lib/json
A    trunk/ext/json/lib/json.rb
A    trunk/ext/json/extconf.rb


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@14100 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
 2007-12-04 08:09:44 +00:00
naruse
0cf0b82418 * ext/json, lib/json, test/json: Update to JSON 1.1.2. 
(RubyForge#15447)

* math.c: fix typo.
-- 

M    ChangeLog
M    math.c
M    ext/json/ext/generator/generator.c
M    ext/json/ext/parser/parser.rl
M    ext/json/ext/parser/parser.c
M    lib/json/version.rb
M    lib/json/editor.rb
M    lib/json/common.rb
M    lib/json/pure/parser.rb
M    test/json/test_json_unicode.rb
M    test/json/test_json_fixtures.rb
M    test/json/test_json_generate.rb
M    test/json/test_json_addition.rb
M    test/json/test_json.rb
M    test/json/runner.rb


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@14044 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
 2007-11-28 09:22:57 +00:00