diff options
| author | Adriaan Moors <adriaan.moors@typesafe.com> | 2014-11-17 12:41:01 +0100 |
|---|---|---|
| committer | Adriaan Moors <adriaan.moors@typesafe.com> | 2014-11-17 12:41:01 +0100 |
| commit | b9c89cc28409e8a516b9f67350010a4203678db5 (patch) | |
| tree | 1e99916e8305d3297ed92dcf14b40cdf033d71c5 | |
| parent | ebf16c7ef273206223674b3c72cd7a24a14bfa65 (diff) | |
| parent | 3a4d4dbd366490b5bcbbd6091eb5947a23655600 (diff) | |
| download | scala-b9c89cc28409e8a516b9f67350010a4203678db5.tar.gz scala-b9c89cc28409e8a516b9f67350010a4203678db5.tar.bz2 scala-b9c89cc28409e8a516b9f67350010a4203678db5.zip | |
Merge pull request #4117 from retronym/ticket/8449
SI-8449 Fix spurious error with Java raw type over a Scala class
| -rw-r--r-- | src/compiler/scala/tools/nsc/typechecker/Typers.scala | 4 | ||||
| -rw-r--r-- | test/files/t8449/Client.scala | 3 | ||||
| -rw-r--r-- | test/files/t8449/Test.java | 10 |
3 files changed, 15 insertions, 2 deletions
diff --git a/src/compiler/scala/tools/nsc/typechecker/Typers.scala b/src/compiler/scala/tools/nsc/typechecker/Typers.scala index 680cd22dd3..4d9a6a47ef 100644 --- a/src/compiler/scala/tools/nsc/typechecker/Typers.scala +++ b/src/compiler/scala/tools/nsc/typechecker/Typers.scala @@ -870,13 +870,13 @@ trait Typers extends Adaptations with Tags with TypersTracking with PatternTyper def adaptType(): Tree = { // @M When not typing a type constructor (!context.inTypeConstructorAllowed) - // or raw type (tree.symbol.isJavaDefined && context.unit.isJava), types must be of kind *, + // or raw type, types must be of kind *, // and thus parameterized types must be applied to their type arguments // @M TODO: why do kind-* tree's have symbols, while higher-kinded ones don't? def properTypeRequired = ( tree.hasSymbolField && !context.inTypeConstructorAllowed - && !(tree.symbol.isJavaDefined && context.unit.isJava) + && !context.unit.isJava ) // @M: don't check tree.tpe.symbol.typeParams. check tree.tpe.typeParams!!! // (e.g., m[Int] --> tree.tpe.symbol.typeParams.length == 1, tree.tpe.typeParams.length == 0!) diff --git a/test/files/t8449/Client.scala b/test/files/t8449/Client.scala new file mode 100644 index 0000000000..5d273f06b2 --- /dev/null +++ b/test/files/t8449/Client.scala @@ -0,0 +1,3 @@ +object Client { + def foo: Any = new Test().foo +} diff --git a/test/files/t8449/Test.java b/test/files/t8449/Test.java new file mode 100644 index 0000000000..ecb1711b24 --- /dev/null +++ b/test/files/t8449/Test.java @@ -0,0 +1,10 @@ +public class Test { + // Raw type over a Scala type constructor + public scala.Function1 foo() { return null; } + // scalac reported: + // % scalac-hash v2.11.2 -d /tmp sandbox/{Test.java,Client.scala} + // sandbox/Test.java:2: error: trait Function1 takes type parameters + // public scala.Function1 foo() { return null; } + // ^ + // one error found +} |