[DRE-commits] [ruby-json] 02/10: Merge tag 'upstream/2.0.1+dfsg'

[Lucas Nussbaum]

This is an automated email from the git hooks/post-receive script.

lucas pushed a commit to branch master
in repository ruby-json.

commit cd127183fb576340875ad5a27de4fdfbf76fdb85
Merge: 8fce742 1b851d8
Author: Lucas Nussbaum <lucas at debian.org>
Date:   Thu Jul 21 23:03:20 2016 +0200

    Merge tag 'upstream/2.0.1+dfsg'
    
    Upstream version 2.0.1+dfsg

 .travis.yml                                        |  14 +-
 CHANGES => CHANGES.md                              | 254 ++++---
 COPYING                                            |  58 --
 COPYING-json-jruby                                 |  57 --
 GPL                                                | 340 ---------
 Gemfile                                            |   3 +-
 README-json-jruby.markdown => README-json-jruby.md |   0
 README.rdoc => README.md                           | 256 ++++---
 Rakefile                                           |  55 +-
 TODO                                               |   1 -
 VERSION                                            |   2 +-
 ext/json/ext/generator/generator.c                 |  94 ++-
 ext/json/ext/generator/generator.h                 |   8 +-
 ext/json/ext/parser/extconf.rb                     |   3 +
 ext/json/ext/parser/parser.c                       | 777 +++++++++------------
 ext/json/ext/parser/parser.h                       |   8 +-
 ext/json/ext/parser/parser.rl                      | 256 +++----
 ext/json/extconf.rb                                |   1 -
 java/src/json/ext/ByteListTranscoder.java          |   3 +-
 java/src/json/ext/Generator.java                   |  23 +-
 java/src/json/ext/GeneratorMethods.java            |   3 +-
 java/src/json/ext/GeneratorService.java            |   3 +-
 java/src/json/ext/GeneratorState.java              |  59 +-
 java/src/json/ext/OptionsReader.java               |   5 +-
 java/src/json/ext/Parser.java                      | 521 +++-----------
 java/src/json/ext/Parser.rl                        | 144 +---
 java/src/json/ext/ParserService.java               |   3 +-
 java/src/json/ext/RuntimeInfo.java                 |   7 +-
 java/src/json/ext/StringDecoder.java               |   3 +-
 java/src/json/ext/StringEncoder.java               |   5 +
 java/src/json/ext/Utils.java                       |   3 +-
 json-java.gemspec                                  |  15 +
 json.gemspec                                       | Bin 5008 -> 5473 bytes
 json_pure.gemspec                                  |  49 +-
 lib/json.rb                                        |   1 +
 lib/json/add/bigdecimal.rb                         |   1 +
 lib/json/add/complex.rb                            |   3 +-
 lib/json/add/core.rb                               |   1 +
 lib/json/add/date.rb                               |   2 +-
 lib/json/add/date_time.rb                          |   2 +-
 lib/json/add/exception.rb                          |   2 +-
 lib/json/add/ostruct.rb                            |   2 +-
 lib/json/add/range.rb                              |   2 +-
 lib/json/add/rational.rb                           |   1 +
 lib/json/add/regexp.rb                             |   2 +-
 lib/json/add/struct.rb                             |   2 +-
 lib/json/add/symbol.rb                             |   2 +-
 lib/json/add/time.rb                               |   2 +-
 lib/json/common.rb                                 |  76 +-
 lib/json/ext.rb                                    |   6 -
 lib/json/generic_object.rb                         |   9 +-
 lib/json/pure.rb                                   |  10 +-
 lib/json/pure/generator.rb                         | 186 ++---
 lib/json/pure/parser.rb                            | 108 +--
 lib/json/version.rb                                |   3 +-
 metadata.yml                                       | 203 ------
 tests/fixtures/fail1.json                          |   1 -
 tests/fixtures/obsolete_fail1.json                 |   1 +
 ...test_json_addition.rb => json_addition_test.rb} |  47 +-
 tests/json_common_interface_test.rb                | 126 ++++
 tests/json_encoding_test.rb                        | 105 +++
 tests/json_ext_parser_test.rb                      |  15 +
 ...test_json_fixtures.rb => json_fixtures_test.rb} |  13 +-
 ...est_json_generate.rb => json_generator_test.rb} | 113 ++-
 ...neric_object.rb => json_generic_object_test.rb} |  23 +-
 tests/json_parser_test.rb                          | 448 ++++++++++++
 tests/json_string_matching_test.rb                 |  38 +
 tests/setup_variant.rb                             |  11 -
 tests/test_helper.rb                               |  23 +
 tests/test_json.rb                                 | 553 ---------------
 tests/test_json_encoding.rb                        |  65 --
 tests/test_json_string_matching.rb                 |  39 --
 tests/test_json_unicode.rb                         |  72 --
 tools/diff.sh                                      |  18 +
 tools/fuzz.rb                                      |  10 +-
 75 files changed, 2025 insertions(+), 3355 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/ruby-json.git