From da09331324d302d0b85a89cdcfe32ded2587b39a Mon Sep 17 00:00:00 2001 From: Eugene Burmako Date: Thu, 30 Jan 2014 00:58:26 +0300 Subject: SI-6732 deprecates internal#Symbol.isPackage This is the first step in disentangling api#Symbol.isPackage, which is supposed to return false for package classes, and internal#Symbol.isPackage, which has traditionally being used as a synonym for hasPackageFlag and hence returned true for package classes (unlike isModule which is false for module classes). --- test/files/run/reflection-companiontype.check | 12 ++++++------ test/files/run/showraw_tree_ultimate.check | 20 ++++++++++---------- test/files/run/t6732.check | 4 ++++ test/files/run/t6732.scala | 12 ++++++++++++ 4 files changed, 32 insertions(+), 16 deletions(-) create mode 100644 test/files/run/t6732.check create mode 100644 test/files/run/t6732.scala (limited to 'test') diff --git a/test/files/run/reflection-companiontype.check b/test/files/run/reflection-companiontype.check index e25605618f..f87bc04480 100644 --- a/test/files/run/reflection-companiontype.check +++ b/test/files/run/reflection-companiontype.check @@ -1,11 +1,11 @@ TypeRefs -TypeRef(ThisType(#PK), C#MODC, List()) -TypeRef(ThisType(#PK), C#CLS, List()) -TypeRef(ThisType(#PK), C#CLS, List()) +TypeRef(ThisType(#PKC), C#MODC, List()) +TypeRef(ThisType(#PKC), C#CLS, List()) +TypeRef(ThisType(#PKC), C#CLS, List()) ClassInfoTypes -TypeRef(ThisType(#PK), C#MODC, List()) -TypeRef(ThisType(#PK), C#CLS, List()) -TypeRef(ThisType(#PK), C#CLS, List()) +TypeRef(ThisType(#PKC), C#MODC, List()) +TypeRef(ThisType(#PKC), C#CLS, List()) +TypeRef(ThisType(#PKC), C#CLS, List()) Unrelated NoType NoType diff --git a/test/files/run/showraw_tree_ultimate.check b/test/files/run/showraw_tree_ultimate.check index 63f72de50b..ea64d5a7d2 100644 --- a/test/files/run/showraw_tree_ultimate.check +++ b/test/files/run/showraw_tree_ultimate.check @@ -1,12 +1,12 @@ Apply[1](Select[2](New[1](TypeTree[1]().setOriginal(AppliedTypeTree(Ident[3](scala.collection.immutable.HashMap##CLS), List(TypeTree[4]().setOriginal(Select[4](Ident[5](scala.Predef##MOD), TypeName("String")##TPE)), TypeTree[4]().setOriginal(Select[4](Ident[5](scala.Predef##MOD), TypeName("String")##TPE)))))), nme.CONSTRUCTOR##PCTOR), List()) -[1] TypeRef(ThisType(scala.collection.immutable##PK), scala.collection.immutable.HashMap##CLS, List(TypeRef(SingleType(ThisType(scala##PK), scala.Predef##MOD), TypeName("String")##TPE, List()), TypeRef(SingleType(ThisType(scala##PK), scala.Predef##MOD), TypeName("String")##TPE, List()))) -[2] MethodType(List(), TypeRef(ThisType(scala.collection.immutable##PK), scala.collection.immutable.HashMap##CLS, List(TypeRef(SingleType(ThisType(scala##PK), scala.Predef##MOD), TypeName("String")##TPE, List()), TypeRef(SingleType(ThisType(scala##PK), scala.Predef##MOD), TypeName("String")##TPE, List())))) -[3] TypeRef(ThisType(scala.collection.immutable##PK), scala.collection.immutable.HashMap##CLS, List()) -[4] TypeRef(SingleType(ThisType(scala##PK), scala.Predef##MOD), TypeName("String")##TPE, List()) -[5] SingleType(ThisType(scala##PK), scala.Predef##MOD) +[1] TypeRef(ThisType(scala.collection.immutable##PKC), scala.collection.immutable.HashMap##CLS, List(TypeRef(SingleType(ThisType(scala##PKC), scala.Predef##MOD), TypeName("String")##TPE, List()), TypeRef(SingleType(ThisType(scala##PKC), scala.Predef##MOD), TypeName("String")##TPE, List()))) +[2] MethodType(List(), TypeRef(ThisType(scala.collection.immutable##PKC), scala.collection.immutable.HashMap##CLS, List(TypeRef(SingleType(ThisType(scala##PKC), scala.Predef##MOD), TypeName("String")##TPE, List()), TypeRef(SingleType(ThisType(scala##PKC), scala.Predef##MOD), TypeName("String")##TPE, List())))) +[3] TypeRef(ThisType(scala.collection.immutable##PKC), scala.collection.immutable.HashMap##CLS, List()) +[4] TypeRef(SingleType(ThisType(scala##PKC), scala.Predef##MOD), TypeName("String")##TPE, List()) +[5] SingleType(ThisType(scala##PKC), scala.Predef##MOD) Apply[6](Select[7](New[6](TypeTree[6]().setOriginal(AppliedTypeTree(Ident[8](scala.collection.mutable.HashMap##CLS), List(TypeTree[4]().setOriginal(Select[4](Ident[5](scala.Predef##MOD), TypeName("String")##TPE)), TypeTree[4]().setOriginal(Select[4](Ident[5](scala.Predef##MOD), TypeName("String")##TPE)))))), nme.CONSTRUCTOR##CTOR), List()) -[4] TypeRef(SingleType(ThisType(scala##PK), scala.Predef##MOD), TypeName("String")##TPE, List()) -[5] SingleType(ThisType(scala##PK), scala.Predef##MOD) -[6] TypeRef(ThisType(scala.collection.mutable##PK), scala.collection.mutable.HashMap##CLS, List(TypeRef(SingleType(ThisType(scala##PK), scala.Predef##MOD), TypeName("String")##TPE, List()), TypeRef(SingleType(ThisType(scala##PK), scala.Predef##MOD), TypeName("String")##TPE, List()))) -[7] MethodType(List(), TypeRef(ThisType(scala.collection.mutable##PK), scala.collection.mutable.HashMap##CLS, List(TypeRef(SingleType(ThisType(scala##PK), scala.Predef##MOD), TypeName("String")##TPE, List()), TypeRef(SingleType(ThisType(scala##PK), scala.Predef##MOD), TypeName("String")##TPE, List())))) -[8] TypeRef(ThisType(scala.collection.mutable##PK), scala.collection.mutable.HashMap##CLS, List()) +[4] TypeRef(SingleType(ThisType(scala##PKC), scala.Predef##MOD), TypeName("String")##TPE, List()) +[5] SingleType(ThisType(scala##PKC), scala.Predef##MOD) +[6] TypeRef(ThisType(scala.collection.mutable##PKC), scala.collection.mutable.HashMap##CLS, List(TypeRef(SingleType(ThisType(scala##PKC), scala.Predef##MOD), TypeName("String")##TPE, List()), TypeRef(SingleType(ThisType(scala##PKC), scala.Predef##MOD), TypeName("String")##TPE, List()))) +[7] MethodType(List(), TypeRef(ThisType(scala.collection.mutable##PKC), scala.collection.mutable.HashMap##CLS, List(TypeRef(SingleType(ThisType(scala##PKC), scala.Predef##MOD), TypeName("String")##TPE, List()), TypeRef(SingleType(ThisType(scala##PKC), scala.Predef##MOD), TypeName("String")##TPE, List())))) +[8] TypeRef(ThisType(scala.collection.mutable##PKC), scala.collection.mutable.HashMap##CLS, List()) diff --git a/test/files/run/t6732.check b/test/files/run/t6732.check new file mode 100644 index 0000000000..016c6e50c0 --- /dev/null +++ b/test/files/run/t6732.check @@ -0,0 +1,4 @@ +scala#PK: true, false, true, false +scala#PKC: false, true, true, true +scala.collection.immutable.List#MOD: true, false, false, false +scala.collection.immutable.List#MODC: false, true, false, false diff --git a/test/files/run/t6732.scala b/test/files/run/t6732.scala new file mode 100644 index 0000000000..fdc1ab04e6 --- /dev/null +++ b/test/files/run/t6732.scala @@ -0,0 +1,12 @@ +import scala.reflect.runtime.universe._ +import definitions._ + +object Test extends App { + def test(sym: Symbol): Unit = { + println(s"${showRaw(sym, printKinds = true)}: ${sym.isModule}, ${sym.isModuleClass}, ${sym.isPackage}, ${sym.isPackageClass}") + } + test(ScalaPackage) + test(ScalaPackageClass) + test(ListModule) + test(ListModule.moduleClass) +} \ No newline at end of file -- cgit v1.2.3