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

KT-402 JetFunctionLiteral visited instead of JetFunctionLiteralExpression

Browse Source
This commit is contained in:
svtk
2011-10-26 14:20:07 +04:00
parent 1d16667bd0
commit 1de766ff0d
5 changed files with 37 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/jet/lang/cfg/JetControlFlowProcessor.java
+1
View File
@@ -556,6 +556,7 @@ public class JetControlFlowProcessor {
List<JetElement> statements = bodyExpression.getStatements(); List<JetElement> statements = bodyExpression.getStatements();
generateSubroutineControlFlow(functionLiteral, statements); generateSubroutineControlFlow(functionLiteral, statements);
} }
builder.read(expression);
} }
@Override @Override
compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/LocalDeclarationInstruction.java
+1 -1
View File
@@ -39,6 +39,6 @@ public class LocalDeclarationInstruction extends ReadValueInstruction {
else if (element instanceof JetObjectDeclaration) { else if (element instanceof JetObjectDeclaration) {
kind = "o"; kind = "o";
} }
return "r" + kind + "(" + element.getText() + ")"; return "d" + kind + "(" + element.getText() + ")";
} }
} }
compiler/testData/cfg/Basic.instructions
+4 -3
View File
@@ -40,9 +40,10 @@ l0:
r(foo) NEXT:[r(foo(a, 3))] PREV:[r(3)] r(foo) NEXT:[r(foo(a, 3))] PREV:[r(3)]
r(foo(a, 3)) NEXT:[r(genfun)] PREV:[r(foo)] r(foo(a, 3)) NEXT:[r(genfun)] PREV:[r(foo)]
r(genfun) NEXT:[r(genfun<Any>())] PREV:[r(foo(a, 3))] r(genfun) NEXT:[r(genfun<Any>())] PREV:[r(foo(a, 3))]
r(genfun<Any>()) NEXT:[rf({1})] PREV:[r(genfun)] r(genfun<Any>()) NEXT:[df({1})] PREV:[r(genfun)]
rf({1}) NEXT:[r(flfun)] PREV:[r(genfun<Any>())] df({1}) NEXT:[r({1})] PREV:[r(genfun<Any>())]
r(flfun) NEXT:[r(flfun {1})] PREV:[rf({1})] r({1}) NEXT:[r(flfun)] PREV:[df({1})]
r(flfun) NEXT:[r(flfun {1})] PREV:[r({1})]
r(flfun {1}) NEXT:[r(3)] PREV:[r(flfun)] r(flfun {1}) NEXT:[r(3)] PREV:[r(flfun)]
r(3) NEXT:[r(4)] PREV:[r(flfun {1})] r(3) NEXT:[r(4)] PREV:[r(flfun {1})]
r(4) NEXT:[r(equals)] PREV:[r(3)] r(4) NEXT:[r(equals)] PREV:[r(3)]
compiler/testData/cfg/Finally.instructions
+23 -8
View File
@@ -93,14 +93,19 @@ fun t3() {
l0: l0:
<START> NEXT:[jmp?(l2)] PREV:[] <START> NEXT:[jmp?(l2)] PREV:[]
jmp?(l2) NEXT:[r(2), r(1)] PREV:[<START>] jmp?(l2) NEXT:[r(2), r(1)] PREV:[<START>]
r(1) NEXT:[rf({ () => if (2 > 3) { retu..)] PREV:[jmp?(l2)] r(1) NEXT:[df({ () => if (2 > 3) { retu..)] PREV:[jmp?(l2)]
rf({ () => df({ () =>
if (2 > 3) { if (2 > 3) {
return@ return@
} }
}) NEXT:[r(2)] PREV:[r(1)] }) NEXT:[r({ () => if (2 > 3) { retur..)] PREV:[r(1)]
r({ () =>
if (2 > 3) {
return@
}
}) NEXT:[r(2)] PREV:[df({ () => if (2 > 3) { retu..)]
l2: l2:
r(2) NEXT:[<END>] PREV:[jmp?(l2), rf({ () => if (2 > 3) { retu..)] r(2) NEXT:[<END>] PREV:[jmp?(l2), r({ () => if (2 > 3) { retur..)]
l1: l1:
<END> NEXT:[] PREV:[r(2)] <END> NEXT:[] PREV:[r(2)]
error: error:
@@ -171,8 +176,8 @@ fun t3() {
} }
--------------------- ---------------------
l0: l0:
<START> NEXT:[rf({ () => try { 1 if (2 > 3..)] PREV:[] <START> NEXT:[df({ () => try { 1 if (2 > 3..)] PREV:[]
rf({ () => df({ () =>
try { try {
1 1
if (2 > 3) { if (2 > 3) {
@@ -181,9 +186,19 @@ l0:
} finally { } finally {
2 2
} }
}) NEXT:[<END>] PREV:[<START>] }) NEXT:[r({ () => try { 1 if (2 > 3)..)] PREV:[<START>]
r({ () =>
try {
1
if (2 > 3) {
return@
}
} finally {
2
}
}) NEXT:[<END>] PREV:[df({ () => try { 1 if (2 > 3..)]
l1: l1:
<END> NEXT:[] PREV:[rf({ () => try { 1 if (2 > 3..)] <END> NEXT:[] PREV:[r({ () => try { 1 if (2 > 3)..)]
error: error:
<ERROR> NEXT:[] PREV:[] <ERROR> NEXT:[] PREV:[]
l2: l2:
compiler/testData/checkerWithErrorTypes/full/regression/kt402.jet
+8
View File
@@ -0,0 +1,8 @@
namespace kt402
fun getTypeChecker() : fun(Any):Boolean {
<!NO_RETURN_IN_FUNCTION_WITH_BLOCK_BODY!>{ (a : Any) => a is <!UNRESOLVED_REFERENCE!>T<!> }<!> // reports unsupported
}
fun f() : fun(Any) : Boolean {
return { (a : Any) => a is String }
}