summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--defs/default_gems1
-rw-r--r--ext/json/extconf.rb3
-rw-r--r--ext/json/fbuffer/fbuffer.h190
-rw-r--r--ext/json/generator/depend21
-rw-r--r--ext/json/generator/extconf.rb4
-rw-r--r--ext/json/generator/generator.c1463
-rw-r--r--ext/json/generator/generator.h167
-rw-r--r--ext/json/lib/json.rb62
-rw-r--r--ext/json/lib/json/add/bigdecimal.rb28
-rw-r--r--ext/json/lib/json/add/complex.rb28
-rw-r--r--ext/json/lib/json/add/core.rb11
-rw-r--r--ext/json/lib/json/add/date.rb34
-rw-r--r--ext/json/lib/json/add/date_time.rb50
-rw-r--r--ext/json/lib/json/add/exception.rb31
-rw-r--r--ext/json/lib/json/add/ostruct.rb31
-rw-r--r--ext/json/lib/json/add/range.rb29
-rw-r--r--ext/json/lib/json/add/rational.rb27
-rw-r--r--ext/json/lib/json/add/regexp.rb30
-rw-r--r--ext/json/lib/json/add/struct.rb30
-rw-r--r--ext/json/lib/json/add/symbol.rb25
-rw-r--r--ext/json/lib/json/add/time.rb38
-rw-r--r--ext/json/lib/json/common.rb484
-rw-r--r--ext/json/lib/json/ext.rb21
-rw-r--r--ext/json/lib/json/generic_object.rb62
-rw-r--r--ext/json/lib/json/version.rb8
-rw-r--r--ext/json/parser/depend20
-rw-r--r--ext/json/parser/extconf.rb3
-rw-r--r--ext/json/parser/parser.c2222
-rw-r--r--ext/json/parser/parser.h93
-rw-r--r--ext/json/parser/parser.rl945
-rw-r--r--ext/json/parser/prereq.mk10
-rw-r--r--gems/bundled_gems1
-rw-r--r--lib/rdoc/rubygems_hook.rb8
-rw-r--r--lib/rdoc/test_case.rb6
-rw-r--r--lib/rubygems/test_case.rb11
-rw-r--r--test/json/fixtures/fail1.json1
-rw-r--r--test/json/fixtures/fail10.json1
-rw-r--r--test/json/fixtures/fail11.json1
-rw-r--r--test/json/fixtures/fail12.json1
-rw-r--r--test/json/fixtures/fail13.json1
-rw-r--r--test/json/fixtures/fail14.json1
-rw-r--r--test/json/fixtures/fail18.json1
-rw-r--r--test/json/fixtures/fail19.json1
-rw-r--r--test/json/fixtures/fail2.json1
-rw-r--r--test/json/fixtures/fail20.json1
-rw-r--r--test/json/fixtures/fail21.json1
-rw-r--r--test/json/fixtures/fail22.json1
-rw-r--r--test/json/fixtures/fail23.json1
-rw-r--r--test/json/fixtures/fail24.json1
-rw-r--r--test/json/fixtures/fail25.json1
-rw-r--r--test/json/fixtures/fail27.json2
-rw-r--r--test/json/fixtures/fail28.json2
-rw-r--r--test/json/fixtures/fail3.json1
-rw-r--r--test/json/fixtures/fail4.json1
-rw-r--r--test/json/fixtures/fail5.json1
-rw-r--r--test/json/fixtures/fail6.json1
-rw-r--r--test/json/fixtures/fail7.json1
-rw-r--r--test/json/fixtures/fail8.json1
-rw-r--r--test/json/fixtures/fail9.json1
-rw-r--r--test/json/fixtures/pass1.json56
-rw-r--r--test/json/fixtures/pass15.json1
-rw-r--r--test/json/fixtures/pass16.json1
-rw-r--r--test/json/fixtures/pass17.json1
-rw-r--r--test/json/fixtures/pass2.json1
-rw-r--r--test/json/fixtures/pass26.json1
-rw-r--r--test/json/fixtures/pass3.json6
-rw-r--r--test/json/setup_variant.rb11
-rw-r--r--test/json/test_json.rb553
-rw-r--r--test/json/test_json_addition.rb196
-rw-r--r--test/json/test_json_encoding.rb65
-rw-r--r--test/json/test_json_fixtures.rb35
-rw-r--r--test/json/test_json_generate.rb347
-rw-r--r--test/json/test_json_generic_object.rb75
-rw-r--r--test/json/test_json_string_matching.rb39
-rw-r--r--test/json/test_json_unicode.rb72
-rw-r--r--test/rdoc/test_rdoc_generator_darkfish.rb3
-rw-r--r--test/rdoc/test_rdoc_generator_json_index.rb3
-rw-r--r--test/rdoc/test_rdoc_rubygems_hook.rb5
-rw-r--r--test/rdoc/test_rdoc_servlet.rb3
-rw-r--r--test/ruby/test_extlibs.rb1
-rw-r--r--test/rubygems/test_gem_commands_install_command.rb2
-rw-r--r--test/rubygems/test_gem_commands_update_command.rb3
83 files changed, 7679 insertions, 29 deletions
@@ -1,3 +1,8 @@
Sun Apr 12 15:34:59 2015 Nobuyoshi Nakada <[email protected]>
* parse.y (arg): fix segfault by null caused by syntax error.
@@ -1,2 +1,3 @@
# gem base directory versioning file [executable files under bin]
rdoc lib/rdoc lib/rdoc.rb [rdoc ri]
@@ -0,0 +1,3 @@
@@ -0,0 +1,190 @@
@@ -0,0 +1,21 @@
@@ -0,0 +1,4 @@
@@ -0,0 +1,1463 @@
@@ -0,0 +1,167 @@
@@ -0,0 +1,62 @@
@@ -0,0 +1,28 @@
@@ -0,0 +1,28 @@
@@ -0,0 +1,11 @@
@@ -0,0 +1,34 @@
@@ -0,0 +1,50 @@
@@ -0,0 +1,31 @@
@@ -0,0 +1,31 @@
@@ -0,0 +1,29 @@
@@ -0,0 +1,27 @@
@@ -0,0 +1,30 @@
@@ -0,0 +1,30 @@
@@ -0,0 +1,25 @@
@@ -0,0 +1,38 @@
@@ -0,0 +1,484 @@
@@ -0,0 +1,21 @@
@@ -0,0 +1,62 @@
@@ -0,0 +1,8 @@
@@ -0,0 +1,20 @@
@@ -0,0 +1,3 @@
@@ -0,0 +1,2222 @@
@@ -0,0 +1,93 @@
@@ -0,0 +1,945 @@
@@ -0,0 +1,10 @@
@@ -2,4 +2,3 @@ power_assert 0.2.2
test-unit 3.0.9
minitest 5.4.3
rake 10.4.2
-json 1.8.2
@@ -3,11 +3,6 @@ require 'rubygems/user_interaction'
require 'fileutils'
require 'rdoc'
-begin
- require 'json'
-rescue LoadError
-end
-
##
# Gem::RDoc provides methods to generate RDoc and ri data for installed gems
# upon gem installation.
@@ -205,7 +200,7 @@ class RDoc::RubygemsHook
@generate_ri and (@force or not File.exist? @ri_dir)
document 'darkfish', options, @rdoc_dir if
- defined?(JSON) and @generate_rdoc and (@force or not File.exist? @rdoc_dir)
end
##
@@ -255,3 +250,4 @@ class RDoc::RubygemsHook
end
end
@@ -6,11 +6,6 @@ rescue NoMethodError, Gem::LoadError
# for ruby tests
end
-begin
- require 'json'
-rescue LoadError
-end
-
require 'minitest/autorun'
require 'minitest/benchmark' if ENV['BENCHMARK']
@@ -219,3 +214,4 @@ $LOAD_PATH.each do |load_path|
break if load_path[0] == ?/
load_path.replace File.expand_path load_path
end if RUBY_VERSION < '1.9'
@@ -21,16 +21,7 @@ end
# them while we're testing rubygems, and thus we can't actually load them.
unless Gem::Dependency.new('rdoc', '>= 3.10').matching_specs.empty?
gem 'rdoc'
- begin
- gem 'json'
- rescue Gem::LoadError
- # for Ruby 2.3.0
- end
-end
-
-begin
- require 'json'
-rescue LoadError
end
require 'minitest/autorun'
@@ -0,0 +1 @@
@@ -0,0 +1 @@
@@ -0,0 +1 @@
@@ -0,0 +1 @@
@@ -0,0 +1 @@
@@ -0,0 +1 @@
@@ -0,0 +1 @@
@@ -0,0 +1 @@
@@ -0,0 +1 @@
@@ -0,0 +1 @@
@@ -0,0 +1 @@
@@ -0,0 +1 @@
@@ -0,0 +1 @@
@@ -0,0 +1 @@
@@ -0,0 +1 @@
@@ -0,0 +1,2 @@
@@ -0,0 +1,2 @@
@@ -0,0 +1 @@
@@ -0,0 +1 @@
@@ -0,0 +1 @@
@@ -0,0 +1 @@
@@ -0,0 +1 @@
@@ -0,0 +1 @@
@@ -0,0 +1 @@
@@ -0,0 +1,56 @@
@@ -0,0 +1 @@
@@ -0,0 +1 @@
@@ -0,0 +1 @@
@@ -0,0 +1 @@
@@ -0,0 +1 @@
@@ -0,0 +1,6 @@
@@ -0,0 +1,11 @@
@@ -0,0 +1,553 @@
@@ -0,0 +1,196 @@
@@ -0,0 +1,65 @@
@@ -0,0 +1,35 @@
@@ -0,0 +1,347 @@
@@ -0,0 +1,75 @@
@@ -0,0 +1,39 @@
@@ -0,0 +1,72 @@
@@ -225,4 +225,5 @@ class TestRDocGeneratorDarkfish < RDoc::TestCase
"#{filename} is not hard-linked"
end
-end if defined?(JSON)
@@ -320,4 +320,5 @@ class TestRDocGeneratorJsonIndex < RDoc::TestCase
assert_equal 'cd', @g.search_string('C d')
end
-end if defined?(JSON)
@@ -66,7 +66,7 @@ class TestRDocRubygemsHook < Gem::TestCase
@hook.document 'darkfish', options, @a.doc_dir('rdoc')
assert @hook.rdoc_installed?
- end if defined?(JSON)
def test_generate
FileUtils.mkdir_p @a.doc_dir
@@ -105,7 +105,7 @@ class TestRDocRubygemsHook < Gem::TestCase
assert_equal %w[README lib], rdoc.options.files.sort
assert_equal 'MyTitle', rdoc.store.main
- end if defined?(JSON)
def test_generate_configuration_rdoc_array
Gem.configuration[:rdoc] = %w[-A]
@@ -248,3 +248,4 @@ class TestRDocRubygemsHook < Gem::TestCase
end
end
@@ -531,4 +531,5 @@ class TestRDocServlet < RDoc::TestCase
store.save
end
-end if defined?(JSON)
@@ -59,6 +59,7 @@ class TestExtLibs < Test::Unit::TestCase
check_existence "io/console"
check_existence "io/nonblock"
check_existence "io/wait"
check_existence "mathn/complex"
check_existence "mathn/rational"
check_existence "nkf"
@@ -379,7 +379,7 @@ ERROR: Possible alternatives: non_existent_with_hint
wait_for_child_process_to_exit
assert_path_exists File.join(a2.doc_dir, 'ri')
- assert_path_exists File.join(a2.doc_dir, 'rdoc') if defined?(JSON)
end
def test_execute_saves_build_args
@@ -265,7 +265,7 @@ class TestGemCommandsUpdateCommand < Gem::TestCase
a2 = @specs['a-2']
assert_path_exists File.join(a2.doc_dir, 'rdoc')
- end if defined?(JSON)
def test_execute_named
spec_fetcher do |fetcher|
@@ -540,3 +540,4 @@ class TestGemCommandsUpdateCommand < Gem::TestCase
end
end