phoedos/pmd
1
1
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Java, typeres: fix PR comments

Browse Source
This commit is contained in:
Bendegúz Nagy
2017-08-17 18:11:37 +02:00
parent bc20be1ed8
commit 80a15c7851
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTExpression.java
View File

@ -40,10 +40,12 @@ public class ASTExpression extends AbstractJavaTypeNode {
ASTLiteral literal = primaryPrefix.getFirstChildOfType(ASTLiteral.class); ASTLiteral literal = primaryPrefix.getFirstChildOfType(ASTLiteral.class);
if (literal == null || literal.jjtGetNumChildren() != 0) { if (literal == null || literal.isStringLiteral()
|| (literal.jjtGetNumChildren() != 0 && literal.jjtGetChild(0) instanceof ASTNullLiteral)) {
return false; return false;
} }
// byte, short, char, int, long, float, double, boolean
return true; return true;
} }
} }

3
pmd-java/src/main/java/net/sourceforge/pmd/lang/java/typeresolution/typeinference/TypeInferenceResolver.java
View File

@ -37,8 +37,7 @@ public final class TypeInferenceResolver {
List<Bound> newBounds = new ArrayList<>(); List<Bound> newBounds = new ArrayList<>();
while (!constraints.isEmpty()) { while (!constraints.isEmpty()) {
List<BoundOrConstraint> reduceResult = constraints.get(constraints.size() - 1).reduce(); List<BoundOrConstraint> reduceResult = constraints.remove(constraints.size() - 1).reduce();
constraints.remove(constraints.size() - 1);
for (BoundOrConstraint boundOrConstraint : reduceResult) { for (BoundOrConstraint boundOrConstraint : reduceResult) {
if (boundOrConstraint instanceof Bound) { if (boundOrConstraint instanceof Bound) {