Skip to content

Commit ffbef1d

Browse files
committed
compiles with 2.13; dotty still crashes
1 parent 0bcd3cd commit ffbef1d

File tree

18 files changed

+161
-194
lines changed

18 files changed

+161
-194
lines changed

DottyLucre/adjunct/src/main/scala/de/sciss/lucre/adjunct/Adjunct.scala renamed to DottyLucre/adjunct/src/main/scala/de/sciss/lucre/Adjunct.scala

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,9 @@
1111
1212
*/
1313

14-
package de.sciss.lucre.adjunct
14+
package de.sciss.lucre
1515

16-
import de.sciss.lucre.TRandom
17-
import de.sciss.lucre.adjunct.impl.{ScalarEqImpl, ScalarToNumImpl, SeqLikeEq, SeqLikeNum, SeqLikeNumDouble, SeqLikeNumFrac, SeqLikeToNum}
16+
import de.sciss.lucre.impl.{ScalarEqImpl, ScalarToNumImpl, SeqLikeEq, SeqLikeNum, SeqLikeNumDouble, SeqLikeNumFrac, SeqLikeToNum}
1817
import de.sciss.numbers.{DoubleFunctions => rd, IntFunctions => ri, IntFunctions2 => ri2, LongFunctions => rl, LongFunctions2 => rl2}
1918
import de.sciss.serial.{DataInput, DataOutput, Writable}
2019

@@ -923,6 +922,10 @@ object Adjunct {
923922

924923
sealed trait Primitive extends Adjunct
925924

925+
trait Context[T <: Exec[T]] {
926+
// /** Creates a new pseudo-random number generator. */
927+
// def mkRandom(ref: AnyRef /* seed: Long = -1L */)(implicit tx: S#Tx): TxnRandom[S]
928+
}
926929
}
927930
/* sealed */ trait Adjunct extends Writable {
928931
def id: Int
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
package de.sciss.lucre
2+
3+
trait ProductWithAdjuncts extends Product {
4+
def adjuncts: List[Adjunct]
5+
}

DottyLucre/adjunct/src/main/scala/de/sciss/lucre/adjunct/Context.scala

Lines changed: 0 additions & 20 deletions
This file was deleted.

DottyLucre/adjunct/src/main/scala/de/sciss/lucre/adjunct/ProductWithAdjuncts.scala

Lines changed: 0 additions & 18 deletions
This file was deleted.

DottyLucre/adjunct/src/main/scala/de/sciss/lucre/adjunct/impl/AdjunctImpl.scala renamed to DottyLucre/adjunct/src/main/scala/de/sciss/lucre/impl/AdjunctImpl.scala

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,10 @@
1111
1212
*/
1313

14-
package de.sciss.lucre.adjunct
14+
package de.sciss.lucre
1515
package impl
1616

17-
import de.sciss.lucre.adjunct.Adjunct.{Eq, HasDefault, Num, NumDouble, NumFrac, Ord, Scalar, ScalarEq, ScalarNum, ScalarNumDouble, ScalarNumFrac, ScalarOrd, ScalarToNum, ToNum}
18-
import de.sciss.lucre.TRandom
17+
import de.sciss.lucre.Adjunct._
1918

2019
trait SeqLike[A] extends HasDefault[Seq[A]] {
2120
final type Boolean = Seq[scala.Boolean ]

DottyLucre/adjunct/src/test/scala/de/sciss/lucre/adjunct/TypeClassesLookup.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package de.sciss.lucre.adjunct
22

3-
import de.sciss.lucre.adjunct.Adjunct.{FromAny, HasDefault}
3+
import de.sciss.lucre.Adjunct.{FromAny, HasDefault}
44

55
trait TypeClassesLookup {
66
implicitly[FromAny[Int]]

DottyLucre/base/src/main/scala/de/sciss/lucre/impl/PlainImpl.scala

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -156,12 +156,12 @@ object PlainImpl {
156156
// def newInMemoryMap[K, V]: RefMap[S, K, V] = new PlainInMemoryMap[K, V]
157157
// def newInMemorySet[A] : RefSet[S, A] = new PlainInMemorySet[A]
158158

159-
def readVar[A](id: Id, in: DataInput)(implicit serializer: TSerializer[Tx,/* Acc,*/ A]): Var[A] =
160-
opNotSupported("readVar")
161-
162-
def readBooleanVar(id: Id, in: DataInput): Var[Boolean] = opNotSupported("readBooleanVar")
163-
def readIntVar (id: Id, in: DataInput): Var[Int] = opNotSupported("readIntVar")
164-
def readLongVar (id: Id, in: DataInput): Var[Long] = opNotSupported("readLongVar")
159+
// def readVar[A](id: Id, in: DataInput)(implicit serializer: TSerializer[Tx,/* Acc,*/ A]): Var[A] =
160+
// opNotSupported("readVar")
161+
//
162+
// def readBooleanVar(id: Id, in: DataInput): Var[Boolean] = opNotSupported("readBooleanVar")
163+
// def readIntVar (id: Id, in: DataInput): Var[Int] = opNotSupported("readIntVar")
164+
// def readLongVar (id: Id, in: DataInput): Var[Long] = opNotSupported("readLongVar")
165165

166166
def newHandle[A](value: A)(implicit serializer: TSerializer[Tx,/* Acc,*/ A]): TSource[Tx, A] =
167167
new EphemeralTSource(value)

DottyLucre/build.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ lazy val commonSettings = Seq(
3636
organization := "de.sciss",
3737
description := "Extension of Scala-STM, adding optional durability layer, and providing API for confluent and reactive event layers",
3838
homepage := Some(url(s"https://git.iem.at/sciss/$baseName")),
39-
scalaVersion := "0.27.0-RC1", // "2.13.3",
39+
scalaVersion := "2.13.3", // "0.27.0-RC1",
4040
crossScalaVersions := Seq("0.27.0-RC1", "2.13.3"), // "2.12.12",
4141
scalacOptions ++= Seq(
4242
"-Xlint", "-deprecation", "-unchecked", "-feature", "-encoding", "utf8", "-Xsource:2.13"

0 commit comments

Comments
 (0)