Skip to content

Make dotty compile with 2.12.3 #2827

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 21 commits into from
Aug 22, 2017
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions compiler/test/dotty/tools/ShowClassTests.scala
Original file line number Diff line number Diff line change
Expand Up @@ -64,14 +64,14 @@ class ShowClassTests extends DottyTest {
if (blackList contains path)
debug_println(s"blacklisted package: $path")
else {
for (
sym <- pkg.info.decls if sym.owner == pkg.moduleClass && !(sym.name.toString contains '$')
) {
debug_println(s"showing $sym in ${pkg.fullName}")
if (sym is PackageVal) showPackage(sym.asTerm)
else if (sym.isClass && !(sym is Module)) showClass(sym)
else if (sym is ModuleVal) showClass(sym.moduleClass)
}
pkg.info.decls
.filter(sym => sym.owner == pkg.moduleClass && !(sym.name.toString contains '$'))
.foreach { sym =>
debug_println(s"showing $sym in ${pkg.fullName}")
if (sym is PackageVal) showPackage(sym.asTerm)
else if (sym.isClass && !(sym is Module)) showClass(sym)
else if (sym is ModuleVal) showClass(sym.moduleClass)
}
}
}

Expand Down
14 changes: 13 additions & 1 deletion library/src/dotty/runtime/LazyVals.scala
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,19 @@ import scala.annotation.tailrec
* Helper methods used in thread-safe lazy vals.
*/
object LazyVals {
private val unsafe = scala.concurrent.util.Unsafe.instance
private val unsafe: sun.misc.Unsafe =
classOf[sun.misc.Unsafe].getDeclaredFields.find { field =>
field.getType == classOf[sun.misc.Unsafe] && {
field.setAccessible(true)
true
}
}
.map(_.get(null).asInstanceOf[sun.misc.Unsafe])
.getOrElse {
throw new ExceptionInInitializerError {
new IllegalStateException("Can't find instance of sun.misc.Unsafe")
}
}

final val BITS_PER_LAZY_VAL = 2L
final val LAZY_VAL_MASK = 3L
Expand Down
5 changes: 2 additions & 3 deletions library/src/scala/compat/java8/JFunction1.java
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,12 @@ public interface JFunction1<T1, R> extends scala.Function1<T1, R> {
@Override
@SuppressWarnings("unchecked")
default <A> scala.Function1<T1, A> andThen(scala.Function1<R, A> g) {
return scala.Function1$class.andThen(this, g);
return x -> g.apply(this.apply(x));
}

@Override
@SuppressWarnings("unchecked")
default <A> scala.Function1<A, R> compose(scala.Function1<A, T1> g) {
return scala.Function1$class.compose(this, g);
return x -> this.apply(g.apply(x));
}
@SuppressWarnings("unchecked")
default void apply$mcVI$sp(int v1) {
Expand Down
4 changes: 2 additions & 2 deletions library/src/scala/compat/java8/JFunction10.java
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@ public interface JFunction10<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, R> extends

@SuppressWarnings("unchecked")
default scala.Function1<T1, scala.Function1<T2, scala.Function1<T3, scala.Function1<T4, scala.Function1<T5, scala.Function1<T6, scala.Function1<T7, scala.Function1<T8, scala.Function1<T9, scala.Function1<T10, R>>>>>>>>>> curried() {
return scala.Function10$class.curried(this);
throw new UnsupportedOperationException("todo");
}

@SuppressWarnings("unchecked")
default scala.Function1<scala.Tuple10<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10>, R> tupled() {
return scala.Function10$class.tupled(this);
throw new UnsupportedOperationException("todo");
}


Expand Down
4 changes: 2 additions & 2 deletions library/src/scala/compat/java8/JFunction11.java
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@ public interface JFunction11<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, R> ex

@SuppressWarnings("unchecked")
default scala.Function1<T1, scala.Function1<T2, scala.Function1<T3, scala.Function1<T4, scala.Function1<T5, scala.Function1<T6, scala.Function1<T7, scala.Function1<T8, scala.Function1<T9, scala.Function1<T10, scala.Function1<T11, R>>>>>>>>>>> curried() {
return scala.Function11$class.curried(this);
throw new UnsupportedOperationException("todo");
}

@SuppressWarnings("unchecked")
default scala.Function1<scala.Tuple11<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11>, R> tupled() {
return scala.Function11$class.tupled(this);
throw new UnsupportedOperationException("todo");
}


Expand Down
4 changes: 2 additions & 2 deletions library/src/scala/compat/java8/JFunction12.java
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@ public interface JFunction12<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12,

@SuppressWarnings("unchecked")
default scala.Function1<T1, scala.Function1<T2, scala.Function1<T3, scala.Function1<T4, scala.Function1<T5, scala.Function1<T6, scala.Function1<T7, scala.Function1<T8, scala.Function1<T9, scala.Function1<T10, scala.Function1<T11, scala.Function1<T12, R>>>>>>>>>>>> curried() {
return scala.Function12$class.curried(this);
throw new UnsupportedOperationException("todo");
}

@SuppressWarnings("unchecked")
default scala.Function1<scala.Tuple12<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12>, R> tupled() {
return scala.Function12$class.tupled(this);
throw new UnsupportedOperationException("todo");
}


Expand Down
4 changes: 2 additions & 2 deletions library/src/scala/compat/java8/JFunction13.java
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@ public interface JFunction13<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12,

@SuppressWarnings("unchecked")
default scala.Function1<T1, scala.Function1<T2, scala.Function1<T3, scala.Function1<T4, scala.Function1<T5, scala.Function1<T6, scala.Function1<T7, scala.Function1<T8, scala.Function1<T9, scala.Function1<T10, scala.Function1<T11, scala.Function1<T12, scala.Function1<T13, R>>>>>>>>>>>>> curried() {
return scala.Function13$class.curried(this);
throw new UnsupportedOperationException("todo");
}

@SuppressWarnings("unchecked")
default scala.Function1<scala.Tuple13<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13>, R> tupled() {
return scala.Function13$class.tupled(this);
throw new UnsupportedOperationException("todo");
}


Expand Down
4 changes: 2 additions & 2 deletions library/src/scala/compat/java8/JFunction14.java
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@ public interface JFunction14<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12,

@SuppressWarnings("unchecked")
default scala.Function1<T1, scala.Function1<T2, scala.Function1<T3, scala.Function1<T4, scala.Function1<T5, scala.Function1<T6, scala.Function1<T7, scala.Function1<T8, scala.Function1<T9, scala.Function1<T10, scala.Function1<T11, scala.Function1<T12, scala.Function1<T13, scala.Function1<T14, R>>>>>>>>>>>>>> curried() {
return scala.Function14$class.curried(this);
throw new UnsupportedOperationException("todo");
}

@SuppressWarnings("unchecked")
default scala.Function1<scala.Tuple14<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14>, R> tupled() {
return scala.Function14$class.tupled(this);
throw new UnsupportedOperationException("todo");
}


Expand Down
4 changes: 2 additions & 2 deletions library/src/scala/compat/java8/JFunction15.java
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@ public interface JFunction15<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12,

@SuppressWarnings("unchecked")
default scala.Function1<T1, scala.Function1<T2, scala.Function1<T3, scala.Function1<T4, scala.Function1<T5, scala.Function1<T6, scala.Function1<T7, scala.Function1<T8, scala.Function1<T9, scala.Function1<T10, scala.Function1<T11, scala.Function1<T12, scala.Function1<T13, scala.Function1<T14, scala.Function1<T15, R>>>>>>>>>>>>>>> curried() {
return scala.Function15$class.curried(this);
throw new UnsupportedOperationException("todo");
}

@SuppressWarnings("unchecked")
default scala.Function1<scala.Tuple15<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15>, R> tupled() {
return scala.Function15$class.tupled(this);
throw new UnsupportedOperationException("todo");
}


Expand Down
4 changes: 2 additions & 2 deletions library/src/scala/compat/java8/JFunction16.java
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@ public interface JFunction16<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12,

@SuppressWarnings("unchecked")
default scala.Function1<T1, scala.Function1<T2, scala.Function1<T3, scala.Function1<T4, scala.Function1<T5, scala.Function1<T6, scala.Function1<T7, scala.Function1<T8, scala.Function1<T9, scala.Function1<T10, scala.Function1<T11, scala.Function1<T12, scala.Function1<T13, scala.Function1<T14, scala.Function1<T15, scala.Function1<T16, R>>>>>>>>>>>>>>>> curried() {
return scala.Function16$class.curried(this);
throw new UnsupportedOperationException("todo");
}

@SuppressWarnings("unchecked")
default scala.Function1<scala.Tuple16<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16>, R> tupled() {
return scala.Function16$class.tupled(this);
throw new UnsupportedOperationException("todo");
}


Expand Down
4 changes: 2 additions & 2 deletions library/src/scala/compat/java8/JFunction17.java
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@ public interface JFunction17<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12,

@SuppressWarnings("unchecked")
default scala.Function1<T1, scala.Function1<T2, scala.Function1<T3, scala.Function1<T4, scala.Function1<T5, scala.Function1<T6, scala.Function1<T7, scala.Function1<T8, scala.Function1<T9, scala.Function1<T10, scala.Function1<T11, scala.Function1<T12, scala.Function1<T13, scala.Function1<T14, scala.Function1<T15, scala.Function1<T16, scala.Function1<T17, R>>>>>>>>>>>>>>>>> curried() {
return scala.Function17$class.curried(this);
throw new UnsupportedOperationException("todo");
}

@SuppressWarnings("unchecked")
default scala.Function1<scala.Tuple17<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17>, R> tupled() {
return scala.Function17$class.tupled(this);
throw new UnsupportedOperationException("todo");
}


Expand Down
4 changes: 2 additions & 2 deletions library/src/scala/compat/java8/JFunction18.java
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@ public interface JFunction18<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12,

@SuppressWarnings("unchecked")
default scala.Function1<T1, scala.Function1<T2, scala.Function1<T3, scala.Function1<T4, scala.Function1<T5, scala.Function1<T6, scala.Function1<T7, scala.Function1<T8, scala.Function1<T9, scala.Function1<T10, scala.Function1<T11, scala.Function1<T12, scala.Function1<T13, scala.Function1<T14, scala.Function1<T15, scala.Function1<T16, scala.Function1<T17, scala.Function1<T18, R>>>>>>>>>>>>>>>>>> curried() {
return scala.Function18$class.curried(this);
throw new UnsupportedOperationException("todo");
}

@SuppressWarnings("unchecked")
default scala.Function1<scala.Tuple18<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18>, R> tupled() {
return scala.Function18$class.tupled(this);
throw new UnsupportedOperationException("todo");
}


Expand Down
4 changes: 2 additions & 2 deletions library/src/scala/compat/java8/JFunction19.java
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@ public interface JFunction19<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12,

@SuppressWarnings("unchecked")
default scala.Function1<T1, scala.Function1<T2, scala.Function1<T3, scala.Function1<T4, scala.Function1<T5, scala.Function1<T6, scala.Function1<T7, scala.Function1<T8, scala.Function1<T9, scala.Function1<T10, scala.Function1<T11, scala.Function1<T12, scala.Function1<T13, scala.Function1<T14, scala.Function1<T15, scala.Function1<T16, scala.Function1<T17, scala.Function1<T18, scala.Function1<T19, R>>>>>>>>>>>>>>>>>>> curried() {
return scala.Function19$class.curried(this);
throw new UnsupportedOperationException("todo");
}

@SuppressWarnings("unchecked")
default scala.Function1<scala.Tuple19<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19>, R> tupled() {
return scala.Function19$class.tupled(this);
throw new UnsupportedOperationException("todo");
}


Expand Down
15 changes: 13 additions & 2 deletions library/src/scala/compat/java8/JFunction2.java
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,30 @@

package scala.compat.java8;

import scala.MatchError;

@FunctionalInterface
public interface JFunction2<T1, T2, R> extends scala.Function2<T1, T2, R> {
default void $init$() {
};

@SuppressWarnings("unchecked")
default scala.Function1<T1, scala.Function1<T2, R>> curried() {
return scala.Function2$class.curried(this);
return x1 -> x2 -> apply(x1, x2);
}

@SuppressWarnings("unchecked")
default scala.Function1<scala.Tuple2<T1, T2>, R> tupled() {
return scala.Function2$class.tupled(this);
return x0$1 -> {
if (x0$1 == null) {
throw new MatchError(x0$1);
}
T1 x1 = x0$1._1();
T2 x2 = x0$1._2();
R r = this.apply(x1, x2);
return r;
}
;
}

@SuppressWarnings("unchecked")
Expand Down
4 changes: 2 additions & 2 deletions library/src/scala/compat/java8/JFunction20.java
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@ public interface JFunction20<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12,

@SuppressWarnings("unchecked")
default scala.Function1<T1, scala.Function1<T2, scala.Function1<T3, scala.Function1<T4, scala.Function1<T5, scala.Function1<T6, scala.Function1<T7, scala.Function1<T8, scala.Function1<T9, scala.Function1<T10, scala.Function1<T11, scala.Function1<T12, scala.Function1<T13, scala.Function1<T14, scala.Function1<T15, scala.Function1<T16, scala.Function1<T17, scala.Function1<T18, scala.Function1<T19, scala.Function1<T20, R>>>>>>>>>>>>>>>>>>>> curried() {
return scala.Function20$class.curried(this);
throw new UnsupportedOperationException("todo");
}

@SuppressWarnings("unchecked")
default scala.Function1<scala.Tuple20<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20>, R> tupled() {
return scala.Function20$class.tupled(this);
throw new UnsupportedOperationException("todo");
}


Expand Down
4 changes: 2 additions & 2 deletions library/src/scala/compat/java8/JFunction21.java
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@ public interface JFunction21<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12,

@SuppressWarnings("unchecked")
default scala.Function1<T1, scala.Function1<T2, scala.Function1<T3, scala.Function1<T4, scala.Function1<T5, scala.Function1<T6, scala.Function1<T7, scala.Function1<T8, scala.Function1<T9, scala.Function1<T10, scala.Function1<T11, scala.Function1<T12, scala.Function1<T13, scala.Function1<T14, scala.Function1<T15, scala.Function1<T16, scala.Function1<T17, scala.Function1<T18, scala.Function1<T19, scala.Function1<T20, scala.Function1<T21, R>>>>>>>>>>>>>>>>>>>>> curried() {
return scala.Function21$class.curried(this);
throw new UnsupportedOperationException("todo");
}

@SuppressWarnings("unchecked")
default scala.Function1<scala.Tuple21<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21>, R> tupled() {
return scala.Function21$class.tupled(this);
throw new UnsupportedOperationException("todo");
}


Expand Down
4 changes: 2 additions & 2 deletions library/src/scala/compat/java8/JFunction22.java
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@ public interface JFunction22<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12,

@SuppressWarnings("unchecked")
default scala.Function1<T1, scala.Function1<T2, scala.Function1<T3, scala.Function1<T4, scala.Function1<T5, scala.Function1<T6, scala.Function1<T7, scala.Function1<T8, scala.Function1<T9, scala.Function1<T10, scala.Function1<T11, scala.Function1<T12, scala.Function1<T13, scala.Function1<T14, scala.Function1<T15, scala.Function1<T16, scala.Function1<T17, scala.Function1<T18, scala.Function1<T19, scala.Function1<T20, scala.Function1<T21, scala.Function1<T22, R>>>>>>>>>>>>>>>>>>>>>> curried() {
return scala.Function22$class.curried(this);
throw new UnsupportedOperationException("todo");
}

@SuppressWarnings("unchecked")
default scala.Function1<scala.Tuple22<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22>, R> tupled() {
return scala.Function22$class.tupled(this);
throw new UnsupportedOperationException("todo");
}


Expand Down
16 changes: 14 additions & 2 deletions library/src/scala/compat/java8/JFunction3.java
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,31 @@

package scala.compat.java8;

import scala.MatchError;

@FunctionalInterface
public interface JFunction3<T1, T2, T3, R> extends scala.Function3<T1, T2, T3, R> {
default void $init$() {
};

@SuppressWarnings("unchecked")
default scala.Function1<T1, scala.Function1<T2, scala.Function1<T3, R>>> curried() {
return scala.Function3$class.curried(this);
return x1 -> x2 -> x3 -> apply(x1, x2, x3);
}

@SuppressWarnings("unchecked")
default scala.Function1<scala.Tuple3<T1, T2, T3>, R> tupled() {
return scala.Function3$class.tupled(this);
return x0$1 -> {
if (x0$1 == null) {
throw new MatchError(x0$1);
}
T1 x1 = x0$1._1();
T2 x2 = x0$1._2();
T3 x3 = x0$1._3();
R r = this.apply(x1, x2, x3);
return r;
}
;
}


Expand Down
17 changes: 15 additions & 2 deletions library/src/scala/compat/java8/JFunction4.java
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,32 @@

package scala.compat.java8;

import scala.MatchError;

@FunctionalInterface
public interface JFunction4<T1, T2, T3, T4, R> extends scala.Function4<T1, T2, T3, T4, R> {
default void $init$() {
};

@SuppressWarnings("unchecked")
default scala.Function1<T1, scala.Function1<T2, scala.Function1<T3, scala.Function1<T4, R>>>> curried() {
return scala.Function4$class.curried(this);
return x1 -> x2 -> x3 -> x4 -> apply(x1, x2, x3, x4);
}

@SuppressWarnings("unchecked")
default scala.Function1<scala.Tuple4<T1, T2, T3, T4>, R> tupled() {
return scala.Function4$class.tupled(this);
return x0$1 -> {
if (x0$1 == null) {
throw new MatchError(x0$1);
}
T1 x1 = x0$1._1();
T2 x2 = x0$1._2();
T3 x3 = x0$1._3();
T4 x4 = x0$1._4();
R r = this.apply(x1, x2, x3, x4);
return r;
}
;
}


Expand Down
6 changes: 4 additions & 2 deletions library/src/scala/compat/java8/JFunction5.java
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,21 @@

package scala.compat.java8;

import scala.MatchError;

@FunctionalInterface
public interface JFunction5<T1, T2, T3, T4, T5, R> extends scala.Function5<T1, T2, T3, T4, T5, R> {
default void $init$() {
};

@SuppressWarnings("unchecked")
default scala.Function1<T1, scala.Function1<T2, scala.Function1<T3, scala.Function1<T4, scala.Function1<T5, R>>>>> curried() {
return scala.Function5$class.curried(this);
throw new UnsupportedOperationException("todo");
}

@SuppressWarnings("unchecked")
default scala.Function1<scala.Tuple5<T1, T2, T3, T4, T5>, R> tupled() {
return scala.Function5$class.tupled(this);
throw new UnsupportedOperationException("todo");
}


Expand Down
Loading