[jruby-joni] 263/279: Merge tag 'upstream/2.1.6'

[Hideki Yamane]

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

henrich pushed a commit to branch debian/sid
in repository jruby-joni.

commit 1dd64ada59cb6b75e550266fd723390b5fbbeeee
Merge: efafa02 39fa758
Author: Hideki Yamane <henrich at debian.org>
Date:   Wed Apr 29 23:22:31 2015 +0900

    Merge tag 'upstream/2.1.6'
    
    Upstream version 2.1.6

 pom.xml                                            |   2 +-
 src/org/joni/Analyser.java                         |  33 ++--
 src/org/joni/ArrayCompiler.java                    |  89 ++++++----
 src/org/joni/ByteCodeMachine.java                  |   9 +
 src/org/joni/ByteCodePrinter.java                  |   8 +
 src/org/joni/Lexer.java                            |  37 +++-
 src/org/joni/Option.java                           |  40 +++--
 src/org/joni/Parser.java                           | 128 +++++++++++++-
 src/org/joni/Regex.java                            |   7 +-
 src/org/joni/StackMachine.java                     |   5 +-
 src/org/joni/Syntax.java                           |  54 +++++-
 src/org/joni/Token.java                            |  13 +-
 src/org/joni/ast/AnchorNode.java                   |  38 ++--
 src/org/joni/ast/CClassNode.java                   |  50 ++++--
 src/org/joni/ast/CTypeNode.java                    |   9 +-
 src/org/joni/ast/EncloseNode.java                  |  25 +--
 src/org/joni/constants/EncloseType.java            |   1 +
 src/org/joni/constants/OPCode.java                 | 192 ++++++++++++---------
 src/org/joni/constants/OPSize.java                 |   1 +
 src/org/joni/constants/RegexState.java             |  28 ---
 src/org/joni/constants/SyntaxProperties.java       |  17 +-
 src/org/joni/constants/TokenType.java              |   3 +
 src/org/joni/exception/ErrorMessages.java          |   1 +
 test/org/joni/test/TestA.java                      |  28 +++
 .../org/joni/test/TestAU.java                      |  36 +++-
 test/org/joni/test/TestJoni.java                   |  10 ++
 .../org/joni/test/TestPerl.java                    |  37 +++-
 test/org/joni/test/TestU8.java                     |   8 +-
 28 files changed, 632 insertions(+), 277 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jruby-joni.git