diff options
author | Adriaan Moors <adriaan.moors@typesafe.com> | 2013-05-17 15:34:15 -0700 |
---|---|---|
committer | Adriaan Moors <adriaan.moors@typesafe.com> | 2013-05-17 15:34:15 -0700 |
commit | 3ba3d041a8f2f27d4a2708ce9177009f33790f3d (patch) | |
tree | 8bf8abf56d0a883854824c401129118984f62489 /test | |
parent | 2a5abf7f4ca6bc5b2795381a99fd14dcb7d3aee1 (diff) | |
parent | 7f9feba0213fc210c7752ab210f900c016032699 (diff) | |
download | scala-3ba3d041a8f2f27d4a2708ce9177009f33790f3d.tar.gz scala-3ba3d041a8f2f27d4a2708ce9177009f33790f3d.tar.bz2 scala-3ba3d041a8f2f27d4a2708ce9177009f33790f3d.zip |
Merge pull request #2536 from adriaanm/ticket-7359
[backport #1727] SI-7359 cyclic nested java class
Diffstat (limited to 'test')
-rw-r--r-- | test/files/run/t6989.check | 84 | ||||
-rw-r--r-- | test/files/run/t6989/JavaClass_1.java | 2 | ||||
-rw-r--r-- | test/files/run/t7359.check | 1 | ||||
-rw-r--r-- | test/files/run/t7359/Cyclic_1.java | 3 | ||||
-rw-r--r-- | test/files/run/t7359/Test_2.scala | 6 |
5 files changed, 21 insertions, 75 deletions
diff --git a/test/files/run/t6989.check b/test/files/run/t6989.check index 3a94f6e8df..8943792115 100644 --- a/test/files/run/t6989.check +++ b/test/files/run/t6989.check @@ -113,18 +113,6 @@ isProtected = false isPublic = false privateWithin = <none> ============ -sym = class $PrivateJavaClass, signature = ClassInfoType(...), owner = class JavaClass_1 -isPrivate = true -isProtected = false -isPublic = false -privateWithin = <none> -============ -sym = value this$0, signature = foo.JavaClass_1, owner = class $PrivateJavaClass -isPrivate = false -isProtected = false -isPublic = false -privateWithin = package foo -============ sym = class $ProtectedJavaClass, signature = ClassInfoType(...), owner = class JavaClass_1 isPrivate = false isProtected = true @@ -143,18 +131,6 @@ isProtected = false isPublic = false privateWithin = package foo ============ -sym = class $ProtectedJavaClass, signature = ClassInfoType(...), owner = class JavaClass_1 -isPrivate = false -isProtected = true -isPublic = false -privateWithin = package foo -============ -sym = value this$0, signature = foo.JavaClass_1, owner = class $ProtectedJavaClass -isPrivate = false -isProtected = false -isPublic = false -privateWithin = package foo -============ sym = class $PublicJavaClass, signature = ClassInfoType(...), owner = class JavaClass_1 isPrivate = false isProtected = false @@ -179,97 +155,55 @@ isProtected = false isPublic = true privateWithin = <none> ============ -sym = class $PublicJavaClass, signature = ClassInfoType(...), owner = class JavaClass_1 -isPrivate = false -isProtected = false -isPublic = true -privateWithin = <none> -============ -sym = constructor $PublicJavaClass, signature = (x$1: foo.JavaClass_1)JavaClass_1.this.$PublicJavaClass, owner = class $PublicJavaClass +sym = constructor JavaClass_1, signature = ()foo.JavaClass_1, owner = class JavaClass_1 isPrivate = false isProtected = false isPublic = true privateWithin = <none> ============ -sym = value this$0, signature = foo.JavaClass_1, owner = class $PublicJavaClass -isPrivate = false -isProtected = false -isPublic = false -privateWithin = package foo -============ -sym = constructor JavaClass_1, signature = ()foo.JavaClass_1, owner = class JavaClass_1 +sym = object JavaClass_1, signature = foo.JavaClass_1.type, owner = package foo isPrivate = false isProtected = false isPublic = true privateWithin = <none> ============ -sym = class PrivateStaticJavaClass, signature = ClassInfoType(...), owner = class JavaClass_1 +sym = class PrivateStaticJavaClass, signature = ClassInfoType(...), owner = object JavaClass_1 isPrivate = true isProtected = false isPublic = false privateWithin = <none> ============ -sym = object PrivateStaticJavaClass, signature = JavaClass_1.this.PrivateStaticJavaClass.type, owner = class JavaClass_1 +sym = object PrivateStaticJavaClass, signature = foo.JavaClass_1.PrivateStaticJavaClass.type, owner = object JavaClass_1 isPrivate = true isProtected = false isPublic = false privateWithin = <none> ============ -sym = class ProtectedStaticJavaClass, signature = ClassInfoType(...), owner = class JavaClass_1 +sym = class ProtectedStaticJavaClass, signature = ClassInfoType(...), owner = object JavaClass_1 isPrivate = true isProtected = false isPublic = false privateWithin = <none> ============ -sym = object ProtectedStaticJavaClass, signature = JavaClass_1.this.ProtectedStaticJavaClass.type, owner = class JavaClass_1 +sym = object ProtectedStaticJavaClass, signature = foo.JavaClass_1.ProtectedStaticJavaClass.type, owner = object JavaClass_1 isPrivate = true isProtected = false isPublic = false privateWithin = <none> ============ -sym = class PublicStaticJavaClass, signature = ClassInfoType(...), owner = class JavaClass_1 -isPrivate = false -isProtected = false -isPublic = true -privateWithin = <none> -============ -sym = constructor PublicStaticJavaClass, signature = ()JavaClass_1.this.PublicStaticJavaClass, owner = class PublicStaticJavaClass -isPrivate = false -isProtected = false -isPublic = true -privateWithin = <none> -============ -sym = object PublicStaticJavaClass, signature = JavaClass_1.this.PublicStaticJavaClass.type, owner = class JavaClass_1 +sym = class PublicStaticJavaClass, signature = ClassInfoType(...), owner = object JavaClass_1 isPrivate = false isProtected = false isPublic = true privateWithin = <none> ============ -sym = object JavaClass_1, signature = foo.JavaClass_1.type, owner = package foo -isPrivate = false -isProtected = false -isPublic = true -privateWithin = <none> -============ -sym = class PrivateStaticJavaClass, signature = ClassInfoType(...), owner = class JavaClass_1 -isPrivate = true -isProtected = false -isPublic = false -privateWithin = <none> -============ -sym = class ProtectedStaticJavaClass, signature = ClassInfoType(...), owner = class JavaClass_1 -isPrivate = true -isProtected = false -isPublic = false -privateWithin = <none> -============ -sym = class PublicStaticJavaClass, signature = ClassInfoType(...), owner = class JavaClass_1 +sym = constructor PublicStaticJavaClass, signature = ()foo.JavaClass_1.PublicStaticJavaClass, owner = class PublicStaticJavaClass isPrivate = false isProtected = false isPublic = true privateWithin = <none> ============ -sym = constructor PublicStaticJavaClass, signature = ()JavaClass_1.this.PublicStaticJavaClass, owner = class PublicStaticJavaClass +sym = object PublicStaticJavaClass, signature = foo.JavaClass_1.PublicStaticJavaClass.type, owner = object JavaClass_1 isPrivate = false isProtected = false isPublic = true diff --git a/test/files/run/t6989/JavaClass_1.java b/test/files/run/t6989/JavaClass_1.java index eb26a08700..72ec4d6ab6 100644 --- a/test/files/run/t6989/JavaClass_1.java +++ b/test/files/run/t6989/JavaClass_1.java @@ -7,6 +7,8 @@ package foo; // I'm leaving the incorrect results of FromJavaClassCompleters in the check // file, so that we get notified when something changes there. +// ^^^ It's not clear what those incorrect results were, but the fix for SI-7359 +// (backport of fix for SI-6548) has probably resolved some of these. OP, please revisit this comment. class PackagePrivateJavaClass { private int privateField = 0; diff --git a/test/files/run/t7359.check b/test/files/run/t7359.check new file mode 100644 index 0000000000..9766475a41 --- /dev/null +++ b/test/files/run/t7359.check @@ -0,0 +1 @@ +ok diff --git a/test/files/run/t7359/Cyclic_1.java b/test/files/run/t7359/Cyclic_1.java new file mode 100644 index 0000000000..42b46c1aed --- /dev/null +++ b/test/files/run/t7359/Cyclic_1.java @@ -0,0 +1,3 @@ +abstract class Cyclic { + static interface Inner<T extends Inner> { } +}
\ No newline at end of file diff --git a/test/files/run/t7359/Test_2.scala b/test/files/run/t7359/Test_2.scala new file mode 100644 index 0000000000..bb6f4cb2d9 --- /dev/null +++ b/test/files/run/t7359/Test_2.scala @@ -0,0 +1,6 @@ +import scala.reflect.runtime.universe._ + +object Test extends App { + typeOf[Cyclic].members + println("ok") +}
\ No newline at end of file |