[jruby-joni] 58/223: whitespace change only
Hideki Yamane
henrich at moszumanska.debian.org
Mon Nov 16 11:21:47 UTC 2015
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 86998cdfeddd800e657e47f79b440f5bbbf27857
Author: Joel Hockey <joel.hockey at gmail.com>
Date: Sun Jan 16 08:54:50 2011 +1000
whitespace change only
---
src/org/joni/Analyser.java | 654 ++++++++++++++++++++++-----------------------
1 file changed, 327 insertions(+), 327 deletions(-)
diff --git a/src/org/joni/Analyser.java b/src/org/joni/Analyser.java
index cce91ba..7051652 100644
--- a/src/org/joni/Analyser.java
+++ b/src/org/joni/Analyser.java
@@ -1,20 +1,20 @@
/*
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
* of the Software, and to permit persons to whom the Software is furnished to do
* so, subject to the following conditions:
- *
+ *
* The above copyright notice and this permission notice shall be included in all
* copies or substantial portions of the Software.
- *
+ *
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
package org.joni;
@@ -54,18 +54,18 @@ import org.joni.constants.StackPopLevel;
import org.joni.constants.TargetInfo;
final class Analyser extends Parser {
-
+
protected Analyser(ScanEnvironment env, byte[]bytes, int p, int end) {
super(env, bytes, p, end);
}
-
+
protected final void compile() {
regex.state = RegexState.COMPILING;
-
+
if (Config.DEBUG) {
Config.log.println(regex.encStringToString(bytes, getBegin(), getEnd()));
}
-
+
reset();
regex.numMem = 0;
@@ -73,7 +73,7 @@ final class Analyser extends Parser {
regex.numNullCheck = 0;
//regex.repeatRangeAlloc = 0;
regex.repeatRangeLo = null;
- regex.repeatRangeHi = null;
+ regex.repeatRangeHi = null;
regex.numCombExpCheck = 0;
if (Config.USE_COMBINATION_EXPLOSION_CHECK) regex.numCombExpCheck = 0;
@@ -83,19 +83,19 @@ final class Analyser extends Parser {
if (Config.USE_NAMED_GROUP) {
/* mixed use named group and no-named group */
if (env.numNamed > 0 && syntax.captureOnlyNamedGroup() && !isCaptureGroup(regex.options)) {
- if (env.numNamed != env.numMem) {
+ if (env.numNamed != env.numMem) {
root = disableNoNameGroupCapture(root);
} else {
numberedRefCheck(root);
}
}
} // USE_NAMED_GROUP
-
+
if (Config.USE_NAMED_GROUP) {
if (env.numCall > 0) {
env.unsetAddrList = new UnsetAddrList(env.numCall);
setupSubExpCall(root);
- // r != 0 ???
+ // r != 0 ???
subexpRecursiveCheckTrav(root);
// r < 0 -< err, FOUND_CALLED_NODE = 1
subexpInfRecursiveCheckTrav(root);
@@ -105,28 +105,28 @@ final class Analyser extends Parser {
regex.numCall = 0;
}
} // USE_NAMED_GROUP
-
- setupTree(root, 0);
+
+ setupTree(root, 0);
if (Config.DEBUG_PARSE_TREE) {
root.verifyTree(new HashSet<Node>(),env.reg.warnings);
Config.log.println(root + "\n");
}
-
+
regex.captureHistory = env.captureHistory;
regex.btMemStart = env.btMemStart;
regex.btMemEnd = env.btMemEnd;
-
+
if (isFindCondition(regex.options)) {
regex.btMemEnd = bsAll();
} else {
regex.btMemEnd = env.btMemEnd;
regex.btMemEnd |= regex.captureHistory;
}
-
+
if (Config.USE_COMBINATION_EXPLOSION_CHECK) {
- if (env.backrefedMem == 0 || (Config.USE_SUBEXP_CALL && env.numCall == 0)) {
+ if (env.backrefedMem == 0 || (Config.USE_SUBEXP_CALL && env.numCall == 0)) {
setupCombExpCheck(root, 0);
-
+
if (Config.USE_SUBEXP_CALL && env.hasRecursion) {
env.numCombExpCheck = 0;
} else { // USE_SUBEXP_CALL
@@ -139,17 +139,17 @@ final class Analyser extends Parser {
}
}
}
-
+
} // USE_SUBEXP_CALL
regex.numCombExpCheck = env.numCombExpCheck;
} // USE_COMBINATION_EXPLOSION_CHECK
-
+
regex.clearOptimizeInfo();
-
+
if (!Config.DONT_OPTIMIZE) setOptimizedInfoFromTree(root);
env.memNodes = null;
-
+
if (regex.numRepeat != 0 || regex.btMemEnd != 0) {
regex.stackPopLevel = StackPopLevel.ALL;
} else {
@@ -168,33 +168,33 @@ final class Analyser extends Parser {
Config.log.println("stack used: " + regex.stackNeeded);
Config.log.println(new ByteCodePrinter(regex).byteCodeListToString());
} // DEBUG_COMPILE
-
+
regex.state = RegexState.NORMAL;
}
-
+
private Node noNameDisableMap(Node node, int[]map, int[]counter) {
-
+
switch (node.getType()) {
case NodeType.LIST:
case NodeType.ALT:
ConsAltNode can = (ConsAltNode)node;
do {
- can.setCar(noNameDisableMap(can.car, map, counter));
+ can.setCar(noNameDisableMap(can.car, map, counter));
} while ((can = can.cdr) != null);
break;
-
+
case NodeType.QTFR:
QuantifierNode qn = (QuantifierNode)node;
Node target = qn.target;
Node old = target;
target = noNameDisableMap(target, map, counter);
-
+
if (target != old) {
qn.setTarget(target);
if (target.getType() == NodeType.QTFR) qn.reduceNestedQuantifier((QuantifierNode)target);
}
break;
-
+
case NodeType.ENCLOSE:
EncloseNode en = (EncloseNode)node;
if (en.type == EncloseType.MEMORY) {
@@ -214,12 +214,12 @@ final class Analyser extends Parser {
en.setTarget(noNameDisableMap(en.target, map, counter)); // ???
}
break;
-
+
default:
break;
} // switch
- return node;
+ return node;
}
private void renumberByMap(Node node, int[]map) {
@@ -231,26 +231,26 @@ final class Analyser extends Parser {
renumberByMap(can.car, map);
} while ((can = can.cdr) != null);
break;
-
+
case NodeType.QTFR:
renumberByMap(((QuantifierNode)node).target, map);
break;
-
+
case NodeType.ENCLOSE:
renumberByMap(((EncloseNode)node).target, map);
break;
-
+
case NodeType.BREF:
((BackRefNode)node).renumber(map);
break;
-
+
default:
break;
} // switch
}
-
+
protected final void numberedRefCheck(Node node) {
-
+
switch (node.getType()) {
case NodeType.LIST:
case NodeType.ALT:
@@ -259,58 +259,58 @@ final class Analyser extends Parser {
numberedRefCheck(can.car);
} while ((can = can.cdr) != null);
break;
-
+
case NodeType.QTFR:
numberedRefCheck(((QuantifierNode)node).target);
break;
-
+
case NodeType.ENCLOSE:
numberedRefCheck(((EncloseNode)node).target);
break;
-
+
case NodeType.BREF:
BackRefNode br = (BackRefNode)node;
if (!br.isNameRef()) newValueException(ERR_NUMBERED_BACKREF_OR_CALL_NOT_ALLOWED);
break;
-
+
default:
break;
} // switch
}
-
+
protected final Node disableNoNameGroupCapture(Node root) {
int[]map = new int[env.numMem + 1];
-
+
for (int i=1; i<=env.numMem; i++) map[i] = 0;
-
+
int[]counter = new int[]{0}; // !!! this should be passed as the recursion goes right ?, move to plain int
root = noNameDisableMap(root, map, counter); // ???
renumberByMap(root, map);
-
+
for (int i=1, pos=1; i<=env.numMem; i++) {
if (map[i] > 0) {
env.memNodes[pos] = env.memNodes[i];
pos++;
}
}
-
+
int loc = env.captureHistory;
env.captureHistory = bsClear();
-
+
for (int i=1; i<=Config.MAX_CAPTURE_HISTORY_GROUP; i++) {
if (bsAt(loc, i)) {
env.captureHistory = bsOnAtSimple(env.captureHistory, map[i]);
}
}
-
+
env.numMem = env.numNamed;
regex.numMem = env.numNamed;
-
+
regex.renumberNameTable(map);
return root;
}
-
+
private void swap(Node a, Node b) {
a.swap(b);
@@ -318,13 +318,13 @@ final class Analyser extends Parser {
root = a;
} else if (root == a) {
root = b;
- }
+ }
}
-
+
// USE_INFINITE_REPEAT_MONOMANIAC_MEM_STATUS_CHECK
private int quantifiersMemoryInfo(Node node) {
int info = 0;
-
+
switch(node.getType()) {
case NodeType.LIST:
case NodeType.ALT:
@@ -334,7 +334,7 @@ final class Analyser extends Parser {
if (v > info) info = v;
} while ((can = can.cdr) != null);
break;
-
+
case NodeType.CALL:
if (Config.USE_SUBEXP_CALL) {
CallNode cn = (CallNode)node;
@@ -346,30 +346,30 @@ final class Analyser extends Parser {
break;
} // USE_SUBEXP_CALL
break;
-
+
case NodeType.QTFR:
QuantifierNode qn = (QuantifierNode)node;
if (qn.upper != 0) {
info = quantifiersMemoryInfo(qn.target);
}
break;
-
+
case NodeType.ENCLOSE:
EncloseNode en = (EncloseNode)node;
switch (en.type) {
case EncloseType.MEMORY:
return TargetInfo.IS_EMPTY_MEM;
-
+
case EncloseType.OPTION:
case EncloseNode.STOP_BACKTRACK:
info = quantifiersMemoryInfo(en.target);
break;
-
+
default:
break;
} // inner switch
break;
-
+
case NodeType.BREF:
case NodeType.STR:
case NodeType.CTYPE:
@@ -379,28 +379,28 @@ final class Analyser extends Parser {
default:
break;
} // switch
-
+
return info;
}
-
+
private int getMinMatchLength(Node node) {
int min = 0;
-
+
switch (node.getType()) {
case NodeType.BREF:
BackRefNode br = (BackRefNode)node;
if (br.isRecursion()) break;
-
+
if (br.back[0] > env.numMem) newValueException(ERR_INVALID_BACKREF);
min = getMinMatchLength(env.memNodes[br.back[0]]);
-
- for (int i=1; i<br.backNum; i++) {
+
+ for (int i=1; i<br.backNum; i++) {
if (br.back[i] > env.numMem) newValueException(ERR_INVALID_BACKREF);
int tmin = getMinMatchLength(env.memNodes[br.back[i]]);
if (min > tmin) min = tmin;
}
break;
-
+
case NodeType.CALL:
if (Config.USE_SUBEXP_CALL) {
CallNode cn = (CallNode)node;
@@ -411,17 +411,17 @@ final class Analyser extends Parser {
min = getMinMatchLength(cn.target);
}
break;
-
+
} // USE_SUBEXP_CALL
break;
-
+
case NodeType.LIST:
ConsAltNode can = (ConsAltNode)node;
do {
min += getMinMatchLength(can.car);
} while ((can = can.cdr) != null);
break;
-
+
case NodeType.ALT:
ConsAltNode y = (ConsAltNode)node;
do {
@@ -434,20 +434,20 @@ final class Analyser extends Parser {
}
} while ((y = y.cdr) != null);
break;
-
+
case NodeType.STR:
min = ((StringNode)node).length();
break;
-
+
case NodeType.CTYPE:
min = 1;
break;
-
+
case NodeType.CCLASS:
case NodeType.CANY:
min = 1;
break;
-
+
case NodeType.QTFR:
QuantifierNode qn = (QuantifierNode)node;
if (qn.lower > 0) {
@@ -455,7 +455,7 @@ final class Analyser extends Parser {
min = MinMaxLen.distanceMultiply(min, qn.lower);
}
break;
-
+
case NodeType.ENCLOSE:
EncloseNode en = (EncloseNode)node;
switch (en.type) {
@@ -468,28 +468,28 @@ final class Analyser extends Parser {
en.minLength = min;
en.setMinFixed();
}
- break;
+ break;
} // USE_SUBEXP_CALL
break;
-
+
case EncloseType.OPTION:
case EncloseType.STOP_BACKTRACK:
min = getMinMatchLength(en.target);
break;
} // inner switch
break;
-
+
case NodeType.ANCHOR:
default:
break;
} // switch
-
+
return min;
}
-
+
private int getMaxMatchLength(Node node) {
int max = 0;
-
+
switch (node.getType()) {
case NodeType.LIST:
ConsAltNode ln = (ConsAltNode)node;
@@ -498,7 +498,7 @@ final class Analyser extends Parser {
max = MinMaxLen.distanceAdd(max, tmax);
} while ((ln = ln.cdr) != null);
break;
-
+
case NodeType.ALT:
ConsAltNode an = (ConsAltNode)node;
do {
@@ -506,34 +506,34 @@ final class Analyser extends Parser {
if (max < tmax) max = tmax;
} while ((an = an.cdr) != null);
break;
-
+
case NodeType.STR:
max = ((StringNode)node).length();
break;
-
+
case NodeType.CTYPE:
max = enc.maxLengthDistance();
break;
-
+
case NodeType.CCLASS:
case NodeType.CANY:
max = enc.maxLengthDistance();
break;
-
+
case NodeType.BREF:
BackRefNode br = (BackRefNode)node;
- if (br.isRecursion()) {
+ if (br.isRecursion()) {
max = MinMaxLen.INFINITE_DISTANCE;
break;
}
-
+
for (int i=0; i<br.backNum; i++) {
if (br.back[i] > env.numMem) newValueException(ERR_INVALID_BACKREF);
int tmax = getMaxMatchLength(env.memNodes[br.back[i]]);
if (max < tmax) max = tmax;
}
break;
-
+
case NodeType.CALL:
if (Config.USE_SUBEXP_CALL) {
CallNode cn = (CallNode)node;
@@ -545,21 +545,21 @@ final class Analyser extends Parser {
break;
} // USE_SUBEXP_CALL
break;
-
+
case NodeType.QTFR:
QuantifierNode qn = (QuantifierNode)node;
if (qn.upper != 0) {
max = getMaxMatchLength(qn.target);
if (max != 0) {
if (!isRepeatInfinite(qn.upper)) {
- max = MinMaxLen.distanceMultiply(max, qn.upper);
+ max = MinMaxLen.distanceMultiply(max, qn.upper);
} else {
max = MinMaxLen.INFINITE_DISTANCE;
}
}
}
break;
-
+
case NodeType.ENCLOSE:
EncloseNode en = (EncloseNode)node;
switch (en.type) {
@@ -575,31 +575,31 @@ final class Analyser extends Parser {
break;
} // USE_SUBEXP_CALL
break;
-
+
case EncloseType.OPTION:
case EncloseType.STOP_BACKTRACK:
max = getMaxMatchLength(en.target);
break;
} // inner switch
break;
-
+
case NodeType.ANCHOR:
default:
break;
} // switch
-
+
return max;
}
-
+
private static final int GET_CHAR_LEN_VARLEN = -1;
private static final int GET_CHAR_LEN_TOP_ALT_VARLEN = -2;
protected final int getCharLengthTree(Node node) {
return getCharLengthTree(node, 0);
}
-
+
private int getCharLengthTree(Node node, int level) {
level++;
-
+
int len = 0;
returnCode = 0;
@@ -611,11 +611,11 @@ final class Analyser extends Parser {
if (returnCode == 0) len = MinMaxLen.distanceAdd(len, tlen);
} while (returnCode == 0 && (ln = ln.cdr) != null);
break;
-
+
case NodeType.ALT:
ConsAltNode an = (ConsAltNode)node;
boolean varLen = false;
-
+
int tlen = getCharLengthTree(an.car, level);
while (returnCode == 0 && (an = an.cdr) != null) {
int tlen2 = getCharLengthTree(an.car, level);
@@ -636,34 +636,34 @@ final class Analyser extends Parser {
}
}
break;
-
+
case NodeType.STR:
StringNode sn = (StringNode)node;
len = sn.length(enc);
break;
-
+
case NodeType.QTFR:
QuantifierNode qn = (QuantifierNode)node;
if (qn.lower == qn.upper) {
tlen = getCharLengthTree(qn.target, level);
- if (returnCode == 0) len = MinMaxLen.distanceMultiply(tlen, qn.lower);
+ if (returnCode == 0) len = MinMaxLen.distanceMultiply(tlen, qn.lower);
} else {
returnCode = GET_CHAR_LEN_VARLEN;
}
break;
-
+
case NodeType.CALL:
if (Config.USE_SUBEXP_CALL) {
CallNode cn = (CallNode)node;
if (!cn.isRecursion()) {
- len = getCharLengthTree(cn.target, level);
+ len = getCharLengthTree(cn.target, level);
} else {
returnCode = GET_CHAR_LEN_VARLEN;
}
break;
} // USE_SUBEXP_CALL
break;
-
+
case NodeType.CTYPE:
len = 1;
@@ -671,7 +671,7 @@ final class Analyser extends Parser {
case NodeType.CANY:
len = 1;
break;
-
+
case NodeType.ENCLOSE:
EncloseNode en = (EncloseNode)node;
switch(en.type) {
@@ -689,7 +689,7 @@ final class Analyser extends Parser {
break;
} // USE_SUBEXP_CALL
break;
-
+
case EncloseType.OPTION:
case EncloseType.STOP_BACKTRACK:
len = getCharLengthTree(en.target, level);
@@ -699,20 +699,20 @@ final class Analyser extends Parser {
case NodeType.ANCHOR:
break;
-
+
default:
returnCode = GET_CHAR_LEN_VARLEN;
} // switch
return len;
}
-
+
/* x is not included y ==> 1 : 0 */
private boolean isNotIncluded(Node x, Node y) {
Node tmp;
// !retry:!
retry:while(true) {
-
+
int yType = y.getType();
switch(x.getType()) {
@@ -722,30 +722,30 @@ final class Analyser extends Parser {
CTypeNode cny = (CTypeNode)y;
CTypeNode cnx = (CTypeNode)x;
return cny.ctype == cnx.ctype && cny.not != cnx.not;
-
+
case NodeType.CCLASS:
// !swap:!
tmp = x;
x = y;
y = tmp;
// !goto retry;!
- continue retry;
-
+ continue retry;
+
case NodeType.STR:
// !goto swap;!
tmp = x;
x = y;
y = tmp;
continue retry;
-
+
default:
break;
} // inner switch
break;
-
+
case NodeType.CCLASS:
CClassNode xc = (CClassNode)x;
-
+
switch(yType) {
case NodeType.CTYPE:
switch(((CTypeNode)y).ctype) {
@@ -754,7 +754,7 @@ final class Analyser extends Parser {
if (xc.mbuf == null && !xc.isNot()) {
for (int i=0; i<BitSet.SINGLE_BYTE_SIZE; i++) {
if (xc.bs.at(i)) {
- if (enc.isSbWord(i)) return false;
+ if (enc.isSbWord(i)) return false;
}
}
return true;
@@ -773,17 +773,17 @@ final class Analyser extends Parser {
return true;
}
// break; not reached
-
+
default:
- break;
+ break;
} // inner switch
break;
-
+
case NodeType.CCLASS:
CClassNode yc = (CClassNode)y;
-
+
for (int i=0; i<BitSet.SINGLE_BYTE_SIZE; i++) {
- boolean v = xc.bs.at(i);
+ boolean v = xc.bs.at(i);
if ((v && !xc.isNot()) || (!v && xc.isNot())) {
v = yc.bs.at(i);
if ((v && !yc.isNot()) || (!v && yc.isNot())) return false;
@@ -792,7 +792,7 @@ final class Analyser extends Parser {
if ((xc.mbuf == null && !xc.isNot()) || yc.mbuf == null && !yc.isNot()) return true;
return false;
// break; not reached
-
+
case NodeType.STR:
// !goto swap;!
tmp = x;
@@ -802,42 +802,42 @@ final class Analyser extends Parser {
default:
break;
-
+
} // inner switch
break; // case NodeType.CCLASS
-
+
case NodeType.STR:
StringNode xs = (StringNode)x;
if (xs.length() == 0) break;
-
+
switch (yType) {
case NodeType.CTYPE:
CTypeNode cy = ((CTypeNode)y);
switch (cy.ctype) {
case CharacterType.WORD:
if (enc.isMbcWord(xs.bytes, xs.p, xs.end)) {
- return cy.not;
+ return cy.not;
} else {
return !cy.not;
}
-
+
default:
break;
-
+
} // inner switch
break;
-
+
case NodeType.CCLASS:
CClassNode cc = (CClassNode)y;
int code = enc.mbcToCode(xs.bytes, xs.p, xs.p + enc.maxLength());
return !cc.isCodeInCC(enc, code);
-
+
case NodeType.STR:
StringNode ys = (StringNode)y;
int len = xs.length();
if (len > ys.length()) len = ys.length();
if (xs.isAmbig() || ys.isAmbig()) {
- /* tiny version */
+ /* tiny version */
return false;
} else {
for (int i=0, p=ys.p, q=xs.p; i<len; i++, p++, q++) {
@@ -845,52 +845,52 @@ final class Analyser extends Parser {
}
}
break;
-
+
default:
break;
} // inner switch
-
+
break; // case NodeType.STR
-
+
} // switch
-
+
break;
} // retry:while
return false;
}
-
+
private Node getHeadValueNode(Node node, boolean exact) {
Node n = null;
-
+
switch(node.getType()) {
case NodeType.BREF:
case NodeType.ALT:
case NodeType.CANY:
break;
-
+
case NodeType.CALL:
- break; // if (Config.USE_SUBEXP_CALL)
-
+ break; // if (Config.USE_SUBEXP_CALL)
+
case NodeType.CTYPE:
case NodeType.CCLASS:
if (!exact) n = node;
break;
-
+
case NodeType.LIST:
n = getHeadValueNode(((ConsAltNode)node).car, exact);
break;
-
+
case NodeType.STR:
StringNode sn = (StringNode)node;
if (sn.end <= sn.p) break; // ???
-
+
if (exact && !sn.isRaw() && isIgnoreCase(regex.options)){
// nothing
} else {
n = node;
}
break;
-
+
case NodeType.QTFR:
QuantifierNode qn = (QuantifierNode)node;
if (qn.lower > 0) {
@@ -901,10 +901,10 @@ final class Analyser extends Parser {
}
}
break;
-
+
case NodeType.ENCLOSE:
EncloseNode en = (EncloseNode)node;
-
+
switch (en.type) {
case EncloseType.OPTION:
int options = regex.options;
@@ -912,32 +912,32 @@ final class Analyser extends Parser {
n = getHeadValueNode(en.target, exact);
regex.options = options;
break;
-
+
case EncloseType.MEMORY:
case EncloseType.STOP_BACKTRACK:
n = getHeadValueNode(en.target, exact);
break;
} // inner switch
break;
-
+
case NodeType.ANCHOR:
AnchorNode an = (AnchorNode)node;
if (an.type == AnchorType.PREC_READ) n = getHeadValueNode(an.target, exact);
break;
-
+
default:
break;
} // switch
-
+
return n;
}
-
+
// true: invalid
private boolean checkTypeTree(Node node, int typeMask, int encloseMask, int anchorMask) {
if ((node.getType2Bit() & typeMask) == 0) return true;
boolean invalid = false;
-
+
switch(node.getType()) {
case NodeType.LIST:
case NodeType.ALT:
@@ -946,37 +946,37 @@ final class Analyser extends Parser {
invalid = checkTypeTree(can.car, typeMask, encloseMask, anchorMask);
} while (!invalid && (can = can.cdr) != null);
break;
-
+
case NodeType.QTFR:
invalid = checkTypeTree(((QuantifierNode)node).target, typeMask, encloseMask, anchorMask);
break;
-
+
case NodeType.ENCLOSE:
EncloseNode en = (EncloseNode)node;
if ((en.type & encloseMask) == 0) return true;
invalid = checkTypeTree(en.target, typeMask, encloseMask, anchorMask);
break;
-
+
case NodeType.ANCHOR:
AnchorNode an = (AnchorNode)node;
if ((an.type & anchorMask) == 0) return true;
-
+
if (an.target != null) invalid = checkTypeTree(an.target, typeMask, encloseMask, anchorMask);
break;
-
+
default:
break;
-
+
} // switch
return invalid;
}
-
+
private static final int RECURSION_EXIST = 1;
private static final int RECURSION_INFINITE = 2;
private int subexpInfRecursiveCheck(Node node, boolean head) {
int r = 0;
-
+
switch (node.getType()) {
case NodeType.LIST:
int min;
@@ -991,7 +991,7 @@ final class Analyser extends Parser {
}
} while ((x = x.cdr) != null);
break;
-
+
case NodeType.ALT:
ConsAltNode can = (ConsAltNode)node;
r = RECURSION_EXIST;
@@ -1001,7 +1001,7 @@ final class Analyser extends Parser {
r &= ret;
} while ((can = can.cdr) != null);
break;
-
+
case NodeType.QTFR:
QuantifierNode qn = (QuantifierNode)node;
r = subexpInfRecursiveCheck(qn.target, head);
@@ -1009,7 +1009,7 @@ final class Analyser extends Parser {
if (qn.lower == 0) r = 0;
}
break;
-
+
case NodeType.ANCHOR:
AnchorNode an = (AnchorNode)node;
switch (an.type) {
@@ -1021,11 +1021,11 @@ final class Analyser extends Parser {
break;
} // inner switch
break;
-
+
case NodeType.CALL:
r = subexpInfRecursiveCheck(((CallNode)node).target, head);
break;
-
+
case NodeType.ENCLOSE:
EncloseNode en = (EncloseNode)node;
if (en.isMark2()) {
@@ -1039,16 +1039,16 @@ final class Analyser extends Parser {
en.clearMark2();
}
break;
-
+
default:
break;
} // switch
return r;
}
-
+
protected final int subexpInfRecursiveCheckTrav(Node node) {
int r = 0;
-
+
switch (node.getType()) {
case NodeType.LIST:
case NodeType.ALT:
@@ -1057,11 +1057,11 @@ final class Analyser extends Parser {
r = subexpInfRecursiveCheckTrav(can.car);
} while (r == 0 && (can = can.cdr) != null);
break;
-
+
case NodeType.QTFR:
r = subexpInfRecursiveCheckTrav(((QuantifierNode)node).target);
break;
-
+
case NodeType.ANCHOR:
AnchorNode an = (AnchorNode)node;
switch (an.type) {
@@ -1073,7 +1073,7 @@ final class Analyser extends Parser {
break;
} // inner switch
break;
-
+
case NodeType.ENCLOSE:
EncloseNode en = (EncloseNode)node;
if (en.isRecursion()) {
@@ -1084,17 +1084,17 @@ final class Analyser extends Parser {
}
r = subexpInfRecursiveCheckTrav(en.target);
break;
-
+
default:
break;
} // switch
-
+
return r;
}
-
+
private int subexpRecursiveCheck(Node node) {
int r = 0;
-
+
switch (node.getType()) {
case NodeType.LIST:
case NodeType.ALT:
@@ -1103,11 +1103,11 @@ final class Analyser extends Parser {
r |= subexpRecursiveCheck(can.car);
} while ((can = can.cdr) != null);
break;
-
+
case NodeType.QTFR:
r = subexpRecursiveCheck(((QuantifierNode)node).target);
break;
-
+
case NodeType.ANCHOR:
AnchorNode an = (AnchorNode)node;
switch (an.type) {
@@ -1119,13 +1119,13 @@ final class Analyser extends Parser {
break;
} // inner switch
break;
-
+
case NodeType.CALL:
CallNode cn = (CallNode)node;
r = subexpRecursiveCheck(cn.target);
- if (r != 0) cn.setRecursion();
+ if (r != 0) cn.setRecursion();
break;
-
+
case NodeType.ENCLOSE:
EncloseNode en = (EncloseNode)node;
if (en.isMark2()) {
@@ -1138,18 +1138,18 @@ final class Analyser extends Parser {
en.clearMark2();
}
break;
-
+
default:
break;
} // switch
-
+
return r;
}
-
+
private static final int FOUND_CALLED_NODE = 1;
protected final int subexpRecursiveCheckTrav(Node node) {
int r = 0;
-
+
switch (node.getType()) {
case NodeType.LIST:
case NodeType.ALT:
@@ -1158,11 +1158,11 @@ final class Analyser extends Parser {
int ret = subexpRecursiveCheckTrav(can.car);
if (ret == FOUND_CALLED_NODE) {
r = FOUND_CALLED_NODE;
- }
+ }
// else if (ret < 0) return ret; ???
} while ((can = can.cdr) != null);
break;
-
+
case NodeType.QTFR:
QuantifierNode qn = (QuantifierNode)node;
r = subexpRecursiveCheckTrav(qn.target);
@@ -1170,7 +1170,7 @@ final class Analyser extends Parser {
if (r == FOUND_CALLED_NODE) qn.isRefered = true;
}
break;
-
+
case NodeType.ANCHOR:
AnchorNode an = (AnchorNode)node;
switch (an.type) {
@@ -1182,7 +1182,7 @@ final class Analyser extends Parser {
break;
} // inner switch
break;
-
+
case NodeType.ENCLOSE:
EncloseNode en = (EncloseNode)node;
if (!en.isRecursion()) {
@@ -1196,16 +1196,16 @@ final class Analyser extends Parser {
r = subexpRecursiveCheckTrav(en.target);
if (en.isCalled()) r |= FOUND_CALLED_NODE;
break;
-
+
default:
break;
} // switch
-
+
return r;
}
-
+
protected final void setupSubExpCall(Node node) {
-
+
switch(node.getType()) {
case NodeType.LIST:
ConsAltNode ln = (ConsAltNode)node;
@@ -1213,25 +1213,25 @@ final class Analyser extends Parser {
setupSubExpCall(ln.car);
} while ((ln = ln.cdr) != null);
break;
-
+
case NodeType.ALT:
ConsAltNode can = (ConsAltNode)node;
do {
setupSubExpCall(can.car);
} while ((can = can.cdr) != null);
break;
-
+
case NodeType.QTFR:
setupSubExpCall(((QuantifierNode)node).target);
break;
-
+
case NodeType.ENCLOSE:
setupSubExpCall(((EncloseNode)node).target);
break;
-
+
case NodeType.CALL:
CallNode cn = (CallNode)node;
-
+
if (cn.groupNum != 0) {
int gNum = cn.groupNum;
@@ -1249,10 +1249,10 @@ final class Analyser extends Parser {
((EncloseNode)cn.target).setCalled();
env.btMemStart = BitStatus.bsOnAt(env.btMemStart, cn.groupNum);
cn.unsetAddrList = env.unsetAddrList;
- } else {
+ } else {
if (Config.USE_NAMED_GROUP) {
NameEntry ne = regex.nameToGroupNumbers(cn.name, cn.nameP, cn.nameEnd);
-
+
if (ne == null) {
newValueException(ERR_UNDEFINED_NAME_REFERENCE, cn.nameP, cn.nameEnd);
} else if (ne.backNum > 1) {
@@ -1262,7 +1262,7 @@ final class Analyser extends Parser {
// !set_call_attr:!
cn.target = env.memNodes[cn.groupNum]; // no setTarget in call nodes!
if (cn.target == null) newValueException(ERR_UNDEFINED_NAME_REFERENCE, cn.nameP, cn.nameEnd);
-
+
((EncloseNode)cn.target).setCalled();
env.btMemStart = BitStatus.bsOnAt(env.btMemStart, cn.groupNum);
cn.unsetAddrList = env.unsetAddrList;
@@ -1270,7 +1270,7 @@ final class Analyser extends Parser {
}
}
break;
-
+
case NodeType.ANCHOR:
AnchorNode an = (AnchorNode)node;
switch (an.type) {
@@ -1285,7 +1285,7 @@ final class Analyser extends Parser {
} // switch
}
-
+
/* divide different length alternatives in look-behind.
(?<=A|B) ==> (?<=A)|(?<=B)
(?<!A|B) ==> (?<!A)(?<!B)
@@ -1293,13 +1293,13 @@ final class Analyser extends Parser {
private void divideLookBehindAlternatives(Node node) {
AnchorNode an = (AnchorNode)node;
int anchorType = an.type;
-
+
Node head = an.target;
Node np = ((ConsAltNode)head).car;
-
+
swap(node, head);
-
+
Node tmp = node;
node = head;
head = tmp;
@@ -1313,18 +1313,18 @@ final class Analyser extends Parser {
insert.setTarget(((ConsAltNode)np).car);
((ConsAltNode)np).setCar(insert);
}
-
+
if (anchorType == AnchorType.LOOK_BEHIND_NOT) {
np = node;
do {
((ConsAltNode)np).toListNode(); /* alt -> list */
- } while ((np = ((ConsAltNode)np).cdr) != null);
+ } while ((np = ((ConsAltNode)np).cdr) != null);
}
}
-
+
private void setupLookBehind(Node node) {
AnchorNode an = (AnchorNode)node;
-
+
int len = getCharLengthTree(an.target);
switch(returnCode) {
case 0:
@@ -1345,7 +1345,7 @@ final class Analyser extends Parser {
private void nextSetup(Node node, Node nextNode) {
// retry:
retry: while(true) {
-
+
int type = node.getType();
if (type == NodeType.QTFR) {
QuantifierNode qn = (QuantifierNode)node;
@@ -1368,7 +1368,7 @@ final class Analyser extends Parser {
en.setStopBtSimpleRepeat();
//en.setTarget(qn.target); // optimize it ??
swap(node, en);
-
+
en.setTarget(node);
}
}
@@ -1383,20 +1383,20 @@ final class Analyser extends Parser {
continue retry;
}
}
-
+
break;
} // while
}
-
+
private void updateStringNodeCaseFold(Node node) {
StringNode sn = (StringNode)node;
-
+
byte[]sbuf = new byte[sn.length() << 1];
int sp = 0;
-
+
value = sn.p;
int end = sn.end;
-
+
byte[]buf = new byte[Config.ENC_MBC_CASE_FOLD_MAXLEN];
while (value < end) {
int len = enc.mbcCaseFold(regex.caseFoldFlag, sn.bytes, this, end, buf);
@@ -1409,60 +1409,60 @@ final class Analyser extends Parser {
sbuf[sp++] = buf[i];
}
}
-
+
sn.set(sbuf, 0, sp);
}
-
+
private Node expandCaseFoldMakeRemString(byte[]bytes, int p, int end) {
StringNode node = new StringNode(bytes, p, end);
-
+
updateStringNodeCaseFold(node);
node.setAmbig();
node.setDontGetOptInfo();
return node;
}
-
+
private boolean expandCaseFoldStringAlt(int itemNum, CaseFoldCodeItem[]items,
byte[]bytes, int p, int slen, int end, Node[]node) {
boolean varlen = false;
-
+
for (int i=0; i<itemNum; i++) {
if (items[i].byteLen != slen) {
varlen = true;
break;
}
}
-
+
ConsAltNode varANode = null, anode, xnode;
if (varlen) {
node[0] = varANode = newAltNode(null, null);
-
+
xnode = newListNode(null, null);
varANode.setCar(xnode);
-
+
anode = newAltNode(null, null);
xnode.setCar(anode);
} else {
node[0] = anode = newAltNode(null, null);
}
-
+
StringNode snode = new StringNode(bytes, p, p + slen);
anode.setCar(snode);
-
+
for (int i=0; i<itemNum; i++) {
snode = new StringNode();
-
+
for (int j=0; j<items[i].codeLen; j++) {
snode.ensure(Config.ENC_CODE_TO_MBC_MAXLEN);
snode.end += enc.codeToMbc(items[i].code[j], snode.bytes, snode.end);
}
-
+
ConsAltNode an = newAltNode(null, null);
if (items[i].byteLen != slen) {
int q = p + items[i].byteLen;
if (q < end) {
Node rem = expandCaseFoldMakeRemString(bytes, q, end);
-
+
xnode = ConsAltNode.listAdd(null, snode);
ConsAltNode.listAdd(xnode, rem);
an.setCar(xnode);
@@ -1479,7 +1479,7 @@ final class Analyser extends Parser {
}
return varlen;
}
-
+
private static final int THRESHOLD_CASE_FOLD_ALT_FOR_EXPANSION = 8;
private void expandCaseFoldString(Node node) {
StringNode sn = (StringNode)node;
@@ -1504,24 +1504,24 @@ final class Analyser extends Parser {
if (root == null && prevNode[0] != null) {
topRoot = root = ConsAltNode.listAdd(null, prevNode[0]);
}
-
+
prevNode[0] = snode = new StringNode(); // onig_node_new_str(NULL, NULL);
-
+
if (root != null) {
ConsAltNode.listAdd(root, snode);
}
-
+
}
-
+
snode.cat(bytes, p, p + len);
} else {
altNum *= (items.length + 1);
if (altNum > THRESHOLD_CASE_FOLD_ALT_FOR_EXPANSION) break;
-
+
if (root == null && prevNode[0] != null) {
topRoot = root = ConsAltNode.listAdd(null, prevNode[0]);
}
-
+
boolean r = expandCaseFoldStringAlt(items.length, items, bytes, p, len, end, prevNode);
if (r) { // if (r == 1)
if (root == null) {
@@ -1529,7 +1529,7 @@ final class Analyser extends Parser {
} else {
ConsAltNode.listAdd(root, prevNode[0]);
}
-
+
root = (ConsAltNode)((ConsAltNode)prevNode[0]).car;
} else { /* r == 0 */
if (root != null) {
@@ -1540,14 +1540,14 @@ final class Analyser extends Parser {
}
p += len;
}
-
+
if (p < end) {
Node srem = expandCaseFoldMakeRemString(bytes, p, end);
-
+
if (prevNode[0] != null && root == null) {
topRoot = root = ConsAltNode.listAdd(null, prevNode[0]);
}
-
+
if (root == null) {
prevNode[0] = srem;
} else {
@@ -1558,28 +1558,28 @@ final class Analyser extends Parser {
Node xnode = topRoot != null ? topRoot : prevNode[0];
swap(node, xnode);
}
-
+
private static final int CEC_THRES_NUM_BIG_REPEAT = 512;
private static final int CEC_INFINITE_NUM = 0x7fffffff;
private static final int CEC_IN_INFINITE_REPEAT = (1<<0);
private static final int CEC_IN_FINITE_REPEAT = (1<<1);
private static final int CEC_CONT_BIG_REPEAT = (1<<2);
-
+
protected final int setupCombExpCheck(Node node, int state) {
int r = state;
int ret;
-
+
switch (node.getType()) {
case NodeType.LIST:
ConsAltNode ln = (ConsAltNode)node;
-
+
do {
r = setupCombExpCheck(ln.car, r);
//prev = ((ConsAltNode)node).car;
} while (r >= 0 && (ln = ln.cdr) != null);
break;
-
+
case NodeType.ALT:
ConsAltNode an = (ConsAltNode)node;
do {
@@ -1587,18 +1587,18 @@ final class Analyser extends Parser {
r |= ret;
} while (ret >= 0 && (an = an.cdr) != null);
break;
-
+
case NodeType.QTFR:
QuantifierNode qn = (QuantifierNode)node;
int childState = state;
int addState = 0;
int varNum;
-
+
if (!isRepeatInfinite(qn.upper)) {
if (qn.upper > 1) {
/* {0,1}, {1,1} are allowed */
childState |= CEC_IN_FINITE_REPEAT;
-
+
/* check (a*){n,m}, (a+){n,m} => (a*){n,n}, (a+){n,n} */
if (env.backrefedMem == 0) {
if (qn.target.getType() == NodeType.ENCLOSE) {
@@ -1616,7 +1616,7 @@ final class Analyser extends Parser {
}
}
}
-
+
if ((state & CEC_IN_FINITE_REPEAT) != 0) {
qn.combExpCheckNum = -1;
} else {
@@ -1626,9 +1626,9 @@ final class Analyser extends Parser {
} else {
varNum = qn.upper - qn.lower;
}
-
+
if (varNum >= CEC_THRES_NUM_BIG_REPEAT) addState |= CEC_CONT_BIG_REPEAT;
-
+
if (((state & CEC_IN_INFINITE_REPEAT) != 0 && varNum != 0) ||
((state & CEC_CONT_BIG_REPEAT) != 0 && varNum >= CEC_THRES_NUM_BIG_REPEAT)) {
if (qn.combExpCheckNum == 0) {
@@ -1643,7 +1643,7 @@ final class Analyser extends Parser {
r = setupCombExpCheck(qn.target, childState);
r |= addState;
break;
-
+
case NodeType.ENCLOSE:
EncloseNode en = (EncloseNode)node;
switch( en.type) {
@@ -1653,12 +1653,12 @@ final class Analyser extends Parser {
}
r = setupCombExpCheck(en.target, state);
break;
-
+
default:
r = setupCombExpCheck(en.target, state);
} // inner switch
break;
-
+
case NodeType.CALL:
if (Config.USE_SUBEXP_CALL) {
CallNode cn = (CallNode)node;
@@ -1670,12 +1670,12 @@ final class Analyser extends Parser {
break;
} // USE_SUBEXP_CALL
break;
-
+
default:
break;
-
+
} // switch
-
+
return r;
}
@@ -1706,14 +1706,14 @@ final class Analyser extends Parser {
prev = lin.car;
} while ((lin = lin.cdr) != null);
break;
-
+
case NodeType.ALT:
ConsAltNode aln = (ConsAltNode)node;
do {
setupTree(aln.car, (state | IN_ALT));
} while ((aln = aln.cdr) != null);
break;
-
+
case NodeType.CCLASS:
break;
@@ -1722,14 +1722,14 @@ final class Analyser extends Parser {
expandCaseFoldString(node);
}
break;
-
+
case NodeType.CTYPE:
case NodeType.CANY:
break;
-
+
case NodeType.CALL: // if (Config.USE_SUBEXP_CALL) ?
break;
-
+
case NodeType.BREF:
BackRefNode br = (BackRefNode)node;
for (int i=0; i<br.backNum; i++) {
@@ -1744,13 +1744,13 @@ final class Analyser extends Parser {
((EncloseNode)env.memNodes[br.back[i]]).setMemBackrefed();
}
break;
-
+
case NodeType.QTFR:
QuantifierNode qn = (QuantifierNode)node;
Node target = qn.target;
-
+
if ((state & IN_REPEAT) != 0) qn.setInRepeat();
-
+
if (isRepeatInfinite(qn.upper) || qn.lower >= 1) {
int d = getMinMatchLength(target);
if (d == 0) {
@@ -1762,25 +1762,25 @@ final class Analyser extends Parser {
// strange stuff here (turned off)
}
}
-
+
state |= IN_REPEAT;
if (qn.lower != qn.upper) state |= IN_VAR_REPEAT;
-
- setupTree(target, state);
-
+
+ setupTree(target, state);
+
/* expand string */
if (target.getType() == NodeType.STR) {
if (!isRepeatInfinite(qn.lower) && qn.lower == qn.upper &&
qn.lower > 1 && qn.lower <= EXPAND_STRING_MAX_LENGTH) {
StringNode sn = (StringNode)target;
int len = sn.length();
-
+
if (len * qn.lower <= EXPAND_STRING_MAX_LENGTH) {
StringNode str = qn.convertToString();
- // if (str.parent == null) root = str;
+ // if (str.parent == null) root = str;
int n = qn.lower;
for (int i=0; i<n; i++) {
- str.cat(sn.bytes, sn.p, sn.end);
+ str.cat(sn.bytes, sn.p, sn.end);
}
}
break; /* break case NT_QTFR: */
@@ -1800,7 +1800,7 @@ final class Analyser extends Parser {
}
} // USE_OP_PUSH_OR_JUMP_EXACT
break;
-
+
case NodeType.ENCLOSE:
EncloseNode en = (EncloseNode)node;
switch (en.type) {
@@ -1810,12 +1810,12 @@ final class Analyser extends Parser {
setupTree(en.target, state);
regex.options = options;
break;
-
+
case EncloseType.MEMORY:
if ((state & (IN_ALT | IN_NOT | IN_VAR_REPEAT)) != 0) {
env.btMemStart = bsOnAt(env.btMemStart, en.regNum);
/* SET_ENCLOSE_STATUS(node, NST_MEM_IN_ALT_NOT); */
-
+
}
setupTree(en.target, state);
break;
@@ -1830,56 +1830,56 @@ final class Analyser extends Parser {
}
}
break;
-
+
} // inner switch
break;
-
+
case NodeType.ANCHOR:
AnchorNode an = (AnchorNode)node;
switch (an.type) {
case AnchorType.PREC_READ:
setupTree(an.target, state);
break;
-
+
case AnchorType.PREC_READ_NOT:
setupTree(an.target, (state | IN_NOT));
break;
-
+
case AnchorType.LOOK_BEHIND:
boolean lbInvalid = checkTypeTree(an.target, NodeType.ALLOWED_IN_LB,
EncloseType.ALLOWED_IN_LB,
AnchorType.ALLOWED_IN_LB);
-
+
if (lbInvalid) newSyntaxException(ERR_INVALID_LOOK_BEHIND_PATTERN);
setupLookBehind(node);
setupTree(an.target, state);
break;
-
+
case AnchorType.LOOK_BEHIND_NOT:
boolean lbnInvalid = checkTypeTree(an.target, NodeType.ALLOWED_IN_LB,
EncloseType.ALLOWED_IN_LB,
AnchorType.ALLOWED_IN_LB);
-
+
if (lbnInvalid) newSyntaxException(ERR_INVALID_LOOK_BEHIND_PATTERN);
-
+
setupLookBehind(node);
setupTree(an.target, (state | IN_NOT));
break;
-
+
} // inner switch
break;
default:
break;
-
+
} // switch
}
-
+
private static final int MAX_NODE_OPT_INFO_REF_COUNT = 5;
private void optimizeNodeLeft(Node node, NodeOptInfo opt, OptEnvironment oenv) { // oenv remove, pass mmd
opt.clear();
opt.setBoundNode(oenv.mmd);
-
+
switch (node.getType()) {
case NodeType.LIST: {
OptEnvironment nenv = new OptEnvironment();
@@ -1893,7 +1893,7 @@ final class Analyser extends Parser {
} while ((lin = lin.cdr) != null);
break;
}
-
+
case NodeType.ALT: {
NodeOptInfo nopt = new NodeOptInfo();
ConsAltNode aln = (ConsAltNode)node;
@@ -1910,9 +1910,9 @@ final class Analyser extends Parser {
case NodeType.STR: {
StringNode sn = (StringNode)node;
-
+
int slen = sn.length();
-
+
if (!sn.isAmbig()) {
opt.exb.concatStr(sn.bytes, sn.p, sn.end, sn.isRaw(), enc);
@@ -1929,7 +1929,7 @@ final class Analyser extends Parser {
} else {
opt.exb.concatStr(sn.bytes, sn.p, sn.end, sn.isRaw(), enc);
opt.exb.ignoreCase = true;
-
+
if (slen > 0) {
opt.map.addCharAmb(sn.bytes, sn.p, sn.end, enc, oenv.caseFoldFlag);
}
@@ -1938,13 +1938,13 @@ final class Analyser extends Parser {
}
opt.length.set(slen, max);
}
-
+
if (opt.exb.length == slen) {
opt.exb.reachEnd = true;
}
- break;
+ break;
}
-
+
case NodeType.CCLASS: {
CClassNode cc = (CClassNode)node;
/* no need to check ignore case. (setted in setup_tree()) */
@@ -1961,16 +1961,16 @@ final class Analyser extends Parser {
}
opt.length.set(1, 1);
}
- break;
+ break;
}
-
+
case NodeType.CTYPE: {
int min;
int max = enc.maxLengthDistance();
if (max == 1) {
min = 1;
CTypeNode cn = (CTypeNode)node;
-
+
switch (cn.ctype) {
case CharacterType.WORD:
if (cn.not) {
@@ -1980,7 +1980,7 @@ final class Analyser extends Parser {
}
}
} else {
- for (int i=0; i<BitSet.SINGLE_BYTE_SIZE; i++) {
+ for (int i=0; i<BitSet.SINGLE_BYTE_SIZE; i++) {
if (enc.isWord(i)) {
opt.map.addChar((byte)i, enc);
}
@@ -1994,12 +1994,12 @@ final class Analyser extends Parser {
opt.length.set(min, max);
break;
}
-
+
case NodeType.CANY: {
opt.length.set(enc.minLength(), enc.maxLengthDistance());
break;
}
-
+
case NodeType.ANCHOR: {
AnchorNode an = (AnchorNode)node;
switch (an.type) {
@@ -2011,7 +2011,7 @@ final class Analyser extends Parser {
case AnchorType.END_LINE:
opt.anchor.add(an.type);
break;
-
+
case AnchorType.PREC_READ:
NodeOptInfo nopt = new NodeOptInfo();
optimizeNodeLeft(an.target, nopt, oenv);
@@ -2028,24 +2028,24 @@ final class Analyser extends Parser {
case AnchorType.LOOK_BEHIND: /* Sorry, I can't make use of it. */
case AnchorType.LOOK_BEHIND_NOT:
break;
-
+
} // inner switch
break;
}
-
+
case NodeType.BREF: {
BackRefNode br = (BackRefNode)node;
-
+
if (br.isRecursion()) {
opt.length.set(0, MinMaxLen.INFINITE_DISTANCE);
break;
}
-
+
Node[]nodes = oenv.scanEnv.memNodes;
-
+
int min = getMinMatchLength(nodes[br.back[0]]);
int max = getMaxMatchLength(nodes[br.back[0]]);
-
+
for (int i=1; i<br.backNum; i++) {
int tmin = getMinMatchLength(nodes[br.back[i]]);
int tmax = getMaxMatchLength(nodes[br.back[i]]);
@@ -2105,7 +2105,7 @@ final class Analyser extends Parser {
if (qn.lower > 1) {
opt.exm.reachEnd = false;
}
-
+
}
}
int min = MinMaxLen.distanceMultiply(nopt.length.min, qn.lower);
@@ -2128,7 +2128,7 @@ final class Analyser extends Parser {
optimizeNodeLeft(en.target, opt, oenv);
oenv.options = save;
break;
-
+
case EncloseType.MEMORY:
if (Config.USE_SUBEXP_CALL && ++en.optCount > MAX_NODE_OPT_INFO_REF_COUNT) {
int min = 0;
@@ -2139,35 +2139,35 @@ final class Analyser extends Parser {
} else { // USE_SUBEXP_CALL
optimizeNodeLeft(en.target, opt, oenv);
if (opt.anchor.isSet(AnchorType.ANYCHAR_STAR_MASK)) {
- if (bsAt(oenv.scanEnv.backrefedMem, en.regNum)) {
+ if (bsAt(oenv.scanEnv.backrefedMem, en.regNum)) {
opt.anchor.remove(AnchorType.ANYCHAR_STAR_MASK);
}
}
- }
+ }
break;
-
+
case EncloseType.STOP_BACKTRACK:
optimizeNodeLeft(en.target, opt, oenv);
break;
} // inner switch
break;
}
-
+
default:
newInternalException(ERR_PARSER_BUG);
} // switch
}
-
- protected final void setOptimizedInfoFromTree(Node node) {
+
+ protected final void setOptimizedInfoFromTree(Node node) {
NodeOptInfo opt = new NodeOptInfo();
OptEnvironment oenv = new OptEnvironment();
-
+
oenv.enc = regex.enc;
oenv.options = regex.options;
oenv.caseFoldFlag = regex.caseFoldFlag;
oenv.scanEnv = env;
oenv.mmd.clear(); // ??
-
+
optimizeNodeLeft(node, opt, oenv);
regex.anchor = opt.anchor.leftAnchor & (AnchorType.BEGIN_BUF |
@@ -2201,7 +2201,7 @@ final class Analyser extends Parser {
regex.subAnchor |= opt.anchor.leftAnchor & AnchorType.BEGIN_LINE;
if (opt.length.max == 0) regex.subAnchor |= opt.anchor.rightAnchor & AnchorType.END_LINE;
}
-
+
if (Config.DEBUG_COMPILE || Config.DEBUG_MATCH) {
Config.log.println(regex.optimizeInfoToString());
}
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jruby-joni.git
More information about the pkg-java-commits
mailing list