Skip to content

Commit

Permalink
issue1154: correct most compilation errors in the jp model
Browse files Browse the repository at this point in the history
  • Loading branch information
@ftomassetti
ftomassetti committed Sep 29, 2017
1 parent e15d5a8 commit 198ba6c
Show file tree
Hide file tree
Showing 14 changed files with 244 additions and 251 deletions.
184 changes: 92 additions & 92 deletions ...c/main/java/com/github/javaparser/symbolsolver/javaparsermodel/DefaultVisitorAdapter.java
View file

Large diffs are not rendered by default.

41 changes: 19 additions & 22 deletions ...re/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/JavaParserFacade.java
View file
Expand Up @@ -29,10 +29,7 @@
import com.github.javaparser.ast.type.WildcardType;
import com.github.javaparser.resolution.MethodUsage;
import com.github.javaparser.resolution.declarations.*;
import com.github.javaparser.resolution.types.ResolvedArrayType;
import com.github.javaparser.resolution.types.ResolvedType;
import com.github.javaparser.resolution.types.ResolvedVoidType;
import com.github.javaparser.resolution.types.ResolvedWildcard;
import com.github.javaparser.resolution.types.*;
import com.github.javaparser.symbolsolver.core.resolution.Context;
import com.github.javaparser.symbolsolver.javaparsermodel.declarations.*;
import com.github.javaparser.symbolsolver.model.resolution.SymbolReference;
Expand Down Expand Up @@ -159,23 +156,23 @@ public SymbolReference<ResolvedConstructorDeclaration> solve(ExplicitConstructor

Optional<ClassOrInterfaceDeclaration> optAncestor = explicitConstructorInvocationStmt.getAncestorOfType(ClassOrInterfaceDeclaration.class);
if (!optAncestor.isPresent()) {
return SymbolReference.unsolved(ConstructorDeclaration.class);
return SymbolReference.unsolved(ResolvedConstructorDeclaration.class);
}
ClassOrInterfaceDeclaration classNode = optAncestor.get();
TypeDeclaration typeDecl = null;
ResolvedTypeDeclaration typeDecl = null;
if (!explicitConstructorInvocationStmt.isThis()) {
ResolvedType classDecl = JavaParserFacade.get(typeSolver).convert(classNode.getExtendedTypes(0), classNode);
if (classDecl.isReferenceType()) {
typeDecl = classDecl.asReferenceType().getTypeDeclaration();
}
} else {
SymbolReference<TypeDeclaration> sr = JavaParserFactory.getContext(classNode, typeSolver).solveType(classNode.getNameAsString(), typeSolver);
SymbolReference<ResolvedTypeDeclaration> sr = JavaParserFactory.getContext(classNode, typeSolver).solveType(classNode.getNameAsString(), typeSolver);
if (sr.isSolved()) {
typeDecl = sr.getCorrespondingDeclaration();
}
}
if (typeDecl == null) {
return SymbolReference.unsolved(ConstructorDeclaration.class);
return SymbolReference.unsolved(ResolvedConstructorDeclaration.class);
}
SymbolReference<ResolvedConstructorDeclaration> res = ConstructorResolutionLogic.findMostApplicable(((ResolvedClassDeclaration) typeDecl).getConstructors(), argumentTypes, typeSolver);
for (LambdaArgumentTypePlaceholder placeholder : placeholders) {
Expand Down Expand Up @@ -217,7 +214,7 @@ public SymbolReference<ResolvedConstructorDeclaration> solve(ObjectCreationExpr

ResolvedType classDecl = JavaParserFacade.get(typeSolver).convert(objectCreationExpr.getType(), objectCreationExpr);
if (!classDecl.isReferenceType()) {
return SymbolReference.unsolved(ConstructorDeclaration.class);
return SymbolReference.unsolved(ResolvedConstructorDeclaration.class);
}
SymbolReference<ResolvedConstructorDeclaration> res = ConstructorResolutionLogic.findMostApplicable(((ResolvedClassDeclaration) classDecl.asReferenceType().getTypeDeclaration()).getConstructors(), argumentTypes, typeSolver);
for (LambdaArgumentTypePlaceholder placeholder : placeholders) {
Expand Down Expand Up @@ -357,11 +354,11 @@ protected MethodUsage toMethodUsage(MethodReferenceExpr methodReferenceExpr) {
throw new UnsupportedOperationException(typeExpr.getType().getClass().getCanonicalName());
}
ClassOrInterfaceType classOrInterfaceType = (ClassOrInterfaceType) typeExpr.getType();
SymbolReference<TypeDeclaration> typeDeclarationSymbolReference = JavaParserFactory.getContext(classOrInterfaceType, typeSolver).solveType(classOrInterfaceType.getName().getId(), typeSolver);
SymbolReference<ResolvedTypeDeclaration> typeDeclarationSymbolReference = JavaParserFactory.getContext(classOrInterfaceType, typeSolver).solveType(classOrInterfaceType.getName().getId(), typeSolver);
if (!typeDeclarationSymbolReference.isSolved()) {
throw new UnsupportedOperationException();
}
List<MethodUsage> methodUsages = ((ReferenceTypeDeclaration) typeDeclarationSymbolReference.getCorrespondingDeclaration()).getAllMethods().stream().filter(it -> it.getName().equals(methodReferenceExpr.getIdentifier())).collect(Collectors.toList());
List<MethodUsage> methodUsages = ((ResolvedReferenceTypeDeclaration) typeDeclarationSymbolReference.getCorrespondingDeclaration()).getAllMethods().stream().filter(it -> it.getName().equals(methodReferenceExpr.getIdentifier())).collect(Collectors.toList());
switch (methodUsages.size()) {
case 0:
throw new UnsupportedOperationException();
Expand All @@ -372,9 +369,9 @@ protected MethodUsage toMethodUsage(MethodReferenceExpr methodReferenceExpr) {
}
}

protected Type getBinaryTypeConcrete(Node left, Node right, boolean solveLambdas) {
Type leftType = getTypeConcrete(left, solveLambdas);
Type rightType = getTypeConcrete(right, solveLambdas);
protected ResolvedType getBinaryTypeConcrete(Node left, Node right, boolean solveLambdas) {
ResolvedType leftType = getTypeConcrete(left, solveLambdas);
ResolvedType rightType = getTypeConcrete(right, solveLambdas);
if (rightType.isAssignableBy(leftType)) {
return rightType;
}
Expand All @@ -388,7 +385,7 @@ protected Type getBinaryTypeConcrete(Node left, Node right, boolean solveLambdas
*
* @return
*/
private Type getTypeConcrete(Node node, boolean solveLambdas) {
private ResolvedType getTypeConcrete(Node node, boolean solveLambdas) {
if (node == null) throw new IllegalArgumentException();
return node.accept(typeExtractor, solveLambdas);
}
Expand Down Expand Up @@ -435,27 +432,27 @@ protected ResolvedType convertToUsage(com.github.javaparser.ast.type.Type type,
if (type instanceof ClassOrInterfaceType) {
ClassOrInterfaceType classOrInterfaceType = (ClassOrInterfaceType) type;
String name = qName(classOrInterfaceType);
SymbolReference<TypeDeclaration> ref = context.solveType(name, typeSolver);
SymbolReference<ResolvedTypeDeclaration> ref = context.solveType(name, typeSolver);
if (!ref.isSolved()) {
throw new UnsolvedSymbolException(name);
}
TypeDeclaration typeDeclaration = ref.getCorrespondingDeclaration();
ResolvedTypeDeclaration typeDeclaration = ref.getCorrespondingDeclaration();
List<ResolvedType> typeParameters = Collections.emptyList();
if (classOrInterfaceType.getTypeArguments().isPresent()) {
typeParameters = classOrInterfaceType.getTypeArguments().get().stream().map((pt) -> convertToUsage(pt, context)).collect(Collectors.toList());
}
if (typeDeclaration.isTypeParameter()) {
if (typeDeclaration instanceof TypeParameterDeclaration) {
return new TypeVariable((TypeParameterDeclaration) typeDeclaration);
if (typeDeclaration instanceof ResolvedTypeParameterDeclaration) {
return new ResolvedTypeVariable((ResolvedTypeParameterDeclaration) typeDeclaration);
} else {
JavaParserTypeVariableDeclaration javaParserTypeVariableDeclaration = (JavaParserTypeVariableDeclaration) typeDeclaration;
return new TypeVariable(javaParserTypeVariableDeclaration.asTypeParameter());
return new ResolvedTypeVariable(javaParserTypeVariableDeclaration.asTypeParameter());
}
} else {
return new ReferenceTypeImpl((ReferenceTypeDeclaration) typeDeclaration, typeParameters, typeSolver);
return new ReferenceTypeImpl((ResolvedReferenceTypeDeclaration) typeDeclaration, typeParameters, typeSolver);
}
} else if (type instanceof com.github.javaparser.ast.type.PrimitiveType) {
return PrimitiveType.byName(((com.github.javaparser.ast.type.PrimitiveType) type).getType().name());
return ResolvedPrimitiveType.byName(((com.github.javaparser.ast.type.PrimitiveType) type).getType().name());
} else if (type instanceof WildcardType) {
WildcardType wildcardType = (WildcardType) type;
if (wildcardType.getExtendedTypes().isPresent() && !wildcardType.getSuperTypes().isPresent()) {
Expand Down
12 changes: 6 additions & 6 deletions ...ava/com/github/javaparser/symbolsolver/javaparsermodel/LambdaArgumentTypePlaceholder.java
View file
Expand Up @@ -16,20 +16,20 @@

package com.github.javaparser.symbolsolver.javaparsermodel;

import com.github.javaparser.symbolsolver.model.declarations.MethodLikeDeclaration;
import com.github.javaparser.resolution.declarations.ResolvedMethodLikeDeclaration;
import com.github.javaparser.resolution.types.ResolvedType;
import com.github.javaparser.symbolsolver.model.resolution.SymbolReference;
import com.github.javaparser.symbolsolver.model.typesystem.Type;

/**
* Placeholder used to represent a lambda argument type while it is being
* calculated.
*
* @author Federico Tomassetti
*/
public class LambdaArgumentTypePlaceholder implements Type {
public class LambdaArgumentTypePlaceholder implements ResolvedType {

private int pos;
private SymbolReference<? extends MethodLikeDeclaration> method;
private SymbolReference<? extends ResolvedMethodLikeDeclaration> method;

public LambdaArgumentTypePlaceholder(int pos) {
this.pos = pos;
Expand Down Expand Up @@ -60,12 +60,12 @@ public boolean isTypeVariable() {
return false;
}

public void setMethod(SymbolReference<? extends MethodLikeDeclaration> method) {
public void setMethod(SymbolReference<? extends ResolvedMethodLikeDeclaration> method) {
this.method = method;
}

@Override
public boolean isAssignableBy(Type other) {
public boolean isAssignableBy(ResolvedType other) {
throw new UnsupportedOperationException();
}

Expand Down

0 comments on commit 198ba6c

Please sign in to comment.