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

Removed code duplication and unnecessary branch

Browse Source
This commit is contained in:
Mikhael Bogdanov
2013-04-03 15:35:49 +04:00
parent 48d153e8b2
commit 0ba38b9f09
1 changed files with 4 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/jet/codegen/ExpressionCodegen.java
+4 -10
View File
@@ -1582,16 +1582,11 @@ public class ExpressionCodegen extends JetVisitor<StackValue, StackValue> implem
else {
if (!isStatic) {
if (receiver == StackValue.none()) {
if (resolvedCall == null) {
receiver = generateThisOrOuter((ClassDescriptor) propertyDescriptor.getContainingDeclaration(), false);
if (resolvedCall != null && resolvedCall.getThisObject() instanceof ExtensionReceiver) {
receiver = generateReceiver(((ExtensionReceiver) resolvedCall.getThisObject()).getDeclarationDescriptor());
}
else {
if (resolvedCall.getThisObject() instanceof ExtensionReceiver) {
receiver = generateReceiver(((ExtensionReceiver) resolvedCall.getThisObject()).getDeclarationDescriptor());
}
else {
receiver = generateThisOrOuter((ClassDescriptor) propertyDescriptor.getContainingDeclaration(), false);
}
receiver = generateThisOrOuter((ClassDescriptor) propertyDescriptor.getContainingDeclaration(), false);
}
}
if (directToField) {
@@ -2433,8 +2428,7 @@ public class ExpressionCodegen extends JetVisitor<StackValue, StackValue> implem
@Override
public StackValue visitDotQualifiedExpression(JetDotQualifiedExpression expression, StackValue receiver) {
JetExpression receiverExpression = expression.getReceiverExpression();
StackValue receiverValue = receiverExpression instanceof JetSuperExpression ? gen(receiverExpression) : StackValue.none();
StackValue receiverValue = StackValue.none();
return genQualified(receiverValue, expression.getSelectorExpression());
}