diff options
author | Dmitry Petrashko <dark@d-d.me> | 2015-05-24 17:03:28 +0200 |
---|---|---|
committer | Dmitry Petrashko <dark@d-d.me> | 2015-05-24 17:03:28 +0200 |
commit | 818afa813d12bec63c5d1bb8604e60b1672c6996 (patch) | |
tree | ce9b89b64f8761f59783d0a5e3a836e3e19809d7 | |
parent | 14051fb457a3a9a9f80cd37ca97fff196f6fccb4 (diff) | |
parent | e61e59f739d889549993afdd743cbaf71a95c45e (diff) | |
download | dotty-818afa813d12bec63c5d1bb8604e60b1672c6996.tar.gz dotty-818afa813d12bec63c5d1bb8604e60b1672c6996.tar.bz2 dotty-818afa813d12bec63c5d1bb8604e60b1672c6996.zip |
Merge pull request #601 from smarter/add/vcRunTests
Add value class run tests
-rw-r--r-- | src/dotty/tools/dotc/transform/ExtensionMethods.scala | 6 | ||||
-rw-r--r-- | tests/pending/run/t6260-delambdafy.check | 4 | ||||
-rw-r--r-- | tests/pending/run/t6260-delambdafy.flags | 1 | ||||
-rw-r--r-- | tests/run/genericValueClass.check (renamed from tests/pending/run/genericValueClass.check) | 0 | ||||
-rw-r--r-- | tests/run/genericValueClass.scala (renamed from tests/pending/run/genericValueClass.scala) | 0 | ||||
-rw-r--r-- | tests/run/t5608.check (renamed from tests/pending/run/t5608.check) | 0 | ||||
-rw-r--r-- | tests/run/t5608.scala (renamed from tests/pending/run/t5608.scala) | 0 | ||||
-rw-r--r-- | tests/run/t5866.check (renamed from tests/pending/run/t5866.check) | 0 | ||||
-rw-r--r-- | tests/run/t5866.scala (renamed from tests/pending/run/t5866.scala) | 0 | ||||
-rw-r--r-- | tests/run/t6260-delambdafy.check | 4 | ||||
-rw-r--r-- | tests/run/t6260-delambdafy.scala (renamed from tests/pending/run/t6260-delambdafy.scala) | 0 | ||||
-rw-r--r-- | tests/run/t6260.check (renamed from tests/pending/run/t6260.check) | 0 | ||||
-rw-r--r-- | tests/run/t6260.scala (renamed from tests/pending/run/t6260.scala) | 0 | ||||
-rw-r--r-- | tests/run/t6534.scala (renamed from tests/pending/run/t6534.scala) | 0 | ||||
-rw-r--r-- | tests/run/t6574b.check (renamed from tests/pending/run/t6574b.check) | 0 | ||||
-rw-r--r-- | tests/run/t6574b.scala (renamed from tests/pending/run/t6574b.scala) | 0 | ||||
-rw-r--r-- | tests/run/t7019.scala (renamed from tests/pending/run/t7019.scala) | 0 | ||||
-rw-r--r-- | tests/run/value-class-extractor-2.check (renamed from tests/pending/run/value-class-extractor-2.check) | 0 | ||||
-rw-r--r-- | tests/run/value-class-extractor-2.scala (renamed from tests/pending/run/value-class-extractor-2.scala) | 1 | ||||
-rw-r--r-- | tests/run/value-class-extractor.check (renamed from tests/pending/run/value-class-extractor.check) | 0 | ||||
-rw-r--r-- | tests/run/value-class-extractor.scala (renamed from tests/pending/run/value-class-extractor.scala) | 3 | ||||
-rw-r--r-- | tests/run/valueclasses-constr.check (renamed from tests/pending/run/valueclasses-constr.check) | 0 | ||||
-rw-r--r-- | tests/run/valueclasses-constr.scala (renamed from tests/pending/run/valueclasses-constr.scala) | 0 |
23 files changed, 10 insertions, 9 deletions
diff --git a/src/dotty/tools/dotc/transform/ExtensionMethods.scala b/src/dotty/tools/dotc/transform/ExtensionMethods.scala index 9c7b7ebda..ef0faae80 100644 --- a/src/dotty/tools/dotc/transform/ExtensionMethods.scala +++ b/src/dotty/tools/dotc/transform/ExtensionMethods.scala @@ -88,11 +88,11 @@ class ExtensionMethods extends MiniPhaseTransform with DenotTransformer with Ful decls1.enter(evt2uSym) } - // add a VCXXXCompanion superclass - + // Add the extension methods, the cast methods u2evt$ and evt2u$, and a VC*Companion superclass moduleClassSym.copySymDenotation(info = cinfo.derivedClassInfo( - classParents = ctx.normalizeToClassRefs(List(newSuperClass), moduleSym, decls1), + // FIXME: use of VC*Companion superclasses is disabled until the conflicts with SyntheticMethods are solved. + //classParents = ctx.normalizeToClassRefs(List(newSuperClass), moduleSym, decls1), decls = decls1)) case _ => moduleClassSym diff --git a/tests/pending/run/t6260-delambdafy.check b/tests/pending/run/t6260-delambdafy.check deleted file mode 100644 index b2a7bed98..000000000 --- a/tests/pending/run/t6260-delambdafy.check +++ /dev/null @@ -1,4 +0,0 @@ -f(C@2e) - -Test$lambda$1$$apply -apply diff --git a/tests/pending/run/t6260-delambdafy.flags b/tests/pending/run/t6260-delambdafy.flags deleted file mode 100644 index 48b438ddf..000000000 --- a/tests/pending/run/t6260-delambdafy.flags +++ /dev/null @@ -1 +0,0 @@ --Ydelambdafy:method diff --git a/tests/pending/run/genericValueClass.check b/tests/run/genericValueClass.check index ec3a41a6a..ec3a41a6a 100644 --- a/tests/pending/run/genericValueClass.check +++ b/tests/run/genericValueClass.check diff --git a/tests/pending/run/genericValueClass.scala b/tests/run/genericValueClass.scala index 5873eace1..5873eace1 100644 --- a/tests/pending/run/genericValueClass.scala +++ b/tests/run/genericValueClass.scala diff --git a/tests/pending/run/t5608.check b/tests/run/t5608.check index ba70d2170..ba70d2170 100644 --- a/tests/pending/run/t5608.check +++ b/tests/run/t5608.check diff --git a/tests/pending/run/t5608.scala b/tests/run/t5608.scala index 43e912122..43e912122 100644 --- a/tests/pending/run/t5608.scala +++ b/tests/run/t5608.scala diff --git a/tests/pending/run/t5866.check b/tests/run/t5866.check index 9f4ec729a..9f4ec729a 100644 --- a/tests/pending/run/t5866.check +++ b/tests/run/t5866.check diff --git a/tests/pending/run/t5866.scala b/tests/run/t5866.scala index 120773eff..120773eff 100644 --- a/tests/pending/run/t5866.scala +++ b/tests/run/t5866.scala diff --git a/tests/run/t6260-delambdafy.check b/tests/run/t6260-delambdafy.check new file mode 100644 index 000000000..b3ec1b3cc --- /dev/null +++ b/tests/run/t6260-delambdafy.check @@ -0,0 +1,4 @@ +f(C@2e) + +apply +get$Lambda diff --git a/tests/pending/run/t6260-delambdafy.scala b/tests/run/t6260-delambdafy.scala index a4a3cfc8f..a4a3cfc8f 100644 --- a/tests/pending/run/t6260-delambdafy.scala +++ b/tests/run/t6260-delambdafy.scala diff --git a/tests/pending/run/t6260.check b/tests/run/t6260.check index 54f98a10f..54f98a10f 100644 --- a/tests/pending/run/t6260.check +++ b/tests/run/t6260.check diff --git a/tests/pending/run/t6260.scala b/tests/run/t6260.scala index 3ad4926c8..3ad4926c8 100644 --- a/tests/pending/run/t6260.scala +++ b/tests/run/t6260.scala diff --git a/tests/pending/run/t6534.scala b/tests/run/t6534.scala index 33df97e41..33df97e41 100644 --- a/tests/pending/run/t6534.scala +++ b/tests/run/t6534.scala diff --git a/tests/pending/run/t6574b.check b/tests/run/t6574b.check index e10fa4f81..e10fa4f81 100644 --- a/tests/pending/run/t6574b.check +++ b/tests/run/t6574b.check diff --git a/tests/pending/run/t6574b.scala b/tests/run/t6574b.scala index 56f952074..56f952074 100644 --- a/tests/pending/run/t6574b.scala +++ b/tests/run/t6574b.scala diff --git a/tests/pending/run/t7019.scala b/tests/run/t7019.scala index 5dcc09d2b..5dcc09d2b 100644 --- a/tests/pending/run/t7019.scala +++ b/tests/run/t7019.scala diff --git a/tests/pending/run/value-class-extractor-2.check b/tests/run/value-class-extractor-2.check index 5903b996b..5903b996b 100644 --- a/tests/pending/run/value-class-extractor-2.check +++ b/tests/run/value-class-extractor-2.check diff --git a/tests/pending/run/value-class-extractor-2.scala b/tests/run/value-class-extractor-2.scala index d776c35ed..5850d42f0 100644 --- a/tests/pending/run/value-class-extractor-2.scala +++ b/tests/run/value-class-extractor-2.scala @@ -1,6 +1,7 @@ final class Opt[+A >: Null](val value: A) extends AnyVal { def get: A = value def isEmpty = value == null + def isDefined = !isEmpty } object Opt { final val None = new Opt[Null](null) diff --git a/tests/pending/run/value-class-extractor.check b/tests/run/value-class-extractor.check index e16447118..e16447118 100644 --- a/tests/pending/run/value-class-extractor.check +++ b/tests/run/value-class-extractor.check diff --git a/tests/pending/run/value-class-extractor.scala b/tests/run/value-class-extractor.scala index 3eaffa0c2..5628fea47 100644 --- a/tests/pending/run/value-class-extractor.scala +++ b/tests/run/value-class-extractor.scala @@ -6,12 +6,13 @@ object NonNullChar { @inline final val None = new NonNullChar(0.toChar) } -final class SomeProduct extends Product3[String, Int, List[String]] { +final class SomeProduct /*extends Product3[String, Int, List[String]]*/ { def canEqual(x: Any) = x.isInstanceOf[SomeProduct] def _1 = "abc" def _2 = 5 def _3 = List("bippy") def isEmpty = false + def isDefined = !isEmpty def get = this } object SomeProduct { diff --git a/tests/pending/run/valueclasses-constr.check b/tests/run/valueclasses-constr.check index 785e6fa25..785e6fa25 100644 --- a/tests/pending/run/valueclasses-constr.check +++ b/tests/run/valueclasses-constr.check diff --git a/tests/pending/run/valueclasses-constr.scala b/tests/run/valueclasses-constr.scala index 73ac29435..73ac29435 100644 --- a/tests/pending/run/valueclasses-constr.scala +++ b/tests/run/valueclasses-constr.scala |