[DRE-commits] [ruby-oj] 01/03: Merge tag 'upstream/2.1.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 5d6c388b1489a8ea70db217915d15dab72ad691f
Merge: 35d0d31 79293b1
Author: Cédric Boutillier <boutil at debian.org>
Date:   Fri Jul 5 13:37:52 2013 +0200

    Merge tag 'upstream/2.1.4'
    
    Upstream version 2.1.4
    
    # gpg: Signature faite le ven. 05 juil. 2013 13:37:46 CEST avec la clef RSA d'identifiant 11E149E9
    # 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                            |  409 ++-----------
 checksums.yaml.gz                    |  Bin 270 -> 270 bytes
 ext/oj/{cache.h => buf.h}            |   77 ++-
 ext/oj/cache.c                       |  148 -----
 ext/oj/cache8.c                      |    4 +
 ext/oj/{cache.h => circarray.c}      |   69 ++-
 ext/oj/{cache.h => circarray.h}      |   28 +-
 ext/oj/compat.c                      |  112 ++++
 ext/oj/dump.c                        |   10 +-
 ext/oj/{cache.h => encode.h}         |   35 +-
 ext/oj/{cache.h => err.c}            |   56 +-
 ext/oj/{cache.h => err.h}            |   38 +-
 ext/oj/extconf.rb                    |    1 +
 ext/oj/fast.c                        |   20 +-
 ext/oj/foo.rb                        |    6 -
 ext/oj/hash.c                        |  160 +++++
 ext/oj/{cache.h => hash.h}           |   20 +-
 ext/oj/hash_test.c                   |  513 ++++++++++++++++
 ext/oj/load.c                        | 1080 ----------------------------------
 ext/oj/object.c                      |  521 ++++++++++++++++
 ext/oj/odd.c                         |  159 +++++
 ext/oj/{cache.h => odd.h}            |   43 +-
 ext/oj/oj.c                          |  742 +++++++++++------------
 ext/oj/oj.h                          |   45 +-
 ext/oj/parse.c                       |  797 +++++++++++++++++++++++++
 ext/oj/parse.h                       |   88 +++
 ext/oj/resolve.c                     |  117 ++++
 ext/oj/{cache.h => resolve.h}        |   18 +-
 ext/oj/saj.c                         |  157 ++---
 ext/oj/scp.c                         |  301 ++++++++++
 ext/oj/strict.c                      |  159 +++++
 ext/oj/{cache.h => val_stack.c}      |   36 +-
 ext/oj/val_stack.h                   |  168 ++++++
 lib/oj.rb                            |    1 +
 lib/oj/mimic.rb                      |   12 +-
 lib/oj/saj.rb                        |   19 +-
 lib/oj/schandler.rb                  |   70 +++
 lib/oj/version.rb                    |    2 +-
 metadata.yml                         |   51 +-
 test/bug.rb                          |   34 +-
 test/e.rb                            |   12 +
 test/foo.rb                          |   24 +
 test/perf1.rb                        |   64 --
 test/perf2.rb                        |   76 ---
 test/perf_compat.rb                  |  128 ++++
 test/perf_obj_old.rb                 |  213 -------
 test/{perf_obj.rb => perf_object.rb} |   24 +-
 test/perf_scp.rb                     |  151 +++++
 test/perf_strict.rb                  |  145 +----
 test/sample.rb                       |    4 +-
 test/test_compat.rb                  |  342 +++++++++++
 test/test_fast.rb                    |    9 +
 test/test_mimic_after.rb             |   35 ++
 test/test_object.rb                  |  390 ++++++++++++
 test/test_saj.rb                     |    2 +-
 test/test_scp.rb                     |  224 +++++++
 test/test_strict.rb                  |  259 ++++++++
 test/tests.rb                        |   88 ++-
 test/x.rb                            |   59 ++
 59 files changed, 5799 insertions(+), 2776 deletions(-)

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