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

Unnecesary fields removed

Browse Source
This commit is contained in:
Andrey Breslav
2012-08-23 19:14:33 +04:00
parent e57e61ac68
commit 2bdf631b6d
1 changed files with 6 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/jet/codegen/ExpressionCodegen.java
+6 -16
View File
@@ -445,9 +445,6 @@ public class ExpressionCodegen extends JetVisitor<StackValue, StackValue> {
private int iteratorVarIndex; private int iteratorVarIndex;
private final ResolvedCall<FunctionDescriptor> iteratorCall; private final ResolvedCall<FunctionDescriptor> iteratorCall;
private final ResolvedCall<FunctionDescriptor> nextCall; private final ResolvedCall<FunctionDescriptor> nextCall;
private final ResolvedCall<FunctionDescriptor> hasNextCall;
private final Type asmTypeForLoopRange;
private final JetExpression loopRange;
private final Type asmTypeForIterator; private final Type asmTypeForIterator;
private final Type asmTypeForNext; private final Type asmTypeForNext;
@@ -460,12 +457,7 @@ public class ExpressionCodegen extends JetVisitor<StackValue, StackValue> {
private IteratorForLoopGenerator(@NotNull JetForExpression forExpression) { private IteratorForLoopGenerator(@NotNull JetForExpression forExpression) {
this.forExpression = forExpression; this.forExpression = forExpression;
this.loopRange = forExpression.getLoopRange(); JetExpression loopRange = forExpression.getLoopRange();
assert loopRange != null;
JetType loopRangeType = getNotNull(bindingContext, EXPRESSION_TYPE, loopRange);
this.asmTypeForLoopRange = asmType(loopRangeType);
this.iteratorCall = getNotNull(bindingContext, this.iteratorCall = getNotNull(bindingContext,
LOOP_RANGE_ITERATOR_RESOLVED_CALL, loopRange, LOOP_RANGE_ITERATOR_RESOLVED_CALL, loopRange,
"No .iterator() function " + DiagnosticUtils.atLocation(loopRange)); "No .iterator() function " + DiagnosticUtils.atLocation(loopRange));
@@ -478,11 +470,6 @@ public class ExpressionCodegen extends JetVisitor<StackValue, StackValue> {
LOOP_RANGE_NEXT_RESOLVED_CALL, loopRange, LOOP_RANGE_NEXT_RESOLVED_CALL, loopRange,
"No next() function " + DiagnosticUtils.atLocation(loopRange)); "No next() function " + DiagnosticUtils.atLocation(loopRange));
this.asmTypeForNext = asmType(nextCall.getResultingDescriptor().getReturnType()); this.asmTypeForNext = asmType(nextCall.getResultingDescriptor().getReturnType());
this.hasNextCall = getNotNull(bindingContext,
LOOP_RANGE_HAS_NEXT_RESOLVED_CALL, loopRange,
"No hasNext() function " + DiagnosticUtils.atLocation(loopRange));
} }
@Override @Override
@@ -500,8 +487,11 @@ public class ExpressionCodegen extends JetVisitor<StackValue, StackValue> {
public void condition() { public void condition() {
// tmp<iterator>.hasNext() // tmp<iterator>.hasNext()
Call fakeCall = JetExpression loopRange = forExpression.getLoopRange();
makeFakeCall(new TransientReceiver(iteratorCall.getResultingDescriptor().getReturnType())); ResolvedCall<FunctionDescriptor> hasNextCall = getNotNull(bindingContext,
LOOP_RANGE_HAS_NEXT_RESOLVED_CALL, loopRange,
"No hasNext() function " + DiagnosticUtils.atLocation(loopRange));
Call fakeCall = makeFakeCall(new TransientReceiver(iteratorCall.getResultingDescriptor().getReturnType()));
invokeFunction(fakeCall, StackValue.local(iteratorVarIndex, asmTypeForIterator), hasNextCall); invokeFunction(fakeCall, StackValue.local(iteratorVarIndex, asmTypeForIterator), hasNextCall);
JetType type = hasNextCall.getResultingDescriptor().getReturnType(); JetType type = hasNextCall.getResultingDescriptor().getReturnType();