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

Control-Flow: Fix pseudocode generation for combined get/set and invoke conventions

Browse Source 
#KT-4462 Fixed
 #KT-4681 Fixed
This commit is contained in:
Alexey Sedunov
2015-05-19 15:09:03 +03:00
parent fa29e75add
commit 868329e3cb
15 changed files with 706 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests/org/jetbrains/kotlin/cfg/ControlFlowTestGenerated.java
+24
View File
@@ -247,12 +247,30 @@ public class ControlFlowTestGenerated extends AbstractControlFlowTest {
doTest(fileName);
}
@TestMetadata("complexAssignmentWithGetSetViaVar.kt")
public void testComplexAssignmentWithGetSetViaVar() throws Exception {
String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/conventions/complexAssignmentWithGetSetViaVar.kt");
doTest(fileName);
}
@TestMetadata("complexAssignmentWithSetViaVar.kt")
public void testComplexAssignmentWithSetViaVar() throws Exception {
String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/conventions/complexAssignmentWithSetViaVar.kt");
doTest(fileName);
}
@TestMetadata("equals.kt")
public void testEquals() throws Exception {
String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/conventions/equals.kt");
doTest(fileName);
}
@TestMetadata("getViaVar.kt")
public void testGetViaVar() throws Exception {
String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/conventions/getViaVar.kt");
doTest(fileName);
}
@TestMetadata("incrementAtTheEnd.kt")
public void testIncrementAtTheEnd() throws Exception {
String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/conventions/incrementAtTheEnd.kt");
@@ -270,6 +288,12 @@ public class ControlFlowTestGenerated extends AbstractControlFlowTest {
String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/conventions/notEqual.kt");
doTest(fileName);
}
@TestMetadata("setViaVar.kt")
public void testSetViaVar() throws Exception {
String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/conventions/setViaVar.kt");
doTest(fileName);
}
}
@TestMetadata("compiler/testData/cfg/deadCode")
compiler/tests/org/jetbrains/kotlin/cfg/PseudoValueTestGenerated.java
+24
View File
@@ -249,12 +249,30 @@ public class PseudoValueTestGenerated extends AbstractPseudoValueTest {
doTest(fileName);
}
@TestMetadata("complexAssignmentWithGetSetViaVar.kt")
public void testComplexAssignmentWithGetSetViaVar() throws Exception {
String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/conventions/complexAssignmentWithGetSetViaVar.kt");
doTest(fileName);
}
@TestMetadata("complexAssignmentWithSetViaVar.kt")
public void testComplexAssignmentWithSetViaVar() throws Exception {
String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/conventions/complexAssignmentWithSetViaVar.kt");
doTest(fileName);
}
@TestMetadata("equals.kt")
public void testEquals() throws Exception {
String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/conventions/equals.kt");
doTest(fileName);
}
@TestMetadata("getViaVar.kt")
public void testGetViaVar() throws Exception {
String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/conventions/getViaVar.kt");
doTest(fileName);
}
@TestMetadata("incrementAtTheEnd.kt")
public void testIncrementAtTheEnd() throws Exception {
String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/conventions/incrementAtTheEnd.kt");
@@ -272,6 +290,12 @@ public class PseudoValueTestGenerated extends AbstractPseudoValueTest {
String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/conventions/notEqual.kt");
doTest(fileName);
}
@TestMetadata("setViaVar.kt")
public void testSetViaVar() throws Exception {
String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/conventions/setViaVar.kt");
doTest(fileName);
}
}
@TestMetadata("compiler/testData/cfg/deadCode")