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

Pseudocode: Implement computation of expected type predicates

Browse Source
This commit is contained in:
Alexey Sedunov
2014-06-23 14:02:22 +04:00
parent 50228fa085
commit 5e2c2b4eca
87 changed files with 1154 additions and 803 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests/org/jetbrains/jet/cfg/AbstractPseudoValueTest.kt
+13 -2
View File
@@ -22,9 +22,15 @@ import org.jetbrains.jet.lang.psi.JetElement
import org.jetbrains.jet.lang.psi.JetTreeVisitorVoid
import org.jetbrains.jet.lang.resolve.BindingContext
import java.util.*
import org.jetbrains.jet.lang.cfg.pseudocode.collectValueUsages
import org.jetbrains.jet.lang.cfg.pseudocode.TypePredicate
import org.jetbrains.jet.lang.cfg.pseudocode.getExpectedTypePredicate
public abstract class AbstractPseudoValueTest : AbstractPseudocodeTest() {
override fun dumpInstructions(pseudocode: PseudocodeImpl, out: StringBuilder, bindingContext: BindingContext) {
val valueUsageMap = pseudocode.collectValueUsages()
val expectedTypePredicateMap = HashMap<PseudoValue, TypePredicate>()
fun getElementToValueMap(pseudocode: PseudocodeImpl): Map<JetElement, PseudoValue> {
val elementToValues = LinkedHashMap<JetElement, PseudoValue>()
pseudocode.getCorrespondingElement().accept(object : JetTreeVisitorVoid() {
@@ -44,6 +50,11 @@ public abstract class AbstractPseudoValueTest : AbstractPseudocodeTest() {
fun elementText(element: JetElement): String = element.getText()!!.replaceAll("\\s+", " ")
fun valueDecl(value: PseudoValue): String {
val typePredicate = expectedTypePredicateMap.getOrPut(value) { getExpectedTypePredicate(value, valueUsageMap, bindingContext) }
return "${value.debugName}: $typePredicate"
}
fun valueDescription(element: JetElement, value: PseudoValue): String {
return if (value.element != element) "COPY" else "NEW${value.createdAt.inputValues.makeString(", ", "(", ")")}"
}
@@ -52,14 +63,14 @@ public abstract class AbstractPseudoValueTest : AbstractPseudocodeTest() {
if (elementToValues.isEmpty()) return
val elementColumnWidth = elementToValues.keySet().map { elementText(it).length() }.max()!!
val valueColumnWidth = elementToValues.values().map { it.debugName.length() }.max()!!
val valueColumnWidth = elementToValues.values().map { valueDecl(it).length() }.max()!!
val valueDescColumnWidth = elementToValues.entrySet().map { valueDescription(it.key, it.value).length }.max()!!
for ((element, value) in elementToValues.entrySet()) {
out
.append("%1$-${elementColumnWidth}s".format(elementText(element)))
.append(" ")
.append("%1$-${valueColumnWidth}s".format(value.debugName))
.append("%1$-${valueColumnWidth}s".format(valueDecl(value)))
.append(" ")
.append("%1$-${valueDescColumnWidth}s".format(valueDescription(element, value)))
.append("\n")
compiler/tests/org/jetbrains/jet/cfg/ControlFlowTestGenerated.java
+5
View File
@@ -155,6 +155,11 @@ public class ControlFlowTestGenerated extends AbstractControlFlowTest {
JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("compiler/testData/cfg/conventions"), Pattern.compile("^(.+)\\.kt$"), true);
}
@TestMetadata("bothReceivers.kt")
public void testBothReceivers() throws Exception {
doTest("compiler/testData/cfg/conventions/bothReceivers.kt");
}
@TestMetadata("equals.kt")
public void testEquals() throws Exception {
doTest("compiler/testData/cfg/conventions/equals.kt");
compiler/tests/org/jetbrains/jet/cfg/PseudoValueTestGenerated.java
+5
View File
@@ -157,6 +157,11 @@ public class PseudoValueTestGenerated extends AbstractPseudoValueTest {
JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("compiler/testData/cfg/conventions"), Pattern.compile("^(.+)\\.kt$"), true);
}
@TestMetadata("bothReceivers.kt")
public void testBothReceivers() throws Exception {
doTest("compiler/testData/cfg/conventions/bothReceivers.kt");
}
@TestMetadata("equals.kt")
public void testEquals() throws Exception {
doTest("compiler/testData/cfg/conventions/equals.kt");