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

Minor: refactor ForInProgressionExpressionLoopGenerator initialization

Browse Source
This commit is contained in:
Dmitry Petrov
2017-07-03 17:25:24 +03:00
parent 6551fdc695
commit 83ff1a2ef3
1 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/kotlin/codegen/forLoop/ForInProgressionExpressionLoopGenerator.kt
+13 -13
View File
@@ -27,35 +27,35 @@ import org.jetbrains.org.objectweb.asm.Type
class ForInProgressionExpressionLoopGenerator(codegen: ExpressionCodegen, forExpression: KtForExpression) class ForInProgressionExpressionLoopGenerator(codegen: ExpressionCodegen, forExpression: KtForExpression)
: AbstractForInProgressionOrRangeLoopGenerator(codegen, forExpression) : AbstractForInProgressionOrRangeLoopGenerator(codegen, forExpression)
{ {
private var incrementVar: Int = 0 private val loopRangeType = bindingContext.getType(forExpression.loopRange!!)!!
private var incrementType: Type? = null private val asmLoopRangeType = codegen.asmType(loopRangeType)
private var incrementVar: Int = -1
private val incrementType: Type
init {
val incrementProp = loopRangeType.memberScope.getContributedVariables(Name.identifier("step"), NoLookupLocation.FROM_BACKEND)
assert(incrementProp.size == 1) { loopRangeType.toString() + " " + incrementProp.size }
incrementType = codegen.asmType(incrementProp.iterator().next().type)
}
override fun beforeLoop() { override fun beforeLoop() {
super.beforeLoop() super.beforeLoop()
incrementVar = createLoopTempVariable(asmElementType) incrementVar = createLoopTempVariable(asmElementType)
val loopRangeType = bindingContext.getType(forExpression.loopRange!!)!!
val asmLoopRangeType = codegen.asmType(loopRangeType)
val incrementProp = loopRangeType.memberScope.getContributedVariables(Name.identifier("step"), NoLookupLocation.FROM_BACKEND)
assert(incrementProp.size == 1) { loopRangeType.toString() + " " + incrementProp.size }
incrementType = codegen.asmType(incrementProp.iterator().next().type)
codegen.gen(forExpression.loopRange, asmLoopRangeType) codegen.gen(forExpression.loopRange, asmLoopRangeType)
v.dup() v.dup()
v.dup() v.dup()
generateRangeOrProgressionProperty(asmLoopRangeType, "getFirst", asmElementType, loopParameterType, generateRangeOrProgressionProperty(asmLoopRangeType, "getFirst", asmElementType, loopParameterType, loopParameterVar)
loopParameterVar)
generateRangeOrProgressionProperty(asmLoopRangeType, "getLast", asmElementType, asmElementType, endVar) generateRangeOrProgressionProperty(asmLoopRangeType, "getLast", asmElementType, asmElementType, endVar)
generateRangeOrProgressionProperty(asmLoopRangeType, "getStep", incrementType!!, incrementType!!, incrementVar) generateRangeOrProgressionProperty(asmLoopRangeType, "getStep", incrementType, incrementType, incrementVar)
} }
override fun checkEmptyLoop(loopExit: Label) { override fun checkEmptyLoop(loopExit: Label) {
loopParameter().put(asmElementType, v) loopParameter().put(asmElementType, v)
v.load(endVar, asmElementType) v.load(endVar, asmElementType)
v.load(incrementVar, incrementType!!) v.load(incrementVar, incrementType)
val negativeIncrement = Label() val negativeIncrement = Label()
val afterIf = Label() val afterIf = Label()