From 4316f9440312947ffbc83a0c3c19053f4393bc1a Mon Sep 17 00:00:00 2001 From: Ondrej Lhotak Date: Mon, 2 Feb 2015 09:59:15 +0100 Subject: Java methods: JavaMethodType instead of MethodType, convert Object to Any Fixes two bugs needed for java-override test: Namer was creating a MethodType instead of a JavaMethodType even though the JavaDefined flag was set on the DefDef. Following Scalac, Namer needs to convert Java method parameters of type j.l.Object to s.Any. --- test/dotc/tests.scala | 1 + 1 file changed, 1 insertion(+) (limited to 'test/dotc/tests.scala') diff --git a/test/dotc/tests.scala b/test/dotc/tests.scala index 21fdd555b..524f3ce12 100644 --- a/test/dotc/tests.scala +++ b/test/dotc/tests.scala @@ -57,6 +57,7 @@ class tests extends CompilerTest { @Test def pos_packageobject() = compileFile(posDir, "packageobject") @Test def pos_overloaded() = compileFile(posDir, "overloaded") @Test def pos_overrides() = compileFile(posDir, "overrides") + @Test def pos_javaOverride() = compileDir(posDir + "java-override") @Test def pos_templateParents() = compileFile(posDir, "templateParents") @Test def pos_structural() = compileFile(posDir, "structural") @Test def pos_overloadedAccess = compileFile(posDir, "overloadedAccess") -- cgit v1.2.3