[jruby-joni] 159/194: reenable one 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 e29293bbf8da587227a6a5bef362c1ed61ce7a7d
Author: Marcin Mielzynski <lopx at gazeta.pl>
Date:   Sun Jan 14 18:37:39 2018 +0100

    reenable one char class
---
 src/org/joni/Lexer.java  |  2 +-
 src/org/joni/Parser.java | 33 +++++++++++++--------------------
 2 files changed, 14 insertions(+), 21 deletions(-)

diff --git a/src/org/joni/Lexer.java b/src/org/joni/Lexer.java
index f921474..1aa18cd 100644
--- a/src/org/joni/Lexer.java
+++ b/src/org/joni/Lexer.java
@@ -1231,7 +1231,7 @@ class Lexer extends ScannerSupport {
                         if (syntax.opLineAnchor()) fetchTokenFor_anchor(isSingleline(env.option) ? AnchorType.SEMI_END_BUF : AnchorType.END_LINE);
                         break;
                     case '[':
-                        if (syntax.opBracketCC()) token.type = TokenType.CC_CC_OPEN;
+                        if (syntax.opBracketCC()) token.type = TokenType.CC_OPEN;
                         break;
                     case ']':
                         //if (*src > env->pattern)   /* /].../ is allowed. */
diff --git a/src/org/joni/Parser.java b/src/org/joni/Parser.java
index 7922ae1..66379f0 100644
--- a/src/org/joni/Parser.java
+++ b/src/org/joni/Parser.java
@@ -820,9 +820,20 @@ class Parser extends Lexer {
             node = parseCharProperty();
             break;
 
-        case CC_CC_OPEN:
-            node = parseCcCcOpen(group);
+        case CC_OPEN: {
+            ObjPtr<CClassNode> ascPtr = new ObjPtr<CClassNode>();
+            CClassNode cc = parseCharClass(ascPtr);
+            int code = cc.isOneChar();
+            if (code != -1) {
+                StringNode sn = new StringNode();
+                sn.catCode(code, enc);
+                return parseStringLoop(sn, group);
+            }
+
+            node = cc;
+            if (isIgnoreCase(env.option)) node = cClassCaseFold(node, cc, ascPtr.p);
             break;
+            }
 
         case ANYCHAR:
             node = new AnyCharNode();
@@ -1465,24 +1476,6 @@ class Parser extends Lexer {
         return node;
     }
 
-    private Node parseCcCcOpen(boolean group) {
-        ObjPtr<CClassNode> ascPtr = new ObjPtr<CClassNode>();
-        CClassNode cc = parseCharClass(ascPtr);
-        Node node = cc;
-
-        int code = cc.isOneChar();
-        if (false) {
-            StringNode sn = new StringNode();
-            sn.catCode(code, enc);
-            return parseStringLoop(sn, group);
-        }
-
-        if (isIgnoreCase(env.option)) {
-            node = cClassCaseFold(node, cc, ascPtr.p);
-        }
-        return node;
-    }
-
     private Node parseAnycharAnytime() {
         Node node = new AnyCharNode();
         QuantifierNode qn = new QuantifierNode(0, QuantifierNode.REPEAT_INFINITE, false);

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