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

Multi-decl for loops fixed

Browse Source
This commit is contained in:
Andrey Breslav
2012-08-23 19:45:50 +04:00
parent cab263d7d1
commit edbc832861
7 changed files with 137 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/jet/codegen/ExpressionCodegen.java
-2
View File
@@ -500,8 +500,6 @@ public class ExpressionCodegen extends JetVisitor<StackValue, StackValue> {
private void generateMultiVariables(int tmpParameterIndex, List<JetMultiDeclarationEntry> entries) {
Type asmElementType = asmType(getElementType());
for (JetMultiDeclarationEntry variableDeclaration : entries) {
v.load(tmpParameterIndex, asmElementType);
final VariableDescriptor componentDescriptor = bindingContext.get(BindingContext.VARIABLE, variableDeclaration);
final Type componentAsmType = asmType(componentDescriptor.getReturnType());
compiler/testData/codegen/multiDecl/MultiDeclFor.kt
+21
View File
@@ -0,0 +1,21 @@
class C(val i: Int) {
fun component1() = i + 1
fun component2() = i + 2
}
fun doTest(l : java.util.ArrayList<C>): String {
var s = ""
for ((a, b) in l) {
s += "$a:$b;"
}
return s
}
fun box(): String {
val l = java.util.ArrayList<C>()
l.add(C(0))
l.add(C(1))
l.add(C(2))
val s = doTest(l)
return if (s == "1:2;2:3;3:4;") "OK" else "fail: $s"
}
compiler/testData/codegen/multiDecl/MultiDeclForComponentExtensions.kt
+22
View File
@@ -0,0 +1,22 @@
class C(val i: Int) {
}
fun C.component1() = i + 1
fun C.component2() = i + 2
fun doTest(l : java.util.ArrayList<C>): String {
var s = ""
for ((a, b) in l) {
s += "$a:$b;"
}
return s
}
fun box(): String {
val l = java.util.ArrayList<C>()
l.add(C(0))
l.add(C(1))
l.add(C(2))
val s = doTest(l)
return if (s == "1:2;2:3;3:4;") "OK" else "fail: $s"
}
compiler/testData/codegen/multiDecl/MultiDeclForComponentMemberExtensions.kt
+24
View File
@@ -0,0 +1,24 @@
class C(val i: Int) {
}
class M {
fun C.component1() = i + 1
fun C.component2() = i + 2
fun doTest(l : java.util.ArrayList<C>): String {
var s = ""
for ((a, b) in l) {
s += "$a:$b;"
}
return s
}
}
fun box(): String {
val l = java.util.ArrayList<C>()
l.add(C(0))
l.add(C(1))
l.add(C(2))
val s = M().doTest(l)
return if (s == "1:2;2:3;3:4;") "OK" else "fail: $s"
}
compiler/testData/codegen/multiDecl/MultiDeclForComponentMemberExtensionsInExtensionFunction.kt
+24
View File
@@ -0,0 +1,24 @@
class C(val i: Int) {
}
class M {
fun C.component1() = i + 1
fun C.component2() = i + 2
}
fun M.doTest(l : java.util.ArrayList<C>): String {
var s = ""
for ((a, b) in l) {
s += "$a:$b;"
}
return s
}
fun box(): String {
val l = java.util.ArrayList<C>()
l.add(C(0))
l.add(C(1))
l.add(C(2))
val s = M().doTest(l)
return if (s == "1:2;2:3;3:4;") "OK" else "fail: $s"
}
compiler/testData/codegen/multiDecl/MultiDeclForValCaptured.kt
+21
View File
@@ -0,0 +1,21 @@
class C(val i: Int) {
fun component1() = i + 1
fun component2() = i + 2
}
fun doTest(l : java.util.ArrayList<C>): String {
var s = ""
for ((a, b) in l) {
s += {"$a:$b;"}()
}
return s
}
fun box(): String {
val l = java.util.ArrayList<C>()
l.add(C(0))
l.add(C(1))
l.add(C(2))
val s = doTest(l)
return if (s == "1:2;2:3;3:4;") "OK" else "fail: $s"
}
compiler/tests/org/jetbrains/jet/codegen/MultiDeclTestGenerated.java
+25
View File
@@ -37,6 +37,31 @@ public class MultiDeclTestGenerated extends AbstractMultiDeclTestCase {
blackBoxFileByFullPath("compiler/testData/codegen/multiDecl/ComplexInitializer.kt");
}
@TestMetadata("MultiDeclFor.kt")
public void testMultiDeclFor() throws Exception {
blackBoxFileByFullPath("compiler/testData/codegen/multiDecl/MultiDeclFor.kt");
}
@TestMetadata("MultiDeclForComponentExtensions.kt")
public void testMultiDeclForComponentExtensions() throws Exception {
blackBoxFileByFullPath("compiler/testData/codegen/multiDecl/MultiDeclForComponentExtensions.kt");
}
@TestMetadata("MultiDeclForComponentMemberExtensions.kt")
public void testMultiDeclForComponentMemberExtensions() throws Exception {
blackBoxFileByFullPath("compiler/testData/codegen/multiDecl/MultiDeclForComponentMemberExtensions.kt");
}
@TestMetadata("MultiDeclForComponentMemberExtensionsInExtensionFunction.kt")
public void testMultiDeclForComponentMemberExtensionsInExtensionFunction() throws Exception {
blackBoxFileByFullPath("compiler/testData/codegen/multiDecl/MultiDeclForComponentMemberExtensionsInExtensionFunction.kt");
}
@TestMetadata("MultiDeclForValCaptured.kt")
public void testMultiDeclForValCaptured() throws Exception {
blackBoxFileByFullPath("compiler/testData/codegen/multiDecl/MultiDeclForValCaptured.kt");
}
@TestMetadata("SimpleVals.kt")
public void testSimpleVals() throws Exception {
blackBoxFileByFullPath("compiler/testData/codegen/multiDecl/SimpleVals.kt");