Skip to content

Commit

Permalink
Remove some redundancies
Browse files Browse the repository at this point in the history
  • Loading branch information
@xdrop
xdrop committed Feb 14, 2017
1 parent 56377a2 commit d9726e7
Showing 1 changed file with 14 additions and 17 deletions.
31 changes: 14 additions & 17 deletions ...-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/TypeExtractor.java
View file
Expand Up @@ -35,7 +35,7 @@

public class TypeExtractor extends DefaultVisitorAdapter {

private static Logger logger = Logger.getLogger(JavaParserFacade.class.getCanonicalName());
private static Logger logger = Logger.getLogger(TypeExtractor.class.getCanonicalName());

static {
logger.setLevel(Level.INFO);
Expand All @@ -56,10 +56,10 @@ public TypeExtractor(TypeSolver typeSolver, JavaParserFacade facade) {
public Type visit(VariableDeclarator node, Boolean solveLambdas) {
if (getParentNode(node) instanceof FieldDeclaration) {
// FieldDeclaration parent = (FieldDeclaration) getParentNode(node);
return JavaParserFacade.get(typeSolver).convertToUsageVariableType((VariableDeclarator) node);
return facade.convertToUsageVariableType(node);
} else if (getParentNode(node) instanceof VariableDeclarationExpr) {
// VariableDeclarationExpr parent = (VariableDeclarationExpr) getParentNode(node);
return JavaParserFacade.get(typeSolver).convertToUsageVariableType((VariableDeclarator) node);
return facade.convertToUsageVariableType(node);
} else {
throw new UnsupportedOperationException(getParentNode(node).getClass().getCanonicalName());
}
Expand All @@ -70,14 +70,13 @@ public Type visit(Parameter node, Boolean solveLambdas) {
if (node.getType() instanceof UnknownType) {
throw new IllegalStateException("Parameter has unknown type: " + node);
}
return JavaParserFacade.get(typeSolver).convertToUsage(node.getType(), node);
return facade.convertToUsage(node.getType(), node);
}


@Override
public Type visit(ArrayAccessExpr node, Boolean solveLambdas) {
ArrayAccessExpr arrayAccessExpr = (ArrayAccessExpr) node;
Type arrayUsageType = arrayAccessExpr.getName().accept(this, solveLambdas);
Type arrayUsageType = node.getName().accept(this, solveLambdas);
if (arrayUsageType.isArray()) {
return ((com.github.javaparser.symbolsolver.model.typesystem.ArrayType) arrayUsageType).getComponentType();
}
Expand All @@ -100,19 +99,17 @@ public Type visit(ArrayInitializerExpr node, Boolean solveLambdas) {

@Override
public Type visit(AssignExpr node, Boolean solveLambdas) {
AssignExpr assignExpr = (AssignExpr) node;
return assignExpr.getTarget().accept(this, solveLambdas);
return node.getTarget().accept(this, solveLambdas);
}

@Override
public Type visit(BinaryExpr node, Boolean solveLambdas) {
BinaryExpr binaryExpr = (BinaryExpr) node;
switch (binaryExpr.getOperator()) {
switch (node.getOperator()) {
case PLUS:
case MINUS:
case DIVIDE:
case MULTIPLY:
return facade.getBinaryTypeConcrete(binaryExpr.getLeft(), binaryExpr.getRight(), solveLambdas);
return facade.getBinaryTypeConcrete(node.getLeft(), node.getRight(), solveLambdas);
case LESS_EQUALS:
case LESS:
case GREATER:
Expand All @@ -129,9 +126,9 @@ public Type visit(BinaryExpr node, Boolean solveLambdas) {
case LEFT_SHIFT:
case REMAINDER:
case XOR:
return binaryExpr.getLeft().accept(this, solveLambdas);
return node.getLeft().accept(this, solveLambdas);
default:
throw new UnsupportedOperationException("FOO " + binaryExpr.getOperator().name());
throw new UnsupportedOperationException("FOO " + node.getOperator().name());
}
}

Expand Down Expand Up @@ -262,7 +259,7 @@ public Type visit(NameExpr node, Boolean solveLambdas) {

@Override
public Type visit(ObjectCreationExpr node, Boolean solveLambdas) {
Type type = JavaParserFacade.get(typeSolver).convertToUsage(node.getType(), node);
Type type = facade.convertToUsage(node.getType(), node);
return type;
}

Expand Down Expand Up @@ -313,7 +310,7 @@ public Type visit(LambdaExpr node, Boolean solveLambdas) {
if (getParentNode(node) instanceof MethodCallExpr) {
MethodCallExpr callExpr = (MethodCallExpr) getParentNode(node);
int pos = JavaParserSymbolDeclaration.getParamPos(node);
SymbolReference<com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration> refMethod = JavaParserFacade.get(typeSolver).solve(callExpr);
SymbolReference<com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration> refMethod = facade.solve(callExpr);
if (!refMethod.isSolved()) {
throw new UnsolvedSymbolException(getParentNode(node).toString(), callExpr.getName().getId());
}
Expand Down Expand Up @@ -345,7 +342,7 @@ public Type visit(LambdaExpr node, Boolean solveLambdas) {
}

if (!staticCall) {
Type scopeType = JavaParserFacade.get(typeSolver).getType(scope);
Type scopeType = facade.getType(scope);
if (scopeType.isReferenceType()) {
result = scopeType.asReferenceType().useThisTypeParametersOnTheGivenType(result);
}
Expand Down Expand Up @@ -396,7 +393,7 @@ public Type visit(MethodReferenceExpr node, Boolean solveLambdas) {
if (getParentNode(node) instanceof MethodCallExpr) {
MethodCallExpr callExpr = (MethodCallExpr) getParentNode(node);
int pos = JavaParserSymbolDeclaration.getParamPos(node);
SymbolReference<com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration> refMethod = JavaParserFacade.get(typeSolver).solve(callExpr, false);
SymbolReference<com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration> refMethod = facade.solve(callExpr, false);
if (!refMethod.isSolved()) {
throw new UnsolvedSymbolException(getParentNode(node).toString(), callExpr.getName().getId());
}
Expand Down

0 comments on commit d9726e7

Please sign in to comment.