Merge remote branch 'origin/master'

This commit is contained in:
Alex Tkachman
2011-11-24 22:33:13 +02:00
35 changed files with 333 additions and 61 deletions
@@ -162,6 +162,22 @@ public class JetTypeCheckerTest extends JetLiteFixture {
assertIntersection("Int?", "Int?", "Int?");
assertIntersection("Int", "Int?", "Int");
assertIntersection("Int", "Int", "Int?");
assertIntersection("Int", "Any", "Int");
assertIntersection("Int", "Int", "Any");
assertIntersection("Int", "Any", "Int?");
assertIntersection("Int", "Int?", "Any");
assertIntersection("Int", "Any?", "Int");
assertIntersection("Int", "Int", "Any?");
assertIntersection("Nothing", "Nothing", "Nothing");
assertIntersection("Nothing?", "Nothing?", "Nothing?");
assertIntersection("Nothing", "Nothing", "Nothing?");
assertIntersection("Nothing", "Nothing?", "Nothing");
assertIntersection("Nothing?", "String?", "Nothing?");
assertIntersection("Nothing?", "Nothing?", "String?");
}
public void testBasicSubtyping() throws Exception {