Skip to content

Commit fcdcfdb

Browse files
committed
Replace EmptyTuple implementation from Unit to Tuple0
1 parent 70963ae commit fcdcfdb

File tree

76 files changed

+256
-176
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

76 files changed

+256
-176
lines changed

bench-run/src/main/scala/dotty/tools/benchmarks/tuples/Apply.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ class Apply {
1313
def setup(): Unit = {
1414
val size = sizeAndIndex.split(' ')(0).toInt
1515
index = sizeAndIndex.split(' ')(1).toInt
16-
tuple = "elem" *: ()
16+
tuple = "elem" *: Tuple()
1717

1818
for (i <- 1 until size)
1919
tuple = "elem" *: tuple

bench-run/src/main/scala/dotty/tools/benchmarks/tuples/Concat.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ class Concat {
1111
var tuple2: Tuple = _
1212

1313
def tupleOfSize(n: Int): Tuple = {
14-
var t: Tuple = ()
14+
var t: Tuple = Tuple()
1515
for (i <- 1 to n)
1616
t = "elem" *: t
1717
t

bench-run/src/main/scala/dotty/tools/benchmarks/tuples/Cons.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ class Cons {
1212

1313
@Setup
1414
def setup(): Unit = {
15-
tuple = ()
15+
tuple = Tuple()
1616

1717
for (i <- 1 to size)
1818
tuple = "elem" *: tuple

bench-run/src/main/scala/dotty/tools/benchmarks/tuples/Conversions.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ class Conversions {
1212

1313
@Setup
1414
def setup(): Unit = {
15-
tuple = ()
15+
tuple = Tuple()
1616

1717
for (i <- 1 to size)
1818
tuple = "elem" *: tuple

bench-run/src/main/scala/dotty/tools/benchmarks/tuples/Map.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ class Map {
1111

1212
@Setup
1313
def setup(): Unit = {
14-
tuple = ()
14+
tuple = Tuple()
1515

1616
for (i <- 1 to size)
1717
tuple = "elem" *: tuple

bench-run/src/main/scala/dotty/tools/benchmarks/tuples/Tail.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ class Tail {
1111

1212
@Setup
1313
def setup(): Unit = {
14-
tuple = "elem" *: ()
14+
tuple = "elem" *: Tuple()
1515

1616
for (i <- 1 until size)
1717
tuple = "elem" *: tuple

bench-run/src/main/scala/dotty/tools/benchmarks/tuples/TupleOps.scala

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@ class TupleOps {
1111

1212
@Setup
1313
def setup(): Unit = {
14-
tuple1 = ()
14+
tuple1 = Tuple()
1515
for (i <- 1 until 15)
1616
tuple1 = s"elem$i" *: tuple1
1717

18-
tuple2 = ()
18+
tuple2 = Tuple()
1919
for (i <- 1 until 10)
2020
tuple2 = s"elem$i" *: tuple2
2121

@@ -25,23 +25,23 @@ class TupleOps {
2525

2626
def tupleFlatMap(tuple: Tuple, f: [A] => A => Tuple): Tuple = {
2727
def tailRecFlatMap(t: Tuple, acc: Tuple): Tuple = t match {
28-
case () => acc
28+
case Tuple() => acc
2929
case x *: rest => tailRecFlatMap(rest, acc ++ f(x))
3030
}
31-
tailRecFlatMap(tuple, ())
31+
tailRecFlatMap(tuple, Tuple())
3232
}
3333

3434
def tupleReverse(tuple: Tuple): Tuple = {
3535
def tailRecReverse(t: Tuple, acc: Tuple): Tuple = t match {
36-
case () => acc
36+
case Tuple() => acc
3737
case x *: rest => tailRecReverse(rest, x *: acc)
3838
}
39-
tailRecReverse(tuple, ())
39+
tailRecReverse(tuple, Tuple())
4040
}
4141

4242
def tupleMerge(tuple1: Tuple, tuple2: Tuple): Tuple = (tuple1, tuple2) match {
43-
case (_, ()) => tuple1
44-
case ((), _) => tuple2
43+
case (_, Tuple()) => tuple1
44+
case (Tuple(), _) => tuple2
4545
case (x *: xs, y *: ys) =>
4646
if (x.asInstanceOf[Int] <= y.asInstanceOf[Int]) x *: tupleMerge(xs, tuple2)
4747
else y *: tupleMerge(tuple1, ys)

bench-run/src/main/scala/dotty/tools/benchmarks/tuples/Zip.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ class Zip {
1313

1414
@Setup
1515
def setup(): Unit = {
16-
tuple1 = ()
17-
tuple2 = ()
16+
tuple1 = Tuple()
17+
tuple2 = Tuple()
1818

1919
for (i <- 1 to size) {
2020
tuple1 = "el" *: tuple1

bench-run/src/main/scala/tuples/Drop.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ class Drop {
1212

1313
@Setup
1414
def setup(): Unit = {
15-
tuple = ()
15+
tuple = Tuple()
1616
half = size / 2
1717

1818
for (i <- 1 to size)

bench-run/src/main/scala/tuples/Split.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ class Split {
1212

1313
@Setup
1414
def setup(): Unit = {
15-
tuple = ()
15+
tuple = Tuple()
1616
half = size / 2
1717

1818
for (i <- 1 to size)

0 commit comments

Comments
 (0)