Merge remote branch 'origin/master'

Conflicts:
	idea/testData/checker/RecursiveTypeInference.jet
This commit is contained in:
Andrey Breslav
2011-12-27 15:00:33 +04:00
10 changed files with 305 additions and 20 deletions
@@ -1,19 +1,19 @@
//package a {
val afoo = abar()
fun abar() = <error descr="[TYPECHECKER_HAS_RUN_INTO_RECURSIVE_PROBLEM] Type checking has run into a recursive problem">afoo</error>
//}
fun bar() = <error descr="[TYPECHECKER_HAS_RUN_INTO_RECURSIVE_PROBLEM] Type checking has run into a recursive problem">foo</error>
}
//package b {
fun bfoo() = bbar()
fun bbar() = <error descr="[TYPECHECKER_HAS_RUN_INTO_RECURSIVE_PROBLEM] Type checking has run into a recursive problem">bfoo()</error>
//}
fun bar() = <error descr="[TYPECHECKER_HAS_RUN_INTO_RECURSIVE_PROBLEM] Type checking has run into a recursive problem">foo()</error>
}
//package c {
fun cbazz() = cbar()
fun cfoo() = <error descr="[TYPECHECKER_HAS_RUN_INTO_RECURSIVE_PROBLEM] Type checking has run into a recursive problem">cbazz()</error>
fun foo() = <error descr="[TYPECHECKER_HAS_RUN_INTO_RECURSIVE_PROBLEM] Type checking has run into a recursive problem">bazz()</error>
fun cbar() = cfoo()
//}