[jruby-joni] 42/194: fix char class

[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 b4e6fdb9749d9ef678d0875a17040443d2a623cb
Author: Marcin Mielzynski <lopx at gazeta.pl>
Date:   Fri Dec 29 18:26:03 2017 +0100

    fix char class
---
 src/org/joni/Parser.java       | 5 +++--
 test/org/joni/test/TestU8.java | 9 ++++++++-
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/org/joni/Parser.java b/src/org/joni/Parser.java
index 9ac56fd..ca1eeb3 100644
--- a/src/org/joni/Parser.java
+++ b/src/org/joni/Parser.java
@@ -169,7 +169,9 @@ class Parser extends Lexer {
         }
 
         cc = new CClassNode();
-        if (isIgnoreCase(env.option)) ascNode.p = new CClassNode();
+        if (isIgnoreCase(env.option)) {
+            ascCc = ascNode.p = new CClassNode();
+        }
 
         boolean andStart = false;
         arg.state = CCSTATE.START;
@@ -1447,7 +1449,6 @@ class Parser extends Lexer {
         ObjPtr<CClassNode> ascPtr = new ObjPtr<CClassNode>();
         CClassNode cc = parseCharClass(ascPtr);
         Node node = cc;
-
         if (isIgnoreCase(env.option)) {
             node = cClassCaseFold(node, cc, ascPtr.p);
         }
diff --git a/test/org/joni/test/TestU8.java b/test/org/joni/test/TestU8.java
index fb69b45..3a03241 100755
--- a/test/org/joni/test/TestU8.java
+++ b/test/org/joni/test/TestU8.java
@@ -248,7 +248,14 @@ public class TestU8 extends Test {
         ns("(?ia)\\P{ASCII}", "s");
         ns("(?ia)[\\p{ASCII}]", "\u212a");
         ns("(?ia)[\\P{ASCII}]", "s");
-
+        x2s("(?iu)[s]+", "Ss\u017f ", 0, 4);
+        x2s("(?ia)[s]+", "Ss\u017f ", 0, 4);
+        x2s("(?iu)[^s]+", "Ss\u017f ", 4, 5);
+        x2s("(?ia)[^s]+", "Ss\u017f ", 4, 5);
+        x2s("(?iu)[[:lower:]]", "\u017f", 0, 2);
+        ns("(?ia)[[:lower:]]", "\u017f");
+        x2s("(?u)[[:upper:]]", "\u212a", 0, 3);
+        ns("(?a)[[:upper:]]", "\u212a");
         super.test();
     }
 

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