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

Minor, prettify code

Browse Source
This commit is contained in:
Alexander Udalov
2013-12-04 19:23:32 +04:00
parent 21a0ca5840
commit 96f753278c
1 changed files with 23 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/jet/codegen/ExpressionCodegen.java
+23 -21
View File
@@ -2619,36 +2619,38 @@ public class ExpressionCodegen extends JetVisitor<StackValue, StackValue> implem
}
@Override
public StackValue visitSafeQualifiedExpression(@NotNull JetSafeQualifiedExpression expression, StackValue receiver) {
JetExpression expr = expression.getReceiverExpression();
Type receiverType = expressionType(expr);
gen(expr, receiverType);
public StackValue visitSafeQualifiedExpression(@NotNull JetSafeQualifiedExpression expression, StackValue unused) {
JetExpression receiver = expression.getReceiverExpression();
JetExpression selector = expression.getSelectorExpression();
Type receiverType = expressionType(receiver);
gen(receiver, receiverType);
if (isPrimitive(receiverType)) {
StackValue propValue = genQualified(StackValue.onStack(receiverType), expression.getSelectorExpression());
StackValue propValue = genQualified(StackValue.onStack(receiverType), selector);
Type type = boxType(propValue.type);
propValue.put(type, v);
return StackValue.onStack(type);
}
else {
Label ifnull = new Label();
Label end = new Label();
v.dup();
v.ifnull(ifnull);
StackValue propValue = genQualified(StackValue.onStack(receiverType), expression.getSelectorExpression());
Type type = boxType(propValue.type);
propValue.put(type, v);
v.goTo(end);
v.mark(ifnull);
v.pop();
if (!type.equals(Type.VOID_TYPE)) {
v.aconst(null);
}
v.mark(end);
Label ifnull = new Label();
Label end = new Label();
v.dup();
v.ifnull(ifnull);
StackValue propValue = genQualified(StackValue.onStack(receiverType), selector);
Type type = boxType(propValue.type);
propValue.put(type, v);
v.goTo(end);
return StackValue.onStack(type);
v.mark(ifnull);
v.pop();
if (!type.equals(Type.VOID_TYPE)) {
v.aconst(null);
}
v.mark(end);
return StackValue.onStack(type);
}
@Override