Skip to content
This repository was archived by the owner on Jun 23, 2020. It is now read-only.

Commit 873002a

Browse files
paulpadriaanm
authored andcommitted
Cull extraneous whitespace.
One last flurry with the broom before I leave you slobs to code in your own filth. Eliminated all the trailing whitespace I could manage, with special prejudice reserved for the test cases which depended on the preservation of trailing whitespace. Was reminded I cannot figure out how to eliminate the trailing space on the "scala> " prompt in repl transcripts. At least reduced the number of such empty prompts by trimming transcript code on the way in. Routed ConsoleReporter's "printMessage" through a trailing whitespace stripping method which might help futureproof against the future of whitespace diseases. Deleted the up-to-40 lines of trailing whitespace found in various library files. It seems like only yesterday we performed whitespace surgery on the whole repo. Clearly it doesn't stick very well. I suggest it would work better to enforce a few requirements on the way in.
1 parent 74a0a1e commit 873002a

39 files changed

+150
-150
lines changed

test/files/continuations-neg/function0.scala

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@ import scala.util.continuations._
44

55

66
object Test {
7-
7+
88
def main(args: Array[String]): Any = {
9-
9+
1010
val f = () => shift { k: (Int=>Int) => k(7) }
1111
val g: () => Int = f
12-
12+
1313
println(reset(g()))
1414
}
15-
15+
1616
}

test/files/continuations-neg/function2.scala

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@ import scala.util.continuations._
44

55

66
object Test {
7-
7+
88
def main(args: Array[String]): Any = {
9-
9+
1010
val f = () => 7
1111
val g: () => Int @cps[Int] = f
12-
12+
1313
println(reset(g()))
1414
}
15-
15+
1616
}

test/files/continuations-neg/function3.scala

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@ import scala.util.continuations._
44

55

66
object Test {
7-
7+
88
def main(args: Array[String]): Any = {
9-
9+
1010
val g: () => Int = () => shift { k: (Int=>Int) => k(7) }
11-
11+
1212
println(reset(g()))
1313
}
14-
14+
1515
}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
infer2.scala:14: error: illegal answer type modification: scala.util.continuations.cpsParam[String,Int] andThen scala.util.continuations.cpsParam[String,Int]
2-
test { sym(); sym() }
2+
test { sym(); sym() }
33
^
44
one error found

test/files/continuations-neg/infer2.scala

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,16 @@ import scala.util.continuations._
44

55

66
object Test {
7-
7+
88
def test(x: => Int @cpsParam[String,Int]) = 7
9-
9+
1010
def sym() = shift { k: (Int => String) => 9 }
11-
12-
11+
12+
1313
def main(args: Array[String]): Any = {
14-
test { sym(); sym() }
14+
test { sym(); sym() }
1515
}
16-
16+
1717
}
1818

1919

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
1-
import scala.util.continuations._
2-
3-
object Test {
1+
import scala.util.continuations._
2+
3+
object Test {
44

55
def foo() = {
66
lazy val x = shift((k:Unit=>Unit)=>k())
77
println(x)
88
}
9-
10-
def main(args: Array[String]) {
9+
10+
def main(args: Array[String]) {
1111
reset {
1212
foo()
1313
}
14-
}
15-
14+
}
15+
1616
}

test/files/continuations-neg/t2285.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import scala.util.continuations._
55
object Test {
66

77
def bar() = shift { k: (String => String) => k("1") }
8-
8+
99
def foo() = reset { bar(); 7 }
10-
10+
1111
}

test/files/continuations-neg/t2949.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ object Test {
88
def reify[A, B](x : A @cpsParam[List[A], B]) = reset{ List(x) }
99

1010
def main(args: Array[String]): Unit = println(reify {
11-
val x = reflect[Int, Int](List(1,2,3))
11+
val x = reflect[Int, Int](List(1,2,3))
1212
val y = reflect[Int, Int](List(2,4,8))
1313
x * y
1414
})

test/files/continuations-neg/t3628.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import scala.actors.Actor._
33
object Test {
44
val impl: Actor = actor {
55
loop {
6-
react {
6+
react {
77
case 1 => impl ! 2
88
}
99
}

test/files/continuations-neg/trycatch2.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ object Test {
77
def fatal[T]: T = throw new Exception
88
def cpsIntStringInt = shift { k:(Int=>String) => k(3); 7 }
99
def cpsIntIntString = shift { k:(Int=>Int) => k(3); "7" }
10-
10+
1111
def foo1 = try {
1212
fatal[Int]
1313
cpsIntStringInt

0 commit comments

Comments
 (0)