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

Simplified code.

Browse Source
This commit is contained in:
Evgeny Gerashchenko
2013-06-22 21:43:50 +04:00
parent 8cd1880805
commit 7660ae7f20
1 changed files with 15 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/jet/codegen/ExpressionCodegen.java
+15 -41
View File
@@ -22,6 +22,7 @@ import com.intellij.openapi.editor.Document;
import com.intellij.openapi.progress.ProcessCanceledException; import com.intellij.openapi.progress.ProcessCanceledException;
import com.intellij.psi.PsiElement; import com.intellij.psi.PsiElement;
import com.intellij.psi.tree.IElementType; import com.intellij.psi.tree.IElementType;
import com.intellij.util.ArrayUtil;
import com.intellij.util.Function; import com.intellij.util.Function;
import com.intellij.util.containers.Stack; import com.intellij.util.containers.Stack;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
@@ -3373,60 +3374,33 @@ public class ExpressionCodegen extends JetVisitor<StackValue, StackValue> implem
} }
} }
else { else {
CallableMethod accessor = typeMapper.mapToCallableMethod(
operationDescriptor,
false,
isCallInsideSameClassAsDeclared(operationDescriptor, context),
isCallInsideSameModuleAsDeclared(operationDescriptor, context),
OwnerKind.IMPLEMENTATION);
boolean isGetter = accessor.getSignature().getAsmMethod().getName().equals("get");
ResolvedCall<FunctionDescriptor> resolvedSetCall = bindingContext.get(BindingContext.INDEXED_LVALUE_SET, expression); ResolvedCall<FunctionDescriptor> resolvedSetCall = bindingContext.get(BindingContext.INDEXED_LVALUE_SET, expression);
ResolvedCall<FunctionDescriptor> resolvedGetCall = bindingContext.get(BindingContext.INDEXED_LVALUE_GET, expression); ResolvedCall<FunctionDescriptor> resolvedGetCall = bindingContext.get(BindingContext.INDEXED_LVALUE_GET, expression);
FunctionDescriptor setterDescriptor = resolvedSetCall == null ? null : resolvedSetCall.getResultingDescriptor(); boolean isGetter = "get".equals(operationDescriptor.getName().asString());
FunctionDescriptor getterDescriptor = resolvedGetCall == null ? null : resolvedGetCall.getResultingDescriptor();
Type asmType; ResolvedCall<FunctionDescriptor> resolvedCall = isGetter ? resolvedGetCall : resolvedSetCall;
Type[] argumentTypes = accessor.getSignature().getAsmMethod().getArgumentTypes(); assert resolvedCall != null : "couldn't find resolved call: " + expression.getText();
int index = 0;
if (isGetter) {
assert getterDescriptor != null;
Callable callable = resolveToCallable(getterDescriptor, false);
if (callable instanceof CallableMethod) {
genThisAndReceiverFromResolvedCall(receiver, resolvedGetCall, (CallableMethod) callable);
}
else {
gen(array, asmType(((ClassDescriptor) getterDescriptor.getContainingDeclaration()).getDefaultType()));
}
if (getterDescriptor.getReceiverParameter() != null) { Callable callable = resolveToCallable(operationDescriptor, false);
index++; if (callable instanceof CallableMethod) {
} genThisAndReceiverFromResolvedCall(receiver, resolvedCall, (CallableMethod) callable);
asmType = accessor.getSignature().getAsmMethod().getReturnType();
} }
else { else {
assert resolvedSetCall != null; gen(array, arrayType); // intrinsic method
Callable callable = resolveToCallable(resolvedSetCall.getResultingDescriptor(), false);
if (callable instanceof CallableMethod) {
genThisAndReceiverFromResolvedCall(receiver, resolvedSetCall, (CallableMethod) callable);
}
else {
gen(array, arrayType);
}
if (setterDescriptor.getReceiverParameter() != null) {
index++;
}
asmType = argumentTypes[argumentTypes.length - 1];
} }
int index = operationDescriptor.getReceiverParameter() != null ? 1 : 0;
Method asmMethod = resolveToCallableMethod(operationDescriptor, false, context).getSignature().getAsmMethod();
Type[] argumentTypes = asmMethod.getArgumentTypes();
for (JetExpression jetExpression : expression.getIndexExpressions()) { for (JetExpression jetExpression : expression.getIndexExpressions()) {
gen(jetExpression, argumentTypes[index]); gen(jetExpression, argumentTypes[index]);
index++; index++;
} }
return StackValue.collectionElement(asmType, resolvedGetCall, resolvedSetCall, this, state);
Type elementType = isGetter ? asmMethod.getReturnType() : ArrayUtil.getLastElement(argumentTypes);
return StackValue.collectionElement(elementType, resolvedGetCall, resolvedSetCall, this, state);
} }
} }