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

Fields renamed in accordance to out conventions

Browse Source
This commit is contained in:
Andrey Breslav
2012-08-31 13:19:13 +04:00
parent 6b7a6c1cd2
commit 002f34e6f5
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/jet/codegen/ExpressionCodegen.java
+12 -12
View File
@@ -662,8 +662,8 @@ public class ExpressionCodegen extends JetVisitor<StackValue, StackValue> implem
} }
private class ForInArrayLoopGenerator extends AbstractForLoopGenerator { private class ForInArrayLoopGenerator extends AbstractForLoopGenerator {
private int myIndexVar; private int indexVar;
private int myArrayVar; private int arrayVar;
private Runnable afterLoopAction; private Runnable afterLoopAction;
private final JetType loopRangeType; private final JetType loopRangeType;
@@ -674,15 +674,15 @@ public class ExpressionCodegen extends JetVisitor<StackValue, StackValue> implem
@Override @Override
public void beforeLoop() { public void beforeLoop() {
myIndexVar = myFrameMap.enterTemp(Type.INT_TYPE); indexVar = myFrameMap.enterTemp(Type.INT_TYPE);
JetExpression loopRange = forExpression.getLoopRange(); JetExpression loopRange = forExpression.getLoopRange();
StackValue value = gen(loopRange); StackValue value = gen(loopRange);
if (value instanceof StackValue.Local) { if (value instanceof StackValue.Local) {
myArrayVar = ((StackValue.Local) value).index; arrayVar = ((StackValue.Local) value).index;
} }
else { else {
myArrayVar = myFrameMap.enterTemp(OBJECT_TYPE); arrayVar = myFrameMap.enterTemp(OBJECT_TYPE);
afterLoopAction = new Runnable() { afterLoopAction = new Runnable() {
@Override @Override
public void run() { public void run() {
@@ -691,17 +691,17 @@ public class ExpressionCodegen extends JetVisitor<StackValue, StackValue> implem
}; };
Type asmLoopRangeType = asmType(loopRangeType); Type asmLoopRangeType = asmType(loopRangeType);
value.put(asmLoopRangeType, v); value.put(asmLoopRangeType, v);
v.store(myArrayVar, OBJECT_TYPE); v.store(arrayVar, OBJECT_TYPE);
} }
v.iconst(0); v.iconst(0);
v.store(myIndexVar, Type.INT_TYPE); v.store(indexVar, Type.INT_TYPE);
} }
@Override @Override
public void conditionAndJump(@NotNull Label loopExit) { public void conditionAndJump(@NotNull Label loopExit) {
v.load(myIndexVar, Type.INT_TYPE); v.load(indexVar, Type.INT_TYPE);
v.load(myArrayVar, OBJECT_TYPE); v.load(arrayVar, OBJECT_TYPE);
v.arraylength(); v.arraylength();
v.ificmpge(loopExit); v.ificmpge(loopExit);
} }
@@ -717,8 +717,8 @@ public class ExpressionCodegen extends JetVisitor<StackValue, StackValue> implem
arrayElParamType = asmElementType; arrayElParamType = asmElementType;
} }
v.load(myArrayVar, OBJECT_TYPE); v.load(arrayVar, OBJECT_TYPE);
v.load(myIndexVar, Type.INT_TYPE); v.load(indexVar, Type.INT_TYPE);
v.aload(arrayElParamType); v.aload(arrayElParamType);
StackValue.onStack(arrayElParamType).put(asmElementType, v); StackValue.onStack(arrayElParamType).put(asmElementType, v);
v.store(parameterIndex, asmElementType); v.store(parameterIndex, asmElementType);
@@ -726,7 +726,7 @@ public class ExpressionCodegen extends JetVisitor<StackValue, StackValue> implem
@Override @Override
public void afterBody() { public void afterBody() {
v.iinc(myIndexVar, 1); v.iinc(indexVar, 1);
super.afterBody(); super.afterBody();
} }