From 52872cb21e5f898c6acfdc8c19d1d10c1224460c Mon Sep 17 00:00:00 2001 From: Dmitry Petrashko Date: Mon, 9 Nov 2015 12:32:03 +0100 Subject: [PATCH 01/37] Check that Iterator.scala compiles on jenkins. --- test/dotc/build.scala | 2 +- test/dotc/tests.scala | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/test/dotc/build.scala b/test/dotc/build.scala index 2963b8f1e9c1..643b4aa432ee 100644 --- a/test/dotc/build.scala +++ b/test/dotc/build.scala @@ -23,7 +23,7 @@ object build extends tests { deleteFilesInFolder(new File(defaultOutputDir)) // clear previous output val keepFile = new File(defaultOutputDir + ".keep") keepFile.createNewFile() - dotty // build output dir + //dotty // build output dir val p = Runtime.getRuntime.exec(Array("jar", "cf", "dotty.jar", "-C", "out", ".")) p.waitFor() p diff --git a/test/dotc/tests.scala b/test/dotc/tests.scala index 1bd37125f41f..ead5a76991cd 100644 --- a/test/dotc/tests.scala +++ b/test/dotc/tests.scala @@ -51,7 +51,7 @@ class tests extends CompilerTest { val toolsDir = dottyDir + "tools/" val dotcDir = toolsDir + "dotc/" val coreDir = dotcDir + "core/" - + /* @Test def pickle_pickleOK = compileDir(testsDir, "pickling", testPickling) // This directory doesn't exist anymore // @Test def pickle_pickling = compileDir(coreDir, "pickling", testPickling) @@ -170,7 +170,7 @@ class tests extends CompilerTest { @Test def neg_validateRefchecks = compileFile(negDir, "validate-refchecks", xerrors = 2) @Test def run_all = runFiles(runDir) - + */ val stdlibFiles = Source.fromFile("./test/dotc/scala-collections.whitelist", "UTF8").getLines() .map(_.trim) // allow identation .filter(!_.startsWith("#")) // allow comment lines prefixed by # @@ -179,7 +179,7 @@ class tests extends CompilerTest { .toList @Test def compileStdLib = compileList("compileStdLib", stdlibFiles, "-migration" :: scala2mode) - @Test def dotty = compileDir(dottyDir, ".", "-deep" :: "-Ycheck-reentrant" :: allowDeepSubtypes) // note the -deep argument + /* @Test def dotty = compileDir(dottyDir, ".", "-deep" :: "-Ycheck-reentrant" :: allowDeepSubtypes) // note the -deep argument @Test def dotc_ast = compileDir(dotcDir, "ast") @Test def dotc_config = compileDir(dotcDir, "config") @@ -223,4 +223,5 @@ class tests extends CompilerTest { val javaDir = "./tests/pos/java-interop/" @Test def java_all = compileFiles(javaDir, twice) //@Test def dotc_compilercommand = compileFile(dotcDir + "config/", "CompilerCommand") + */ } From f24ea5a4998b6ef5ab6bd7167512d2decf2c88b8 Mon Sep 17 00:00:00 2001 From: Dmitry Petrashko Date: Mon, 9 Nov 2015 12:48:15 +0100 Subject: [PATCH 02/37] Add more collections to whitelist. --- test/dotc/scala-collections.whitelist | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/test/dotc/scala-collections.whitelist b/test/dotc/scala-collections.whitelist index 59388ac780a0..ba69f4953bb3 100644 --- a/test/dotc/scala-collections.whitelist +++ b/test/dotc/scala-collections.whitelist @@ -140,4 +140,13 @@ ./scala-scala/src/library/scala/collection/GenSeq.scala ./scala-scala/src/library/scala/collection/GenSeqLike.scala +./scala-scala/src/library/scala/collection/BitSet.scala +./scala-scala/src/library/scala/collection/BitSetLike.scala +./scala-scala/src/library/scala/collection/BufferedIterator.scala +./scala-scala/src/library/scala/collection/CustomParallelizable.scala +./scala-scala/src/library/scala/collection/DefaultMap.scala +./scala-scala/src/library/scala/collection/GenIterable.scala +./scala-scala/src/library/scala/collection/GenIterableLike.scala +./scala-scala/src/library/scala/collection/GenMap.scala +./scala-scala/src/library/scala/collection/GenMapLike.scala From 21f5b6ab806a5082b365e746f2e36ebf4ddf6c3c Mon Sep 17 00:00:00 2001 From: Dmitry Petrashko Date: Mon, 9 Nov 2015 12:53:35 +0100 Subject: [PATCH 03/37] Showcase #935 --- test/dotc/scala-collections.whitelist | 1 - 1 file changed, 1 deletion(-) diff --git a/test/dotc/scala-collections.whitelist b/test/dotc/scala-collections.whitelist index ba69f4953bb3..def596e08933 100644 --- a/test/dotc/scala-collections.whitelist +++ b/test/dotc/scala-collections.whitelist @@ -149,4 +149,3 @@ ./scala-scala/src/library/scala/collection/GenIterableLike.scala ./scala-scala/src/library/scala/collection/GenMap.scala ./scala-scala/src/library/scala/collection/GenMapLike.scala - From 9a999999f098d8f71c37589acde7b2fb9a6985ce Mon Sep 17 00:00:00 2001 From: Dmitry Petrashko Date: Mon, 9 Nov 2015 12:54:45 +0100 Subject: [PATCH 04/37] Disable compilation of GenSeq and GenSeqLike. --- test/dotc/scala-collections.whitelist | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/test/dotc/scala-collections.whitelist b/test/dotc/scala-collections.whitelist index def596e08933..5f95686c389d 100644 --- a/test/dotc/scala-collections.whitelist +++ b/test/dotc/scala-collections.whitelist @@ -149,3 +149,7 @@ ./scala-scala/src/library/scala/collection/GenIterableLike.scala ./scala-scala/src/library/scala/collection/GenMap.scala ./scala-scala/src/library/scala/collection/GenMapLike.scala + +# cyclic reference +./scala-scala/src/library/scala/collection/GenSeq.scala +./scala-scala/src/library/scala/collection/GenSeqLike.scala From 38df9a44747da2328fa9655c6e3c0e0e6501acb7 Mon Sep 17 00:00:00 2001 From: Dmitry Petrashko Date: Mon, 9 Nov 2015 13:01:02 +0100 Subject: [PATCH 05/37] Showcase #937 --- test/dotc/scala-collections.whitelist | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/test/dotc/scala-collections.whitelist b/test/dotc/scala-collections.whitelist index 5f95686c389d..b8defd9c42ac 100644 --- a/test/dotc/scala-collections.whitelist +++ b/test/dotc/scala-collections.whitelist @@ -150,6 +150,16 @@ ./scala-scala/src/library/scala/collection/GenMap.scala ./scala-scala/src/library/scala/collection/GenMapLike.scala -# cyclic reference -./scala-scala/src/library/scala/collection/GenSeq.scala -./scala-scala/src/library/scala/collection/GenSeqLike.scala +# cyclic reference https://github.com/lampepfl/dotty/issues/935 +#./scala-scala/src/library/scala/collection/GenSeq.scala +#./scala-scala/src/library/scala/collection/GenSeqLike.scala + +# seems https://github.com/lampepfl/dotty/issues/916 +#./scala-scala/src/library/scala/collection/GenSet.scala + +# triggers cyclic reference +#./scala-scala/src/library/scala/collection/GenSetLike.scala + +# breaks genMapLike https://github.com/lampepfl/dotty/issues/937 +./scala-scala/src/library/scala/collection/GenTraversable.scala +./scala-scala/src/library/scala/collection/GenTraversableLike.scala From 17b48b54dad0c689af20c596bb2e71ebc8efbd6d Mon Sep 17 00:00:00 2001 From: Dmitry Petrashko Date: Mon, 9 Nov 2015 13:30:26 +0100 Subject: [PATCH 06/37] Add more collections that compile --- test/dotc/scala-collections.whitelist | 27 +++++++++++++++++++++++++-- 1 file changed, 25 insertions(+), 2 deletions(-) diff --git a/test/dotc/scala-collections.whitelist b/test/dotc/scala-collections.whitelist index b8defd9c42ac..9a737d67c2be 100644 --- a/test/dotc/scala-collections.whitelist +++ b/test/dotc/scala-collections.whitelist @@ -161,5 +161,28 @@ #./scala-scala/src/library/scala/collection/GenSetLike.scala # breaks genMapLike https://github.com/lampepfl/dotty/issues/937 -./scala-scala/src/library/scala/collection/GenTraversable.scala -./scala-scala/src/library/scala/collection/GenTraversableLike.scala +#./scala-scala/src/library/scala/collection/GenTraversable.scala +#./scala-scala/src/library/scala/collection/GenTraversableLike.scala + +./scala-scala/src/library/scala/collection/GenTraversableOnce.scala +./scala-scala/src/library/scala/collection/IndexedSeq.scala +./scala-scala/src/library/scala/collection/IndexedSeqLike.scala +./scala-scala/src/library/scala/collection/Iterable.scala +./scala-scala/src/library/scala/collection/IterableProxy.scala +./scala-scala/src/library/scala/collection/IterableProxyLike.scala + +./scala-scala/src/library/scala/collection/JavaConversions.scala +./scala-scala/src/library/scala/collection/JavaConverters.scala +./scala-scala/src/library/scala/collection/LinearSeq.scala + +# tailrec bug +#./scala-scala/src/library/scala/collection/LinearSeqLike.scala + +./scala-scala/src/library/scala/collection/Map.scala +./scala-scala/src/library/scala/collection/MapLike.scala +./scala-scala/src/library/scala/collection/MapProxy.scala +./scala-scala/src/library/scala/collection/MapProxyLike.scala +./scala-scala/src/library/scala/collection/Parallel.scala +./scala-scala/src/library/scala/collection/Parallelizable.scala +# tailrec bug +#./scala-scala/src/library/scala/collection/Searching.scala From 5a2e4ef3a515e07bcae1a38193f6dcb93ba8a094 Mon Sep 17 00:00:00 2001 From: Dmitry Petrashko Date: Mon, 9 Nov 2015 13:30:46 +0100 Subject: [PATCH 07/37] One more cyclic reference. --- test/dotc/scala-collections.whitelist | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/test/dotc/scala-collections.whitelist b/test/dotc/scala-collections.whitelist index 9a737d67c2be..f294f3df2f22 100644 --- a/test/dotc/scala-collections.whitelist +++ b/test/dotc/scala-collections.whitelist @@ -186,3 +186,10 @@ ./scala-scala/src/library/scala/collection/Parallelizable.scala # tailrec bug #./scala-scala/src/library/scala/collection/Searching.scala + + +# cyclic reference involving trait Seq +#./scala-scala/src/library/scala/collection/Seq.scala +#./scala-scala/src/library/scala/collection/SeqExtractors.scala +#./scala-scala/src/library/scala/collection/SeqLike.scala +#./scala-scala/src/library/scala/collection/SeqProxy.scala From 499c25118dca0c6d52e8ba00f6fa5fd6cf733d7d Mon Sep 17 00:00:00 2001 From: Dmitry Petrashko Date: Mon, 9 Nov 2015 13:31:02 +0100 Subject: [PATCH 08/37] Showcase #938 --- test/dotc/scala-collections.whitelist | 2 ++ 1 file changed, 2 insertions(+) diff --git a/test/dotc/scala-collections.whitelist b/test/dotc/scala-collections.whitelist index f294f3df2f22..a95d35feddce 100644 --- a/test/dotc/scala-collections.whitelist +++ b/test/dotc/scala-collections.whitelist @@ -193,3 +193,5 @@ #./scala-scala/src/library/scala/collection/SeqExtractors.scala #./scala-scala/src/library/scala/collection/SeqLike.scala #./scala-scala/src/library/scala/collection/SeqProxy.scala +# https://github.com/lampepfl/dotty/issues/938 +#./scala-scala/src/library/scala/collection/TraversableLike.scala From 878c7c7726d7c285b9d5434380fc21aa97b8fe6f Mon Sep 17 00:00:00 2001 From: Dmitry Petrashko Date: Mon, 9 Nov 2015 13:31:26 +0100 Subject: [PATCH 09/37] One more manifestation of #916 --- test/dotc/scala-collections.whitelist | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/test/dotc/scala-collections.whitelist b/test/dotc/scala-collections.whitelist index a95d35feddce..7f0b28a42474 100644 --- a/test/dotc/scala-collections.whitelist +++ b/test/dotc/scala-collections.whitelist @@ -193,5 +193,10 @@ #./scala-scala/src/library/scala/collection/SeqExtractors.scala #./scala-scala/src/library/scala/collection/SeqLike.scala #./scala-scala/src/library/scala/collection/SeqProxy.scala + +./scala-scala/src/library/scala/collection/SeqProxyLike.scala + +# seems https://github.com/lampepfl/dotty/issues/916 +#./scala-scala/src/library/scala/collection/Set.scala # https://github.com/lampepfl/dotty/issues/938 #./scala-scala/src/library/scala/collection/TraversableLike.scala From aed8bb039502fade09eb115d2ca81a2cc03a66da Mon Sep 17 00:00:00 2001 From: Dmitry Petrashko Date: Mon, 9 Nov 2015 13:31:39 +0100 Subject: [PATCH 10/37] One more cyclic reference. --- test/dotc/scala-collections.whitelist | 3 +++ 1 file changed, 3 insertions(+) diff --git a/test/dotc/scala-collections.whitelist b/test/dotc/scala-collections.whitelist index 7f0b28a42474..89fe20eed580 100644 --- a/test/dotc/scala-collections.whitelist +++ b/test/dotc/scala-collections.whitelist @@ -198,5 +198,8 @@ # seems https://github.com/lampepfl/dotty/issues/916 #./scala-scala/src/library/scala/collection/Set.scala + +# cyclic reference involving trait Set +#./scala-scala/src/library/scala/collection/SetLike.scala # https://github.com/lampepfl/dotty/issues/938 #./scala-scala/src/library/scala/collection/TraversableLike.scala From 92d2c5258b4a968eff49e9e59662c8b3f0fa8db8 Mon Sep 17 00:00:00 2001 From: Dmitry Petrashko Date: Mon, 9 Nov 2015 13:31:59 +0100 Subject: [PATCH 11/37] Add more classes that compile --- test/dotc/scala-collections.whitelist | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/test/dotc/scala-collections.whitelist b/test/dotc/scala-collections.whitelist index 89fe20eed580..a979da092be5 100644 --- a/test/dotc/scala-collections.whitelist +++ b/test/dotc/scala-collections.whitelist @@ -201,5 +201,26 @@ # cyclic reference involving trait Set #./scala-scala/src/library/scala/collection/SetLike.scala + +./scala-scala/src/library/scala/collection/SetProxy.scala +./scala-scala/src/library/scala/collection/SetProxyLike.scala +./scala-scala/src/library/scala/collection/SortedMap.scala +./scala-scala/src/library/scala/collection/SortedMapLike.scala +./scala-scala/src/library/scala/collection/SortedSet.scala +./scala-scala/src/library/scala/collection/SortedSetLike.scala +./scala-scala/src/library/scala/collection/Traversable.scala + # https://github.com/lampepfl/dotty/issues/938 #./scala-scala/src/library/scala/collection/TraversableLike.scala + +./scala-scala/src/library/scala/collection/TraversableProxy.scala +./scala-scala/src/library/scala/collection/TraversableProxyLike.scala +./scala-scala/src/library/scala/collection/package.scala + +## those classes use early initialisers. +#./scala-scala/src/library/scala/collection/IterableView.scala +#./scala-scala/src/library/scala/collection/IterableViewLike.scala +#./scala-scala/src/library/scala/collection/SeqView.scala +#./scala-scala/src/library/scala/collection/SeqViewLike.scala +#./scala-scala/src/library/scala/collection/TraversableView.scala +#./scala-scala/src/library/scala/collection/TraversableViewLike.scala From 7ad71a6a5d16882cda2ed1c243e78561ab0f4879 Mon Sep 17 00:00:00 2001 From: Dmitry Petrashko Date: Mon, 9 Nov 2015 14:00:22 +0100 Subject: [PATCH 12/37] Start adding more immutable collections. --- test/dotc/scala-collections.whitelist | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/test/dotc/scala-collections.whitelist b/test/dotc/scala-collections.whitelist index a979da092be5..30730ca8e282 100644 --- a/test/dotc/scala-collections.whitelist +++ b/test/dotc/scala-collections.whitelist @@ -224,3 +224,11 @@ #./scala-scala/src/library/scala/collection/SeqViewLike.scala #./scala-scala/src/library/scala/collection/TraversableView.scala #./scala-scala/src/library/scala/collection/TraversableViewLike.scala +#./scala-scala/src/library/scala/collection/immutable/StreamViewLike.scala + + +./scala-scala/src/library/scala/collection/immutable/HashMap.scala + +# seems https://github.com/lampepfl/dotty/issues/916 +#./scala-scala/src/library/scala/collection/immutable/HashSet.scala + From 1265d3910e92cc6855c45c0cc3dc282df4961dff Mon Sep 17 00:00:00 2001 From: Dmitry Petrashko Date: Mon, 9 Nov 2015 14:00:32 +0100 Subject: [PATCH 13/37] Showcase #939 --- test/dotc/scala-collections.whitelist | 3 +++ 1 file changed, 3 insertions(+) diff --git a/test/dotc/scala-collections.whitelist b/test/dotc/scala-collections.whitelist index 30730ca8e282..0e482898baea 100644 --- a/test/dotc/scala-collections.whitelist +++ b/test/dotc/scala-collections.whitelist @@ -232,3 +232,6 @@ # seems https://github.com/lampepfl/dotty/issues/916 #./scala-scala/src/library/scala/collection/immutable/HashSet.scala +# https://github.com/lampepfl/dotty/issues/939 +#./scala-scala/src/library/scala/collection/immutable/IntMap.scala + From b217275764586754c4a179329fc8f526da42f5c0 Mon Sep 17 00:00:00 2001 From: Dmitry Petrashko Date: Mon, 9 Nov 2015 14:01:03 +0100 Subject: [PATCH 14/37] Try to add ListMap and ListSet --- test/dotc/scala-collections.whitelist | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/test/dotc/scala-collections.whitelist b/test/dotc/scala-collections.whitelist index 0e482898baea..cccf6c97a555 100644 --- a/test/dotc/scala-collections.whitelist +++ b/test/dotc/scala-collections.whitelist @@ -235,3 +235,10 @@ # https://github.com/lampepfl/dotty/issues/939 #./scala-scala/src/library/scala/collection/immutable/IntMap.scala + +# tailrec bug +#./scala-scala/src/library/scala/collection/immutable/ListMap.scala + +# seems https://github.com/lampepfl/dotty/issues/916 +#./scala-scala/src/library/scala/collection/immutable/ListSet.scala + From 4d9d8a894b430fb7a0fe13842ecbf37a1a87009a Mon Sep 17 00:00:00 2001 From: Dmitry Petrashko Date: Mon, 9 Nov 2015 14:01:20 +0100 Subject: [PATCH 15/37] Showcase #939 --- test/dotc/scala-collections.whitelist | 3 +++ 1 file changed, 3 insertions(+) diff --git a/test/dotc/scala-collections.whitelist b/test/dotc/scala-collections.whitelist index cccf6c97a555..04871c963630 100644 --- a/test/dotc/scala-collections.whitelist +++ b/test/dotc/scala-collections.whitelist @@ -242,3 +242,6 @@ # seems https://github.com/lampepfl/dotty/issues/916 #./scala-scala/src/library/scala/collection/immutable/ListSet.scala +# https://github.com/lampepfl/dotty/issues/939 +#./scala-scala/src/library/scala/collection/immutable/LongMap.scala + From f68d9f19881dbe4caf61dbdaaee139f95b689859 Mon Sep 17 00:00:00 2001 From: Dmitry Petrashko Date: Mon, 9 Nov 2015 14:01:40 +0100 Subject: [PATCH 16/37] Add Map and MapLike --- test/dotc/scala-collections.whitelist | 3 +++ 1 file changed, 3 insertions(+) diff --git a/test/dotc/scala-collections.whitelist b/test/dotc/scala-collections.whitelist index 04871c963630..616976bd3e5e 100644 --- a/test/dotc/scala-collections.whitelist +++ b/test/dotc/scala-collections.whitelist @@ -245,3 +245,6 @@ # https://github.com/lampepfl/dotty/issues/939 #./scala-scala/src/library/scala/collection/immutable/LongMap.scala +./scala-scala/src/library/scala/collection/immutable/Map.scala +./scala-scala/src/library/scala/collection/immutable/MapLike.scala + From dd63002ee6e27624eedff42ea92490bc0ceec62c Mon Sep 17 00:00:00 2001 From: Dmitry Petrashko Date: Mon, 9 Nov 2015 14:01:50 +0100 Subject: [PATCH 17/37] Showcase #940 --- test/dotc/scala-collections.whitelist | 2 ++ 1 file changed, 2 insertions(+) diff --git a/test/dotc/scala-collections.whitelist b/test/dotc/scala-collections.whitelist index 616976bd3e5e..37a805f42b34 100644 --- a/test/dotc/scala-collections.whitelist +++ b/test/dotc/scala-collections.whitelist @@ -248,3 +248,5 @@ ./scala-scala/src/library/scala/collection/immutable/Map.scala ./scala-scala/src/library/scala/collection/immutable/MapLike.scala +# https://github.com/lampepfl/dotty/issues/940 +# ./scala-scala/src/library/scala/collection/immutable/MapProxy.scala From b074d574d494045e468421a6d7edb89cb8b6a25d Mon Sep 17 00:00:00 2001 From: Dmitry Petrashko Date: Mon, 9 Nov 2015 14:02:09 +0100 Subject: [PATCH 18/37] Add more collections that compile --- test/dotc/scala-collections.whitelist | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/test/dotc/scala-collections.whitelist b/test/dotc/scala-collections.whitelist index 37a805f42b34..2236ba159983 100644 --- a/test/dotc/scala-collections.whitelist +++ b/test/dotc/scala-collections.whitelist @@ -250,3 +250,17 @@ # https://github.com/lampepfl/dotty/issues/940 # ./scala-scala/src/library/scala/collection/immutable/MapProxy.scala + +./scala-scala/src/library/scala/collection/immutable/NumericRange.scala +./scala-scala/src/library/scala/collection/immutable/Range.scala + + +# tailrec bug +#./scala-scala/src/library/scala/collection/immutable/RedBlackTree.scala + +./scala-scala/src/library/scala/collection/immutable/Seq.scala + +# uses refinements that dotty does not support +#./scala-scala/src/library/scala/collection/immutable/Set.scala + +./scala-scala/src/library/scala/collection/immutable/SetProxy.scala From 397bf67f623f259d413d1a4acc39b50171c28ecb Mon Sep 17 00:00:00 2001 From: Dmitry Petrashko Date: Mon, 9 Nov 2015 14:02:53 +0100 Subject: [PATCH 19/37] Showcase #942 --- test/dotc/scala-collections.whitelist | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/test/dotc/scala-collections.whitelist b/test/dotc/scala-collections.whitelist index 2236ba159983..717817a5618b 100644 --- a/test/dotc/scala-collections.whitelist +++ b/test/dotc/scala-collections.whitelist @@ -264,3 +264,7 @@ #./scala-scala/src/library/scala/collection/immutable/Set.scala ./scala-scala/src/library/scala/collection/immutable/SetProxy.scala + +# https://github.com/lampepfl/dotty/issues/942 +# ./scala-scala/src/library/scala/collection/immutable/SortedMap.scala +#./scala-scala/src/library/scala/collection/immutable/SortedSet.scala From e714fb85d2863e4509c6e409309b98b12a7f492a Mon Sep 17 00:00:00 2001 From: Dmitry Petrashko Date: Mon, 9 Nov 2015 14:04:14 +0100 Subject: [PATCH 20/37] showcase #941 --- test/dotc/scala-collections.whitelist | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/test/dotc/scala-collections.whitelist b/test/dotc/scala-collections.whitelist index 717817a5618b..0ff1076b74cb 100644 --- a/test/dotc/scala-collections.whitelist +++ b/test/dotc/scala-collections.whitelist @@ -268,3 +268,7 @@ # https://github.com/lampepfl/dotty/issues/942 # ./scala-scala/src/library/scala/collection/immutable/SortedMap.scala #./scala-scala/src/library/scala/collection/immutable/SortedSet.scala + +# https://github.com/lampepfl/dotty/issues/941 +#./scala-scala/src/library/scala/collection/immutable/Stream.scala +#./scala-scala/src/library/scala/collection/immutable/StreamView.scala From 2cbe2c7e34b998fd326cee1a53b5f0fec0a90cdd Mon Sep 17 00:00:00 2001 From: Dmitry Petrashko Date: Mon, 9 Nov 2015 14:04:25 +0100 Subject: [PATCH 21/37] Add TreeMap and TreeSet. --- test/dotc/scala-collections.whitelist | 3 +++ 1 file changed, 3 insertions(+) diff --git a/test/dotc/scala-collections.whitelist b/test/dotc/scala-collections.whitelist index 0ff1076b74cb..cde2198b84bb 100644 --- a/test/dotc/scala-collections.whitelist +++ b/test/dotc/scala-collections.whitelist @@ -272,3 +272,6 @@ # https://github.com/lampepfl/dotty/issues/941 #./scala-scala/src/library/scala/collection/immutable/Stream.scala #./scala-scala/src/library/scala/collection/immutable/StreamView.scala + +./scala-scala/src/library/scala/collection/immutable/TreeMap.scala +./scala-scala/src/library/scala/collection/immutable/TreeSet.scala From 6581e060ff59447f4e9d980bc9c87b917988008b Mon Sep 17 00:00:00 2001 From: Dmitry Petrashko Date: Mon, 9 Nov 2015 14:06:38 +0100 Subject: [PATCH 22/37] TrieIterator uses early definitions. --- test/dotc/scala-collections.whitelist | 1 + 1 file changed, 1 insertion(+) diff --git a/test/dotc/scala-collections.whitelist b/test/dotc/scala-collections.whitelist index cde2198b84bb..bba7c74997d3 100644 --- a/test/dotc/scala-collections.whitelist +++ b/test/dotc/scala-collections.whitelist @@ -225,6 +225,7 @@ #./scala-scala/src/library/scala/collection/TraversableView.scala #./scala-scala/src/library/scala/collection/TraversableViewLike.scala #./scala-scala/src/library/scala/collection/immutable/StreamViewLike.scala +#./scala-scala/src/library/scala/collection/immutable/TrieIterator.scala ./scala-scala/src/library/scala/collection/immutable/HashMap.scala From be0fae422d2e7d0145696af88f8576efbe926c04 Mon Sep 17 00:00:00 2001 From: Dmitry Petrashko Date: Mon, 9 Nov 2015 14:27:43 +0100 Subject: [PATCH 23/37] Start adding scala.collections.generic.* --- test/dotc/scala-collections.whitelist | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/test/dotc/scala-collections.whitelist b/test/dotc/scala-collections.whitelist index bba7c74997d3..81e00fc5d56f 100644 --- a/test/dotc/scala-collections.whitelist +++ b/test/dotc/scala-collections.whitelist @@ -276,3 +276,23 @@ ./scala-scala/src/library/scala/collection/immutable/TreeMap.scala ./scala-scala/src/library/scala/collection/immutable/TreeSet.scala + + + +./scala-scala/src/library/scala/collection/generic/BitOperations.scala +./scala-scala/src/library/scala/collection/generic/BitSetFactory.scala +./scala-scala/src/library/scala/collection/generic/CanBuildFrom.scala +./scala-scala/src/library/scala/collection/generic/CanCombineFrom.scala +./scala-scala/src/library/scala/collection/generic/ClassTagTraversableFactory.scala +./scala-scala/src/library/scala/collection/generic/Clearable.scala +./scala-scala/src/library/scala/collection/generic/FilterMonadic.scala +./scala-scala/src/library/scala/collection/generic/GenMapFactory.scala +./scala-scala/src/library/scala/collection/generic/GenSeqFactory.scala +./scala-scala/src/library/scala/collection/generic/GenSetFactory.scala +./scala-scala/src/library/scala/collection/generic/GenTraversableFactory.scala +./scala-scala/src/library/scala/collection/generic/GenericClassTagCompanion.scala +./scala-scala/src/library/scala/collection/generic/GenericClassTagTraversableTemplate.scala +./scala-scala/src/library/scala/collection/generic/GenericCompanion.scala +./scala-scala/src/library/scala/collection/generic/GenericOrderedCompanion.scala +./scala-scala/src/library/scala/collection/generic/GenericOrderedTraversableTemplate.scala +./scala-scala/src/library/scala/collection/generic/GenericParCompanion.scala From 77d108fad6e05acb7c85b1beac6f5c72834948a6 Mon Sep 17 00:00:00 2001 From: Dmitry Petrashko Date: Mon, 9 Nov 2015 14:28:22 +0100 Subject: [PATCH 24/37] One more cyclic ref --- test/dotc/scala-collections.whitelist | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/test/dotc/scala-collections.whitelist b/test/dotc/scala-collections.whitelist index 81e00fc5d56f..ce9dd2d202f8 100644 --- a/test/dotc/scala-collections.whitelist +++ b/test/dotc/scala-collections.whitelist @@ -296,3 +296,7 @@ ./scala-scala/src/library/scala/collection/generic/GenericOrderedCompanion.scala ./scala-scala/src/library/scala/collection/generic/GenericOrderedTraversableTemplate.scala ./scala-scala/src/library/scala/collection/generic/GenericParCompanion.scala + +# cyclic ref +#./scala-scala/src/library/scala/collection/generic/GenericParTemplate.scala + From 0c29307c63a77b467269e2f11489de4bee918fe1 Mon Sep 17 00:00:00 2001 From: Dmitry Petrashko Date: Mon, 9 Nov 2015 14:28:33 +0100 Subject: [PATCH 25/37] Another cyclic ref --- test/dotc/scala-collections.whitelist | 3 +++ 1 file changed, 3 insertions(+) diff --git a/test/dotc/scala-collections.whitelist b/test/dotc/scala-collections.whitelist index ce9dd2d202f8..583a600a305d 100644 --- a/test/dotc/scala-collections.whitelist +++ b/test/dotc/scala-collections.whitelist @@ -300,3 +300,6 @@ # cyclic ref #./scala-scala/src/library/scala/collection/generic/GenericParTemplate.scala +#cyclic ref +#./scala-scala/src/library/scala/collection/generic/GenericSetTemplate.scala +#./scala-scala/src/library/scala/collection/generic/GenericTraversableTemplate.scala From 66be6f2e05f10ef8f15be0a209510fa1b88aee0c Mon Sep 17 00:00:00 2001 From: Dmitry Petrashko Date: Mon, 9 Nov 2015 14:28:49 +0100 Subject: [PATCH 26/37] GenericSeqCompanion compiles --- test/dotc/scala-collections.whitelist | 2 ++ 1 file changed, 2 insertions(+) diff --git a/test/dotc/scala-collections.whitelist b/test/dotc/scala-collections.whitelist index 583a600a305d..4b5ed87cb74f 100644 --- a/test/dotc/scala-collections.whitelist +++ b/test/dotc/scala-collections.whitelist @@ -300,6 +300,8 @@ # cyclic ref #./scala-scala/src/library/scala/collection/generic/GenericParTemplate.scala +./scala-scala/src/library/scala/collection/generic/GenericSeqCompanion.scala + #cyclic ref #./scala-scala/src/library/scala/collection/generic/GenericSetTemplate.scala #./scala-scala/src/library/scala/collection/generic/GenericTraversableTemplate.scala From c65e8d7e40135ed8619ec683dc732c38d733c8ce Mon Sep 17 00:00:00 2001 From: Dmitry Petrashko Date: Mon, 9 Nov 2015 14:29:11 +0100 Subject: [PATCH 27/37] HasNewBuilder and HasNewCombiner compile --- test/dotc/scala-collections.whitelist | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/test/dotc/scala-collections.whitelist b/test/dotc/scala-collections.whitelist index 4b5ed87cb74f..c7a9817cbc34 100644 --- a/test/dotc/scala-collections.whitelist +++ b/test/dotc/scala-collections.whitelist @@ -305,3 +305,7 @@ #cyclic ref #./scala-scala/src/library/scala/collection/generic/GenericSetTemplate.scala #./scala-scala/src/library/scala/collection/generic/GenericTraversableTemplate.scala + +./scala-scala/src/library/scala/collection/generic/HasNewBuilder.scala +./scala-scala/src/library/scala/collection/generic/HasNewCombiner.scala + From 3ef85c06d000deb072686f75644886968162080a Mon Sep 17 00:00:00 2001 From: Dmitry Petrashko Date: Mon, 9 Nov 2015 14:31:29 +0100 Subject: [PATCH 28/37] Showcase #943 --- test/dotc/scala-collections.whitelist | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/test/dotc/scala-collections.whitelist b/test/dotc/scala-collections.whitelist index c7a9817cbc34..c44acb1f0358 100644 --- a/test/dotc/scala-collections.whitelist +++ b/test/dotc/scala-collections.whitelist @@ -309,3 +309,8 @@ ./scala-scala/src/library/scala/collection/generic/HasNewBuilder.scala ./scala-scala/src/library/scala/collection/generic/HasNewCombiner.scala +# https://github.com/lampepfl/dotty/issues/943 +# [error] Test dotc.tests.compileStdLib failed: java.lang.Error: deep subtype, took 6.462 sec +#./scala-scala/src/library/scala/collection/generic/ImmutableMapFactory.scala +#./scala-scala/src/library/scala/collection/generic/ImmutableSetFactory.scala + From a74f3995890c0cdaafbfe33a207f8932e268f3eb Mon Sep 17 00:00:00 2001 From: Dmitry Petrashko Date: Mon, 9 Nov 2015 14:31:44 +0100 Subject: [PATCH 29/37] Add more generic classes that compile --- test/dotc/scala-collections.whitelist | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/test/dotc/scala-collections.whitelist b/test/dotc/scala-collections.whitelist index c44acb1f0358..f08db2110309 100644 --- a/test/dotc/scala-collections.whitelist +++ b/test/dotc/scala-collections.whitelist @@ -314,3 +314,10 @@ #./scala-scala/src/library/scala/collection/generic/ImmutableMapFactory.scala #./scala-scala/src/library/scala/collection/generic/ImmutableSetFactory.scala +./scala-scala/src/library/scala/collection/generic/ImmutableSortedMapFactory.scala +./scala-scala/src/library/scala/collection/generic/ImmutableSortedSetFactory.scala +./scala-scala/src/library/scala/collection/generic/IndexedSeqFactory.scala +./scala-scala/src/library/scala/collection/generic/IsSeqLike.scala +./scala-scala/src/library/scala/collection/generic/IsTraversableLike.scala +./scala-scala/src/library/scala/collection/generic/IsTraversableOnce.scala +./scala-scala/src/library/scala/collection/generic/IterableForwarder.scala From cd684964dd94617af8c021d33d86bc5f0447759d Mon Sep 17 00:00:00 2001 From: Dmitry Petrashko Date: Mon, 9 Nov 2015 14:32:39 +0100 Subject: [PATCH 30/37] More deep subtype failures. --- test/dotc/scala-collections.whitelist | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/test/dotc/scala-collections.whitelist b/test/dotc/scala-collections.whitelist index f08db2110309..e62862159bd2 100644 --- a/test/dotc/scala-collections.whitelist +++ b/test/dotc/scala-collections.whitelist @@ -321,3 +321,17 @@ ./scala-scala/src/library/scala/collection/generic/IsTraversableLike.scala ./scala-scala/src/library/scala/collection/generic/IsTraversableOnce.scala ./scala-scala/src/library/scala/collection/generic/IterableForwarder.scala + +# [error] Test dotc.tests.compileStdLib failed: java.lang.Error: deep subtype +# fails if any of those classes are added: +#./scala-scala/src/library/scala/collection/generic/MapFactory.scala +#./scala-scala/src/library/scala/collection/generic/MutableMapFactory.scala +#./scala-scala/src/library/scala/collection/generic/MutableSetFactory.scala +#./scala-scala/src/library/scala/collection/generic/MutableSortedSetFactory.scala +#./scala-scala/src/library/scala/collection/generic/ParFactory.scala +#./scala-scala/src/library/scala/collection/generic/ParMapFactory.scala +#./scala-scala/src/library/scala/collection/generic/ParSetFactory.scala +#./scala-scala/src/library/scala/collection/generic/SeqFactory.scala +#./scala-scala/src/library/scala/collection/generic/SortedMapFactory.scala +#./scala-scala/src/library/scala/collection/generic/SortedSetFactory.scala +#./scala-scala/src/library/scala/collection/generic/SetFactory.scala From d46a053457043c312461bdbb34cd89e56fe65b79 Mon Sep 17 00:00:00 2001 From: Dmitry Petrashko Date: Mon, 9 Nov 2015 14:33:22 +0100 Subject: [PATCH 31/37] Add more generic classes that compile --- test/dotc/scala-collections.whitelist | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/test/dotc/scala-collections.whitelist b/test/dotc/scala-collections.whitelist index e62862159bd2..dab6848ee829 100644 --- a/test/dotc/scala-collections.whitelist +++ b/test/dotc/scala-collections.whitelist @@ -335,3 +335,15 @@ #./scala-scala/src/library/scala/collection/generic/SortedMapFactory.scala #./scala-scala/src/library/scala/collection/generic/SortedSetFactory.scala #./scala-scala/src/library/scala/collection/generic/SetFactory.scala + + +./scala-scala/src/library/scala/collection/generic/OrderedTraversableFactory.scala +./scala-scala/src/library/scala/collection/generic/SeqForwarder.scala +./scala-scala/src/library/scala/collection/generic/Shrinkable.scala +./scala-scala/src/library/scala/collection/generic/Signalling.scala +./scala-scala/src/library/scala/collection/generic/Sizing.scala +./scala-scala/src/library/scala/collection/generic/SliceInterval.scala +./scala-scala/src/library/scala/collection/generic/Sorted.scala +./scala-scala/src/library/scala/collection/generic/Subtractable.scala +./scala-scala/src/library/scala/collection/generic/TraversableFactory.scala +./scala-scala/src/library/scala/collection/generic/package.scala From bdd291c120b3e9592d068083434be6f54e6e355d Mon Sep 17 00:00:00 2001 From: Dmitry Petrashko Date: Mon, 9 Nov 2015 14:35:24 +0100 Subject: [PATCH 32/37] Revert "Go back to sbt 0.13.5 until 0.13.9 is published on type safe artifactory" This reverts commit 2f41c73ee86a56b190758baaf5999ed85d2f57a1. --- project/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.properties b/project/build.properties index be6c454fbaca..817bc38df8a9 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=0.13.5 +sbt.version=0.13.9 From bd54033336526864340d6127a85be71b61ed4bad Mon Sep 17 00:00:00 2001 From: Dmitry Petrashko Date: Mon, 9 Nov 2015 21:01:00 +0100 Subject: [PATCH 33/37] Revert "Check that Iterator.scala compiles on jenkins." This reverts commit 05e47a4ac03cad65932a5bbddf506b91e6604f38. --- test/dotc/build.scala | 2 +- test/dotc/tests.scala | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/test/dotc/build.scala b/test/dotc/build.scala index 643b4aa432ee..2963b8f1e9c1 100644 --- a/test/dotc/build.scala +++ b/test/dotc/build.scala @@ -23,7 +23,7 @@ object build extends tests { deleteFilesInFolder(new File(defaultOutputDir)) // clear previous output val keepFile = new File(defaultOutputDir + ".keep") keepFile.createNewFile() - //dotty // build output dir + dotty // build output dir val p = Runtime.getRuntime.exec(Array("jar", "cf", "dotty.jar", "-C", "out", ".")) p.waitFor() p diff --git a/test/dotc/tests.scala b/test/dotc/tests.scala index ead5a76991cd..1bd37125f41f 100644 --- a/test/dotc/tests.scala +++ b/test/dotc/tests.scala @@ -51,7 +51,7 @@ class tests extends CompilerTest { val toolsDir = dottyDir + "tools/" val dotcDir = toolsDir + "dotc/" val coreDir = dotcDir + "core/" - /* + @Test def pickle_pickleOK = compileDir(testsDir, "pickling", testPickling) // This directory doesn't exist anymore // @Test def pickle_pickling = compileDir(coreDir, "pickling", testPickling) @@ -170,7 +170,7 @@ class tests extends CompilerTest { @Test def neg_validateRefchecks = compileFile(negDir, "validate-refchecks", xerrors = 2) @Test def run_all = runFiles(runDir) - */ + val stdlibFiles = Source.fromFile("./test/dotc/scala-collections.whitelist", "UTF8").getLines() .map(_.trim) // allow identation .filter(!_.startsWith("#")) // allow comment lines prefixed by # @@ -179,7 +179,7 @@ class tests extends CompilerTest { .toList @Test def compileStdLib = compileList("compileStdLib", stdlibFiles, "-migration" :: scala2mode) - /* @Test def dotty = compileDir(dottyDir, ".", "-deep" :: "-Ycheck-reentrant" :: allowDeepSubtypes) // note the -deep argument + @Test def dotty = compileDir(dottyDir, ".", "-deep" :: "-Ycheck-reentrant" :: allowDeepSubtypes) // note the -deep argument @Test def dotc_ast = compileDir(dotcDir, "ast") @Test def dotc_config = compileDir(dotcDir, "config") @@ -223,5 +223,4 @@ class tests extends CompilerTest { val javaDir = "./tests/pos/java-interop/" @Test def java_all = compileFiles(javaDir, twice) //@Test def dotc_compilercommand = compileFile(dotcDir + "config/", "CompilerCommand") - */ } From 296caf5da808fa208b670ff0c5c36d928e9bb81c Mon Sep 17 00:00:00 2001 From: Dmitry Petrashko Date: Tue, 10 Nov 2015 16:23:14 +0100 Subject: [PATCH 34/37] Tailrec bug is fixed. --- test/dotc/scala-collections.whitelist | 56 +++++++-------------------- 1 file changed, 14 insertions(+), 42 deletions(-) diff --git a/test/dotc/scala-collections.whitelist b/test/dotc/scala-collections.whitelist index dab6848ee829..b7bd5e3f46f3 100644 --- a/test/dotc/scala-collections.whitelist +++ b/test/dotc/scala-collections.whitelist @@ -63,7 +63,6 @@ ./scala-scala/src/library/scala/Product7.scala ./scala-scala/src/library/scala/Product8.scala ./scala-scala/src/library/scala/Product9.scala - ./scala-scala/src/library/scala/Proxy.scala ./scala-scala/src/library/scala/SerialVersionUID.scala ./scala-scala/src/library/scala/Serializable.scala @@ -71,15 +70,10 @@ ./scala-scala/src/library/scala/Symbol.scala ./scala-scala/src/library/scala/UninitializedError.scala ./scala-scala/src/library/scala/UninitializedFieldError.scala - -# https://github.com/lampepfl/dotty/issues/912 -# ./scala-scala/src/library/scala/collection/IndexedSeqOptimized.scala - +./scala-scala/src/library/scala/collection/IndexedSeqOptimized.scala ./scala-scala/src/library/scala/collection/IterableLike.scala ./scala-scala/src/library/scala/collection/Iterator.scala ./scala-scala/src/library/scala/collection/LinearSeqOptimized.scala - -# https://github.com/lampepfl/dotty/issues/914 ./scala-scala/src/library/scala/collection/TraversableOnce.scala ./scala-scala/src/library/scala/collection/generic/Growable.scala ./scala-scala/src/library/scala/collection/generic/TraversableForwarder.scala @@ -88,7 +82,6 @@ ./scala-scala/src/library/scala/collection/immutable/IndexedSeq.scala ./scala-scala/src/library/scala/collection/immutable/Iterable.scala ./scala-scala/src/library/scala/collection/immutable/LinearSeq.scala - ./scala-scala/src/library/scala/collection/immutable/List.scala ./scala-scala/src/library/scala/collection/immutable/MapProxy.scala ./scala-scala/src/library/scala/collection/immutable/PagedSeq.scala @@ -135,11 +128,6 @@ ./scala-scala/src/library/scala/transient.scala ./scala-scala/src/library/scala/unchecked.scala ./scala-scala/src/library/scala/volatile.scala - -# cyclic reference -./scala-scala/src/library/scala/collection/GenSeq.scala -./scala-scala/src/library/scala/collection/GenSeqLike.scala - ./scala-scala/src/library/scala/collection/BitSet.scala ./scala-scala/src/library/scala/collection/BitSetLike.scala ./scala-scala/src/library/scala/collection/BufferedIterator.scala @@ -149,16 +137,13 @@ ./scala-scala/src/library/scala/collection/GenIterableLike.scala ./scala-scala/src/library/scala/collection/GenMap.scala ./scala-scala/src/library/scala/collection/GenMapLike.scala - -# cyclic reference https://github.com/lampepfl/dotty/issues/935 -#./scala-scala/src/library/scala/collection/GenSeq.scala -#./scala-scala/src/library/scala/collection/GenSeqLike.scala +./scala-scala/src/library/scala/collection/GenSeq.scala +./scala-scala/src/library/scala/collection/GenSeqLike.scala # seems https://github.com/lampepfl/dotty/issues/916 #./scala-scala/src/library/scala/collection/GenSet.scala -# triggers cyclic reference -#./scala-scala/src/library/scala/collection/GenSetLike.scala +./scala-scala/src/library/scala/collection/GenSetLike.scala # breaks genMapLike https://github.com/lampepfl/dotty/issues/937 #./scala-scala/src/library/scala/collection/GenTraversable.scala @@ -170,38 +155,34 @@ ./scala-scala/src/library/scala/collection/Iterable.scala ./scala-scala/src/library/scala/collection/IterableProxy.scala ./scala-scala/src/library/scala/collection/IterableProxyLike.scala - ./scala-scala/src/library/scala/collection/JavaConversions.scala ./scala-scala/src/library/scala/collection/JavaConverters.scala ./scala-scala/src/library/scala/collection/LinearSeq.scala - -# tailrec bug -#./scala-scala/src/library/scala/collection/LinearSeqLike.scala - +./scala-scala/src/library/scala/collection/LinearSeqLike.scala ./scala-scala/src/library/scala/collection/Map.scala ./scala-scala/src/library/scala/collection/MapLike.scala ./scala-scala/src/library/scala/collection/MapProxy.scala ./scala-scala/src/library/scala/collection/MapProxyLike.scala ./scala-scala/src/library/scala/collection/Parallel.scala ./scala-scala/src/library/scala/collection/Parallelizable.scala -# tailrec bug -#./scala-scala/src/library/scala/collection/Searching.scala +./scala-scala/src/library/scala/collection/Searching.scala # cyclic reference involving trait Seq #./scala-scala/src/library/scala/collection/Seq.scala -#./scala-scala/src/library/scala/collection/SeqExtractors.scala + +./scala-scala/src/library/scala/collection/SeqExtractors.scala + +# https://github.com/lampepfl/dotty/issues/945 #./scala-scala/src/library/scala/collection/SeqLike.scala -#./scala-scala/src/library/scala/collection/SeqProxy.scala +./scala-scala/src/library/scala/collection/SeqProxy.scala ./scala-scala/src/library/scala/collection/SeqProxyLike.scala # seems https://github.com/lampepfl/dotty/issues/916 #./scala-scala/src/library/scala/collection/Set.scala -# cyclic reference involving trait Set -#./scala-scala/src/library/scala/collection/SetLike.scala - +./scala-scala/src/library/scala/collection/SetLike.scala ./scala-scala/src/library/scala/collection/SetProxy.scala ./scala-scala/src/library/scala/collection/SetProxyLike.scala ./scala-scala/src/library/scala/collection/SortedMap.scala @@ -237,8 +218,7 @@ #./scala-scala/src/library/scala/collection/immutable/IntMap.scala -# tailrec bug -#./scala-scala/src/library/scala/collection/immutable/ListMap.scala +./scala-scala/src/library/scala/collection/immutable/ListMap.scala # seems https://github.com/lampepfl/dotty/issues/916 #./scala-scala/src/library/scala/collection/immutable/ListSet.scala @@ -248,17 +228,9 @@ ./scala-scala/src/library/scala/collection/immutable/Map.scala ./scala-scala/src/library/scala/collection/immutable/MapLike.scala - -# https://github.com/lampepfl/dotty/issues/940 -# ./scala-scala/src/library/scala/collection/immutable/MapProxy.scala - ./scala-scala/src/library/scala/collection/immutable/NumericRange.scala ./scala-scala/src/library/scala/collection/immutable/Range.scala - - -# tailrec bug -#./scala-scala/src/library/scala/collection/immutable/RedBlackTree.scala - +./scala-scala/src/library/scala/collection/immutable/RedBlackTree.scala ./scala-scala/src/library/scala/collection/immutable/Seq.scala # uses refinements that dotty does not support From 85a39ff9fbf8498ce71d2467ac8cc42bcd4220f0 Mon Sep 17 00:00:00 2001 From: Dmitry Petrashko Date: Tue, 10 Nov 2015 16:23:40 +0100 Subject: [PATCH 35/37] This cyclic ref is fixed. --- test/dotc/scala-collections.whitelist | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/test/dotc/scala-collections.whitelist b/test/dotc/scala-collections.whitelist index b7bd5e3f46f3..bb24a923eb34 100644 --- a/test/dotc/scala-collections.whitelist +++ b/test/dotc/scala-collections.whitelist @@ -268,14 +268,10 @@ ./scala-scala/src/library/scala/collection/generic/GenericOrderedCompanion.scala ./scala-scala/src/library/scala/collection/generic/GenericOrderedTraversableTemplate.scala ./scala-scala/src/library/scala/collection/generic/GenericParCompanion.scala - -# cyclic ref -#./scala-scala/src/library/scala/collection/generic/GenericParTemplate.scala - +./scala-scala/src/library/scala/collection/generic/GenericParTemplate.scala ./scala-scala/src/library/scala/collection/generic/GenericSeqCompanion.scala +./scala-scala/src/library/scala/collection/generic/GenericSetTemplate.scala -#cyclic ref -#./scala-scala/src/library/scala/collection/generic/GenericSetTemplate.scala #./scala-scala/src/library/scala/collection/generic/GenericTraversableTemplate.scala ./scala-scala/src/library/scala/collection/generic/HasNewBuilder.scala From c86f8d3b788836d6112e45f555c803f1894f5715 Mon Sep 17 00:00:00 2001 From: Dmitry Petrashko Date: Tue, 10 Nov 2015 16:28:33 +0100 Subject: [PATCH 36/37] Change diagnosis of GenericTraversableTemplate.scala. --- test/dotc/scala-collections.whitelist | 1 + 1 file changed, 1 insertion(+) diff --git a/test/dotc/scala-collections.whitelist b/test/dotc/scala-collections.whitelist index bb24a923eb34..11e4e4339847 100644 --- a/test/dotc/scala-collections.whitelist +++ b/test/dotc/scala-collections.whitelist @@ -272,6 +272,7 @@ ./scala-scala/src/library/scala/collection/generic/GenericSeqCompanion.scala ./scala-scala/src/library/scala/collection/generic/GenericSetTemplate.scala +# deep subtype #./scala-scala/src/library/scala/collection/generic/GenericTraversableTemplate.scala ./scala-scala/src/library/scala/collection/generic/HasNewBuilder.scala From 697253ce65c48fc734f0cd3332788c79a2de5acb Mon Sep 17 00:00:00 2001 From: Dmitry Petrashko Date: Tue, 10 Nov 2015 16:29:56 +0100 Subject: [PATCH 37/37] Remove leftover empty lines --- test/dotc/scala-collections.whitelist | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/test/dotc/scala-collections.whitelist b/test/dotc/scala-collections.whitelist index 11e4e4339847..826da6da2e2c 100644 --- a/test/dotc/scala-collections.whitelist +++ b/test/dotc/scala-collections.whitelist @@ -7,10 +7,8 @@ ./scala-scala/src/library/scala/runtime/RichInt.scala ./scala-scala/src/library/scala/runtime/RichLong.scala ./scala-scala/src/library/scala/runtime/RichShort.scala - ./scala-scala/src/library/scala/Array.scala ./scala-scala/src/library/scala/NotImplementedError.scala - ./scala-scala/src/library/scala/AnyValCompanion.scala # AnyVal is a synthesized class in Dotty, cannot be compiled from source. @@ -25,7 +23,6 @@ ./scala-scala/src/library/scala/Long.scala ./scala-scala/src/library/scala/Short.scala ./scala-scala/src/library/scala/Unit.scala - ./scala-scala/src/library/scala/Cloneable.scala ./scala-scala/src/library/scala/DelayedInit.scala ./scala-scala/src/library/scala/Dynamic.scala @@ -34,12 +31,9 @@ ./scala-scala/src/library/scala/MatchError.scala ./scala-scala/src/library/scala/Mutable.scala ./scala-scala/src/library/scala/NotNull.scala - ./scala-scala/src/library/scala/Option.scala - ./scala-scala/src/library/scala/PartialFunction.scala ./scala-scala/src/library/scala/Predef.scala - ./scala-scala/src/library/scala/Product.scala ./scala-scala/src/library/scala/Product1.scala ./scala-scala/src/library/scala/Product10.scala @@ -100,7 +94,6 @@ ./scala-scala/src/library/scala/collection/immutable/WrappedString.scala ./scala-scala/src/library/scala/collection/mutable/Builder.scala ./scala-scala/src/library/scala/collection/mutable/GrowingBuilder.scala - ./scala-scala/src/library/scala/collection/mutable/WrappedArray.scala ./scala-scala/src/library/scala/collection/mutable/WrappedArrayBuilder.scala ./scala-scala/src/library/scala/deprecated.scala @@ -248,9 +241,6 @@ ./scala-scala/src/library/scala/collection/immutable/TreeMap.scala ./scala-scala/src/library/scala/collection/immutable/TreeSet.scala - - - ./scala-scala/src/library/scala/collection/generic/BitOperations.scala ./scala-scala/src/library/scala/collection/generic/BitSetFactory.scala ./scala-scala/src/library/scala/collection/generic/CanBuildFrom.scala