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

JS: fix tests that don't fail due to lack of support of strict mode (multiValInIntFor, multiValInIntRangeFor).

Browse Source
This commit is contained in:
Alexey Andreev
2016-09-02 14:15:37 +03:00
parent 16af7d667f
commit 7510b7f080
1 changed files with 5 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
js/js.translator/src/org/jetbrains/kotlin/js/translate/expression/LoopTranslator.kt
+5 -16
View File
@@ -102,12 +102,12 @@ fun translateForExpression(expression: KtForExpression, context: TranslationCont
val destructuringParameter: KtDestructuringDeclaration? = expression.destructuringParameter val destructuringParameter: KtDestructuringDeclaration? = expression.destructuringParameter
val loopParameter = getLoopParameter(expression) val loopParameter = getLoopParameter(expression)
val (parameterName, parameterIsTemporary) = if (loopParameter != null) { val parameterName = if (loopParameter != null) {
Pair(context.getNameForElement(loopParameter), false) context.getNameForElement(loopParameter)
} }
else { else {
assert(destructuringParameter != null) { "If loopParameter is null, multi parameter must be not null ${expression.text}" } assert(destructuringParameter != null) { "If loopParameter is null, multi parameter must be not null ${expression.text}" }
Pair(context.scope().declareTemporary(), true) context.scope().declareTemporary()
} }
fun translateBody(itemValue: JsExpression?): JsStatement? { fun translateBody(itemValue: JsExpression?): JsStatement? {
@@ -149,12 +149,7 @@ fun translateForExpression(expression: KtForExpression, context: TranslationCont
val conditionExpression = lessThanEq(parameterName.makeRef(), rangeEnd) val conditionExpression = lessThanEq(parameterName.makeRef(), rangeEnd)
val incrementExpression = JsPostfixOperation(JsUnaryOperator.INC, parameterName.makeRef()) val incrementExpression = JsPostfixOperation(JsUnaryOperator.INC, parameterName.makeRef())
return if (parameterIsTemporary) { return JsFor(newVar(parameterName, rangeStart), conditionExpression, incrementExpression, body)
JsFor(assignment(parameterName.makeRef(), rangeStart), conditionExpression, incrementExpression, body)
}
else {
JsFor(newVar(parameterName, rangeStart), conditionExpression, incrementExpression, body)
}
} }
fun translateForOverRange(): JsStatement { fun translateForOverRange(): JsStatement {
@@ -171,13 +166,7 @@ fun translateForExpression(expression: KtForExpression, context: TranslationCont
val conditionExpression = lessThanEq(parameterName.makeRef(), end) val conditionExpression = lessThanEq(parameterName.makeRef(), end)
val incrementExpression = addAssign(parameterName.makeRef(), increment) val incrementExpression = addAssign(parameterName.makeRef(), increment)
return JsFor(newVar(parameterName, start), conditionExpression, incrementExpression, body)
return if (parameterIsTemporary) {
JsFor(assignment(parameterName.makeRef(), start), conditionExpression, incrementExpression, body)
}
else {
JsFor(newVar(parameterName, start), conditionExpression, incrementExpression, body)
}
} }
fun translateForOverArray(): JsStatement { fun translateForOverArray(): JsStatement {