Merge remote branch 'origin/master'

compiler/testData/checkerWithErrorTypes/full/Casts.jet

@@ -1,3 +1,5 @@
+// -JDK
+
 fun test() : Unit {
   var x : Int? = 0
   var y : Int = 0
@@ -13,4 +15,4 @@ fun test() : Unit {
   x <!USELESS_CAST!>as?<!> Int? : Int?
   y <!USELESS_CAST_STATIC_ASSERT_IS_FINE!>as?<!> Int? : Int?
   ()
-}
+}

compiler/testData/checkerWithErrorTypes/full/RecursiveTypeInference.jet

@@ -5,15 +5,15 @@ namespace a {
 }
 
 namespace b {
-    fun foo() = <!TYPECHECKER_HAS_RUN_INTO_RECURSIVE_PROBLEM!>bar()<!>
+    fun foo() = bar()
 
-    fun bar() = foo()
+    fun bar() = <!TYPECHECKER_HAS_RUN_INTO_RECURSIVE_PROBLEM!>foo()<!>
 }
 
 namespace c {
-    fun bazz() = <!TYPECHECKER_HAS_RUN_INTO_RECURSIVE_PROBLEM!>bar()<!>
+    fun bazz() = bar()
 
-    fun foo() = bazz()
+    fun foo() = <!TYPECHECKER_HAS_RUN_INTO_RECURSIVE_PROBLEM!>bazz()<!>
 
     fun bar() = foo()
 }
@@ -39,4 +39,4 @@ namespace ok {
 
         fun bar() = foo()
     }
-}
+}

compiler/testData/checkerWithErrorTypes/full/cast/AsErasedError.jet

@@ -0,0 +1,4 @@
+import java.util.List;
+import java.util.Collection;
+
+fun ff(c: Collection<String>) = c <!CAST_NEVER_SUCCEEDS!>as<!> List<Int>

compiler/testData/checkerWithErrorTypes/full/cast/AsErasedFine.jet

@@ -0,0 +1,4 @@
+import java.util.List;
+import java.util.Collection;
+
+fun ff(c: Collection<String>) = c as List<String>

compiler/testData/checkerWithErrorTypes/full/cast/AsErasedStar.jet

@@ -0,0 +1,4 @@
+import java.util.List;
+
+fun ff(l: Any) = l as List<*>
+

compiler/testData/checkerWithErrorTypes/full/cast/AsErasedWarning.jet

@@ -0,0 +1,3 @@
+import java.util.List;
+
+fun ff(a: Any) = <!UNCHECKED_CAST!>a as List<String><!>

compiler/testData/checkerWithErrorTypes/full/cast/IsErasedAllow.jet

@@ -0,0 +1,5 @@
+import java.util.Collection;
+import java.util.List;
+
+fun ff(l: Collection<String>) = l is List<String>
+

compiler/testData/checkerWithErrorTypes/full/cast/IsErasedAllowParameterSubtype.jet

@@ -0,0 +1,9 @@
+import java.util.Collection;
+import java.util.List;
+
+open class A
+
+class B : A
+
+fun ff(l: Collection<B>) = l is List<out A>
+

compiler/testData/checkerWithErrorTypes/full/cast/IsErasedDisallowFromAny.jet

@@ -0,0 +1,3 @@
+import java.util.List;
+
+fun ff(l: Any) = l is <!CANNOT_CHECK_FOR_ERASED!>List<String><!>

compiler/testData/checkerWithErrorTypes/full/cast/IsErasedDisallowFromParameter.jet

@@ -0,0 +1,5 @@
+import java.util.List;
+import java.util.Collection;
+
+fun ff(l: Collection<Int>) = l is <!INCOMPATIBLE_TYPES!>List<String><!>
+

compiler/testData/checkerWithErrorTypes/full/cast/IsErasedStar.jet

@@ -0,0 +1,3 @@
+import java.util.List;
+
+fun ff(l: Any) = l is List<*>

compiler/testData/checkerWithErrorTypes/full/cast/IsReified.jet

@@ -0,0 +1,3 @@
+class MyList<T>
+
+fun ff(a: Any) = a is MyList<String>

compiler/testData/checkerWithErrorTypes/full/cast/IsReifiedDisallow.jet

@@ -0,0 +1,3 @@
+class MyList<A>
+
+fun ff(l: MyList<String>) = l is <!INCOMPATIBLE_TYPES!>MyList<Int><!>

compiler/testData/checkerWithErrorTypes/full/cast/IsTraits.jet

@@ -0,0 +1,4 @@
+trait Aaa
+trait Bbb
+
+fun f(a: Aaa) = a is Bbb

compiler/testData/checkerWithErrorTypes/full/cast/WhenErasedDisallowFromAny.jet

@@ -0,0 +1,6 @@
+import java.util.List;
+
+fun ff(l: Any) = when(l) {
+    is <!CANNOT_CHECK_FOR_ERASED!>List<String><!> => 1
+    else 2
+}

compiler/testData/checkerWithErrorTypes/quick/regressions/kt328.jet

@@ -0,0 +1,3 @@
+fun bar() = {
+    <!TYPECHECKER_HAS_RUN_INTO_RECURSIVE_PROBLEM!>bar()<!>
+}

compiler/testData/checkerWithErrorTypes/quick/regressions/kt328Complex.jet

@@ -0,0 +1,3 @@
+fun bar() = {
+    fun foo() = <!TYPECHECKER_HAS_RUN_INTO_RECURSIVE_PROBLEM!>bar()<!>
+}

compiler/testData/checkerWithErrorTypes/quick/regressions/kt328DuplicatedByKt329.jet

@@ -0,0 +1,7 @@
+// http://youtrack.jetbrains.net/issue/KT-329
+
+fun block(f : fun() : Unit) = f()
+
+fun bar() = block{ <!UNRESOLVED_REFERENCE!>foo<!>() // <-- missing closing curly bracket
+fun foo() = block{ <!TYPECHECKER_HAS_RUN_INTO_RECURSIVE_PROBLEM!>bar()<!> }
+

compiler/testData/codegen/patternMatching/is.jet

@@ -1,6 +1,6 @@
 fun typeName(a: Any?) : String {
     return when(a) {
-        is java.util.ArrayList<Int> => "array list"
+        is java.util.ArrayList<*> => "array list"
         else => "no idea"
     }
 }
@@ -8,4 +8,4 @@ fun typeName(a: Any?) : String {
 fun box() : String {
     if(typeName(java.util.ArrayList<Int> ()) != "array list") return "array list failed"
     return "OK"
-}
+}