[DRE-commits] [ruby-oj] 01/02: Merge tag 'upstream/2.9.4'

[Cédric Boutillier]

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

boutil pushed a commit to branch master
in repository ruby-oj.

commit 112530b522ae2c7b11c2641fc4963417a21d7f1f
Merge: 9f2a402 34dcf9b
Author: Cédric Boutillier <boutil at debian.org>
Date:   Thu May 29 23:01:43 2014 +0200

    Merge tag 'upstream/2.9.4'
    
    Upstream version 2.9.4
    
    # gpg: Signature faite le jeu. 29 mai 2014 23:01:39 CEST avec la clef RSA d'identifiant 39CD217A
    # gpg: Bonne signature de « Cédric Boutillier <boutil at debian.org> »
    # gpg:                 alias « Cédric Boutillier <cedric.boutillier at upmc.fr> »
    # gpg:                 alias « Cédric Boutillier <cedric.boutillier at polytechnique.org> »
    # gpg:                 alias « Cédric Boutillier <cedric.boutillier at gmail.com> »

 README.md                                |   6 +-
 checksums.yaml.gz                        | Bin 268 -> 267 bytes
 ext/oj/buf.h                             |   2 +-
 ext/oj/compat.c                          |  16 +-
 ext/oj/dump.c                            | 334 +++++++++++++-------
 ext/oj/err.h                             |   2 +-
 ext/oj/object.c                          |  70 +++--
 ext/oj/odd.c                             |  58 +++-
 ext/oj/odd.h                             |   1 +
 ext/oj/oj.c                              | 134 ++++++---
 ext/oj/oj.h                              |   3 +
 ext/oj/parse.c                           |  44 ++-
 ext/oj/parse.h                           |  13 +-
 ext/oj/reader.c                          | 246 +++++++++++++++
 ext/oj/reader.h                          | 173 +++++++++++
 ext/oj/saj.c                             |  23 +-
 ext/oj/scp.c                             |  16 +-
 ext/oj/{parse.c => sparse.c}             | 502 ++++++++++++++-----------------
 ext/oj/strict.c                          |   8 +-
 ext/oj/val_stack.h                       |   3 +
 lib/oj/version.rb                        |   2 +-
 metadata.yml                             |  24 +-
 test/a.rb                                |  38 +++
 test/bug.rb                              |  17 ++
 test/e.rb                                |  12 +
 test/foo.rb                              |  24 ++
 test/lots.rb                             |  68 +++++
 test/mj.rb                               |  48 +++
 test/perf1.rb                            |  64 ----
 test/perf2.rb                            |  76 -----
 test/perf_fast.rb                        |  18 +-
 test/perf_file.rb                        |  64 ++++
 test/perf_obj_old.rb                     | 213 -------------
 test/perf_object.rb                      |   3 +-
 test/perf_str.rb                         |  38 +++
 test/perf_strict.rb                      |   1 +
 test/{perf_strict.rb => perf_strictx.rb} |  40 +--
 test/struct.rb                           |  29 ++
 test/test_file.rb                        | 242 +++++++++++++++
 test/test_mimic.rb                       |  24 +-
 test/test_object.rb                      |  90 ++++++
 test/test_scp.rb                         |  16 +
 test/test_strict.rb                      |   7 +
 test/test_strictx.rb                     |  58 ++++
 test/tests.rb                            |  51 ++--
 test/write_fake_log.rb                   |  63 ++++
 test/x.rb                                |  59 ++++
 47 files changed, 2129 insertions(+), 914 deletions(-)

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