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 ef805f2d19b8ceabf3f5583d7e00a938443b73fd Author: Hideki Yamane <[email protected]> Date: Sat Oct 25 21:17:32 2014 +0900 Imported Upstream version 2.1.4 --- pom.xml | 2 +- src/org/joni/Parser.java | 2 +- src/org/joni/constants/AnchorType.java | 10 ++++++++-- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 2b91583..41c392f 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ <groupId>org.jruby.joni</groupId> <artifactId>joni</artifactId> <packaging>jar</packaging> - <version>2.1.2</version> + <version>2.1.4</version> <name>Joni</name> <description> Java port of Oniguruma: http://www.geocities.jp/kosako3/oniguruma diff --git a/src/org/joni/Parser.java b/src/org/joni/Parser.java index 62208a7..419993f 100644 --- a/src/org/joni/Parser.java +++ b/src/org/joni/Parser.java @@ -890,7 +890,7 @@ class Parser extends Lexer { while (token.type == TokenType.OP_REPEAT || token.type == TokenType.INTERVAL) { // repeat: if (target.isInvalidQuantifier()) newSyntaxException(ERR_TARGET_OF_REPEAT_OPERATOR_INVALID); - if (syntax.op2OptionECMAScript() && target.getType() == NodeType.QTFR) { + if (!group && syntax.op2OptionECMAScript() && target.getType() == NodeType.QTFR) { newSyntaxException(ERR_NESTED_REPEAT_NOT_ALLOWED); } QuantifierNode qtfr = new QuantifierNode(token.getRepeatLower(), diff --git a/src/org/joni/constants/AnchorType.java b/src/org/joni/constants/AnchorType.java index f297577..5a7562f 100644 --- a/src/org/joni/constants/AnchorType.java +++ b/src/org/joni/constants/AnchorType.java @@ -44,7 +44,10 @@ public interface AnchorType { final int KEEP = (1<<16); - final int ALLOWED_IN_LB = ( END_LINE | + final int ALLOWED_IN_LB = ( LOOK_BEHIND | + LOOK_BEHIND_NOT | + BEGIN_LINE | + END_LINE | BEGIN_BUF | BEGIN_POSITION | KEEP | @@ -54,7 +57,10 @@ public interface AnchorType { WORD_END ); - final int ALLOWED_IN_LB_NOT = ( END_LINE | + final int ALLOWED_IN_LB_NOT = ( LOOK_BEHIND | + LOOK_BEHIND_NOT | + BEGIN_LINE | + END_LINE | BEGIN_BUF | BEGIN_POSITION | KEEP | -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jruby-joni.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
