[jruby-joni] 10/194: remove references to VANILLA flag

[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 4dbe955902b0c12ba63be71d79b69bc857ee19b3
Author: Marcin Mielzynski <lopx at gazeta.pl>
Date:   Fri Dec 1 20:56:14 2017 +0100

    remove references to VANILLA flag
---
 src/org/joni/Parser.java         | 15 +++------------
 src/org/joni/ast/CClassNode.java | 15 +++------------
 2 files changed, 6 insertions(+), 24 deletions(-)

diff --git a/src/org/joni/Parser.java b/src/org/joni/Parser.java
index 81f635c..0316d1e 100644
--- a/src/org/joni/Parser.java
+++ b/src/org/joni/Parser.java
@@ -180,19 +180,10 @@ class Parser extends Lexer {
 
             case CHAR:
                 final int len;
-                if (Config.VANILLA) {
-                    len = enc.codeToMbcLength(token.getC());
-                    if (len > 1) {
-                        arg.inType = CCVALTYPE.CODE_POINT;
-                    } else {
-                        arg.inType = CCVALTYPE.SB; // sb_char:
-                    }
+                if (token.getCode() >= BitSet.SINGLE_BYTE_SIZE || (len = enc.codeToMbcLength(token.getC())) > 1) {
+                    arg.inType = CCVALTYPE.CODE_POINT;
                 } else {
-                    if (token.getCode() >= BitSet.SINGLE_BYTE_SIZE || (len = enc.codeToMbcLength(token.getC())) > 1) {
-                        arg.inType = CCVALTYPE.CODE_POINT;
-                    } else {
-                        arg.inType = CCVALTYPE.SB; // sb_char:
-                    }
+                    arg.inType = CCVALTYPE.SB; // sb_char:
                 }
                 arg.v = token.getC();
                 arg.vIsRaw = false;
diff --git a/src/org/joni/ast/CClassNode.java b/src/org/joni/ast/CClassNode.java
index f47b100..ef0aadd 100644
--- a/src/org/joni/ast/CClassNode.java
+++ b/src/org/joni/ast/CClassNode.java
@@ -267,18 +267,9 @@ public final class CClassNode extends Node {
             for (int i=0; i<n; i++) {
                 for (int j=CR_FROM(mbr, i); j<=CR_TO(mbr, i); j++) {
                     if (j >= sbOut) {
-                        if (Config.VANILLA) {
-                            if (j == CR_TO(mbr, i)) {
-                                i++;
-                            } else if (j > CR_FROM(mbr, i)) {
-                                addCodeRangeToBuf(j, CR_TO(mbr, i));
-                                i++;
-                            }
-                        } else {
-                            if (j >= CR_FROM(mbr, i)) {
-                                addCodeRangeToBuf(j, CR_TO(mbr, i));
-                                i++;
-                            }
+                        if (j >= CR_FROM(mbr, i)) {
+                            addCodeRangeToBuf(j, CR_TO(mbr, i));
+                            i++;
                         }
                         // !goto sb_end!, remove duplication!
                         for (; i<n; i++) {

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