This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-jxpath.git
The following commit(s) were added to refs/heads/master by this push:
new 7d8bda2 No need to nest
7d8bda2 is described below
commit 7d8bda20ca64b760d7d404e5aebbb2bd1441c571
Author: Gary Gregory <garydgreg...@gmail.com>
AuthorDate: Tue Oct 18 14:48:30 2022 -0400
No need to nest
Remove unused
---
.../commons/jxpath/ri/axes/PredicateContext.java | 18 ++++++-------
.../jxpath/ri/axes/SimplePathInterpreter.java | 30 ++++++++++------------
.../jxpath/ri/model/jdom/JDOMNodeIterator.java | 28 ++++++++++----------
.../commons/jxpath/ri/parser/SimpleCharStream.java | 8 +++---
.../jxpath/ri/parser/XPathParserTokenManager.java | 23 ++---------------
5 files changed, 40 insertions(+), 67 deletions(-)
diff --git
a/src/main/java/org/apache/commons/jxpath/ri/axes/PredicateContext.java
b/src/main/java/org/apache/commons/jxpath/ri/axes/PredicateContext.java
index b2e1dea..645fdf5 100644
--- a/src/main/java/org/apache/commons/jxpath/ri/axes/PredicateContext.java
+++ b/src/main/java/org/apache/commons/jxpath/ri/axes/PredicateContext.java
@@ -139,17 +139,15 @@ public class PredicateContext extends EvalContext {
if (nameTestExpression == null) {
return setPositionStandard(position);
}
- else {
- if (dynamicPropertyPointer == null &&
!setupDynamicPropertyPointer()) {
- return setPositionStandard(position);
- }
- if (position < 1
- || position > dynamicPropertyPointer.getLength()) {
- return false;
- }
- dynamicPropertyPointer.setIndex(position - 1);
- return true;
+ if (dynamicPropertyPointer == null && !setupDynamicPropertyPointer()) {
+ return setPositionStandard(position);
}
+ if (position < 1
+ || position > dynamicPropertyPointer.getLength()) {
+ return false;
+ }
+ dynamicPropertyPointer.setIndex(position - 1);
+ return true;
}
@Override
diff --git
a/src/main/java/org/apache/commons/jxpath/ri/axes/SimplePathInterpreter.java
b/src/main/java/org/apache/commons/jxpath/ri/axes/SimplePathInterpreter.java
index 8f3c5c7..2efd142 100644
--- a/src/main/java/org/apache/commons/jxpath/ri/axes/SimplePathInterpreter.java
+++ b/src/main/java/org/apache/commons/jxpath/ri/axes/SimplePathInterpreter.java
@@ -633,23 +633,21 @@ public class SimplePathInterpreter {
predicates,
currentPredicate + 1);
}
- else {
- // For a subscript, simply take the corresponding
- // element from the list of results and
- // proceed to the remaining predicates with that element
- final int index = indexFromPredicate(context, predicate);
- if (index < 0 || index >= parents.size()) {
- return null;
- }
- final NodePointer ptr = (NodePointer) parents.get(index);
- return doPredicate(
- context,
- ptr,
- steps,
- currentStep,
- predicates,
- currentPredicate + 1);
+ // For a subscript, simply take the corresponding
+ // element from the list of results and
+ // proceed to the remaining predicates with that element
+ final int index = indexFromPredicate(context, predicate);
+ if (index < 0 || index >= parents.size()) {
+ return null;
}
+ final NodePointer ptr = (NodePointer) parents.get(index);
+ return doPredicate(
+ context,
+ ptr,
+ steps,
+ currentStep,
+ predicates,
+ currentPredicate + 1);
}
/**
diff --git
a/src/main/java/org/apache/commons/jxpath/ri/model/jdom/JDOMNodeIterator.java
b/src/main/java/org/apache/commons/jxpath/ri/model/jdom/JDOMNodeIterator.java
index 872c638..89c142e 100644
---
a/src/main/java/org/apache/commons/jxpath/ri/model/jdom/JDOMNodeIterator.java
+++
b/src/main/java/org/apache/commons/jxpath/ri/model/jdom/JDOMNodeIterator.java
@@ -151,24 +151,22 @@ public class JDOMNodeIterator implements NodeIterator {
}
return false;
}
- else {
- if (position == 1) {
- index = children.size() - 1;
- if (child != null) {
- index = children.indexOf(child) - 1;
- }
+ if (position == 1) {
+ index = children.size() - 1;
+ if (child != null) {
+ index = children.indexOf(child) - 1;
}
- else {
- index--;
- }
- for (; index >= 0; index--) {
- child = children.get(index);
- if (testChild()) {
- return true;
- }
+ }
+ else {
+ index--;
+ }
+ for (; index >= 0; index--) {
+ child = children.get(index);
+ if (testChild()) {
+ return true;
}
- return false;
}
+ return false;
}
/**
diff --git
a/src/main/java/org/apache/commons/jxpath/ri/parser/SimpleCharStream.java
b/src/main/java/org/apache/commons/jxpath/ri/parser/SimpleCharStream.java
index 5e5443a..35e3dea 100644
--- a/src/main/java/org/apache/commons/jxpath/ri/parser/SimpleCharStream.java
+++ b/src/main/java/org/apache/commons/jxpath/ri/parser/SimpleCharStream.java
@@ -128,9 +128,8 @@ public class SimpleCharStream
{
inputStream.close();
throw new java.io.IOException();
- } else {
- maxNextCharInd += i;
}
+ maxNextCharInd += i;
return;
}
catch(final java.io.IOException e) {
@@ -347,10 +346,9 @@ public int getLine() {
{
if (bufpos >= tokenBegin) {
return new String(buffer, tokenBegin, bufpos - tokenBegin + 1);
- } else {
- return new String(buffer, tokenBegin, bufsize - tokenBegin) +
- new String(buffer, 0, bufpos + 1);
}
+ return new String(buffer, tokenBegin, bufsize - tokenBegin) +
+ new String(buffer, 0, bufpos + 1);
}
public char[] GetSuffix(final int len)
diff --git
a/src/main/java/org/apache/commons/jxpath/ri/parser/XPathParserTokenManager.java
b/src/main/java/org/apache/commons/jxpath/ri/parser/XPathParserTokenManager.java
index 2a1a74c..1cf32d6 100644
---
a/src/main/java/org/apache/commons/jxpath/ri/parser/XPathParserTokenManager.java
+++
b/src/main/java/org/apache/commons/jxpath/ri/parser/XPathParserTokenManager.java
@@ -1381,17 +1381,6 @@ private void jjCheckNAddTwoStates(final int state1,
final int state2)
jjCheckNAdd(state1);
jjCheckNAdd(state2);
}
-private void jjCheckNAddStates(int start, final int end)
-{
- do {
- jjCheckNAdd(jjnextStates[start]);
- } while (start++ != end);
-}
-private void jjCheckNAddStates(final int start)
-{
- jjCheckNAdd(jjnextStates[start]);
- jjCheckNAdd(jjnextStates[start + 1]);
-}
static final long[] jjbitVec0 = {
0xfffffffffffffffeL, 0xffffffffffffffffL, 0xffffffffffffffffL,
0xffffffffffffffffL
};
@@ -1517,12 +1506,10 @@ static final long[] jjbitVec41 = {
};
private int jjMoveNfa_0(final int startState, int curPos)
{
- final int[] nextStates;
int startsAt = 0;
jjnewStateCnt = 13;
int i = 1;
jjstateSet[0] = startState;
- final int j;
int kind = 0x7fffffff;
for (;;)
{
@@ -1918,9 +1905,8 @@ public void SwitchTo(final int lexState)
{
if (lexState >= 1 || lexState < 0) {
throw new TokenMgrError("Error: Ignoring invalid lexical state : " +
lexState + ". State unchanged.", TokenMgrError.INVALID_LEXICAL_STATE);
-} else {
- curLexState = lexState;
}
+curLexState = lexState;
}
protected Token jjFillToken()
@@ -1945,8 +1931,6 @@ int jjmatchedKind;
public Token getNextToken()
{
- final int kind;
- final Token specialToken = null;
Token matchedToken;
int curPos = 0;
@@ -1983,10 +1967,7 @@ public Token getNextToken()
matchedToken = jjFillToken();
return matchedToken;
}
- else
- {
- continue EOFLoop;
- }
+ continue EOFLoop;
}
int error_line = input_stream.getEndLine();
int error_column = input_stream.getEndColumn();
