azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactor MembersByNameCache: structure code the least bit

Browse Source
This commit is contained in:
Pavel V. Talanov
2012-10-17 21:16:25 +04:00
parent 4b85fd152d
commit fa1921c66f
1 changed files with 97 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/MembersByNameCache.java
+97 -85
View File
@@ -117,34 +117,29 @@ public final class MembersByNameCache {
if (kotlin && !psiClass.getPsiClass().isEnum()) { if (kotlin && !psiClass.getPsiClass().isEnum()) {
return; return;
} }
for (PsiField field0 : psiClass.getPsiClass().getAllFields()) { for (PsiField field : psiClass.getPsiClass().getAllFields()) {
PsiFieldWrapper field = new PsiFieldWrapper(field0); PsiFieldWrapper fieldWrapper = new PsiFieldWrapper(field);
// group must be created even for excluded field // group must be created even for excluded field
NamedMembers namedMembers = cache.getOrCreateEmpty(Name.identifier(field.getName())); NamedMembers namedMembers = cache.getOrCreateEmpty(Name.identifier(fieldWrapper.getName()));
if (!includeMember(field)) { if (!includeMember(fieldWrapper)) {
continue; continue;
} }
TypeSource type = new TypeSource("", field.getType(), field0); TypeSource type = new TypeSource("", fieldWrapper.getType(), field);
namedMembers.addPropertyAccessor(new PropertyAccessorData(field, type, null)); namedMembers.addPropertyAccessor(new PropertyAccessorData(fieldWrapper, type, null));
} }
} }
private void processMethods() { private void processMethods() {
for (PsiMethod method : psiClass.getPsiClass().getAllMethods()) { parseAllMethodsAsProperties();
createEmptyEntry(Name.identifier(method.getName())); processOwnMethods();
}
PropertyParseResult propertyParseResult = PropertyNameUtils.parseMethodToProperty(method.getName()); private void processOwnMethods() {
if (propertyParseResult != null) { for (PsiMethod ownMethod : psiClass.getPsiClass().getMethods()) {
cache.getOrCreateEmpty(Name.identifier(propertyParseResult.getPropertyName())); PsiMethodWrapper method = new PsiMethodWrapper(ownMethod);
}
}
for (PsiMethod method0 : psiClass.getPsiClass().getMethods()) {
PsiMethodWrapper method = new PsiMethodWrapper(method0);
if (!includeMember(method)) { if (!includeMember(method)) {
continue; continue;
@@ -154,76 +149,10 @@ public final class MembersByNameCache {
// TODO: remove getJavaClass // TODO: remove getJavaClass
if (propertyParseResult != null && propertyParseResult.isGetter()) { if (propertyParseResult != null && propertyParseResult.isGetter()) {
processGetter(ownMethod, method, propertyParseResult);
String propertyName = propertyParseResult.getPropertyName();
NamedMembers members = cache.getOrCreateEmpty(Name.identifier(propertyName));
// TODO: some java properties too
if (method.getJetMethod().hasPropertyFlag()) {
int i = 0;
TypeSource receiverType;
if (i < method.getParameters().size() && method.getParameter(i).getJetValueParameter().receiver()) {
PsiParameterWrapper receiverParameter = method.getParameter(i);
receiverType = new TypeSource(receiverParameter.getJetValueParameter().type(), receiverParameter.getPsiParameter().getType(), receiverParameter.getPsiParameter());
++i;
}
else {
receiverType = null;
}
while (i < method.getParameters().size() && method.getParameter(i).getJetTypeParameter().isDefined()) {
// TODO: store is reified
++i;
}
if (i != method.getParameters().size()) {
// TODO: report error properly
throw new IllegalStateException("something is wrong with method " + method0);
}
// TODO: what if returnType == null?
final PsiType returnType = method.getReturnType();
assert returnType != null;
TypeSource propertyType = new TypeSource(method.getJetMethod().propertyType(), returnType, method.getPsiMethod());
members.addPropertyAccessor(new PropertyAccessorData(method, true, propertyType, receiverType));
}
} }
else if (propertyParseResult != null && !propertyParseResult.isGetter()) { else if (propertyParseResult != null && !propertyParseResult.isGetter()) {
processSetter(method, propertyParseResult);
String propertyName = propertyParseResult.getPropertyName();
NamedMembers members = cache.getOrCreateEmpty(Name.identifier(propertyName));
if (method.getJetMethod().hasPropertyFlag()) {
if (method.getParameters().size() == 0) {
// TODO: report error properly
throw new IllegalStateException();
}
int i = 0;
TypeSource receiverType = null;
PsiParameterWrapper p1 = method.getParameter(0);
if (p1.getJetValueParameter().receiver()) {
receiverType = new TypeSource(p1.getJetValueParameter().type(), p1.getPsiParameter().getType(), p1.getPsiParameter());
++i;
}
while (i < method.getParameters().size() && method.getParameter(i).getJetTypeParameter().isDefined()) {
++i;
}
if (i + 1 != method.getParameters().size()) {
throw new IllegalStateException();
}
PsiParameterWrapper propertyTypeParameter = method.getParameter(i);
TypeSource propertyType = new TypeSource(method.getJetMethod().propertyType(), propertyTypeParameter.getPsiParameter().getType(), propertyTypeParameter.getPsiParameter());
members.addPropertyAccessor(new PropertyAccessorData(method, false, propertyType, receiverType));
}
} }
if (!method.getJetMethod().hasPropertyFlag()) { if (!method.getJetMethod().hasPropertyFlag()) {
@@ -233,6 +162,89 @@ public final class MembersByNameCache {
} }
} }
private void processSetter(PsiMethodWrapper method, PropertyParseResult propertyParseResult) {
String propertyName = propertyParseResult.getPropertyName();
NamedMembers members = cache.getOrCreateEmpty(Name.identifier(propertyName));
if (method.getJetMethod().hasPropertyFlag()) {
if (method.getParameters().size() == 0) {
// TODO: report error properly
throw new IllegalStateException();
}
int i = 0;
TypeSource receiverType = null;
PsiParameterWrapper p1 = method.getParameter(0);
if (p1.getJetValueParameter().receiver()) {
receiverType = new TypeSource(p1.getJetValueParameter().type(), p1.getPsiParameter().getType(), p1.getPsiParameter());
++i;
}
while (i < method.getParameters().size() && method.getParameter(i).getJetTypeParameter().isDefined()) {
++i;
}
if (i + 1 != method.getParameters().size()) {
throw new IllegalStateException();
}
PsiParameterWrapper propertyTypeParameter = method.getParameter(i);
TypeSource propertyType = new TypeSource(method.getJetMethod().propertyType(), propertyTypeParameter.getPsiParameter().getType(), propertyTypeParameter.getPsiParameter());
members.addPropertyAccessor(new PropertyAccessorData(method, false, propertyType, receiverType));
}
}
private void processGetter(PsiMethod ownMethod, PsiMethodWrapper method, PropertyParseResult propertyParseResult) {
String propertyName = propertyParseResult.getPropertyName();
NamedMembers members = cache.getOrCreateEmpty(Name.identifier(propertyName));
// TODO: some java properties too
if (method.getJetMethod().hasPropertyFlag()) {
int i = 0;
TypeSource receiverType;
if (i < method.getParameters().size() && method.getParameter(i).getJetValueParameter().receiver()) {
PsiParameterWrapper receiverParameter = method.getParameter(i);
receiverType = new TypeSource(receiverParameter.getJetValueParameter().type(), receiverParameter.getPsiParameter().getType(), receiverParameter.getPsiParameter());
++i;
}
else {
receiverType = null;
}
while (i < method.getParameters().size() && method.getParameter(i).getJetTypeParameter().isDefined()) {
// TODO: store is reified
++i;
}
if (i != method.getParameters().size()) {
// TODO: report error properly
throw new IllegalStateException("something is wrong with method " + ownMethod);
}
// TODO: what if returnType == null?
final PsiType returnType = method.getReturnType();
assert returnType != null;
TypeSource propertyType = new TypeSource(method.getJetMethod().propertyType(), returnType, method.getPsiMethod());
members.addPropertyAccessor(new PropertyAccessorData(method, true, propertyType, receiverType));
}
}
private void parseAllMethodsAsProperties() {
for (PsiMethod method : psiClass.getPsiClass().getAllMethods()) {
createEmptyEntry(Name.identifier(method.getName()));
PropertyParseResult propertyParseResult = PropertyNameUtils.parseMethodToProperty(method.getName());
if (propertyParseResult != null) {
cache.getOrCreateEmpty(Name.identifier(propertyParseResult.getPropertyName()));
}
}
}
private void createEmptyEntry(@NotNull Name identifier) { private void createEmptyEntry(@NotNull Name identifier) {
cache.getOrCreateEmpty(identifier); cache.getOrCreateEmpty(identifier);
} }