diff options
| author | Martin Odersky <odersky@gmail.com> | 2007-02-05 16:18:55 +0000 |
|---|---|---|
| committer | Martin Odersky <odersky@gmail.com> | 2007-02-05 16:18:55 +0000 |
| commit | 912077c5f8d59b2585a3a5014c193a8399b672d1 (patch) | |
| tree | 5da612486be4b8204fcf55c1f8ab57fc6b4caec9 /src/library/scala/text | |
| parent | 9304e2a7a6923b2b81f1e76cae408a6ef195bff0 (diff) | |
| download | scala-912077c5f8d59b2585a3a5014c193a8399b672d1.tar.gz scala-912077c5f8d59b2585a3a5014c193a8399b672d1.tar.bz2 scala-912077c5f8d59b2585a3a5014c193a8399b672d1.zip | |
changed pair(...) to {...}
Diffstat (limited to 'src/library/scala/text')
| -rw-r--r-- | src/library/scala/text/Document.scala | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/src/library/scala/text/Document.scala b/src/library/scala/text/Document.scala index 70e7bc8fc7..4818c342fd 100644 --- a/src/library/scala/text/Document.scala +++ b/src/library/scala/text/Document.scala @@ -50,20 +50,20 @@ abstract class Document { false case List() => true - case Triple(_, _, DocNil) :: z => + case {_, _, DocNil} :: z => fits(w, z) - case Triple(i, b, DocCons(h, t)) :: z => - fits(w, Triple(i,b,h) :: Triple(i,b,t) :: z) - case Triple(_, _, DocText(t)) :: z => + case {i, b, DocCons(h, t)} :: z => + fits(w, {i,b,h} :: {i,b,t} :: z) + case {_, _, DocText(t)} :: z => fits(w - t.length(), z) - case Triple(i, b, DocNest(ii, d)) :: z => - fits(w, Triple(i + ii, b, d) :: z) - case Triple(_, false, DocBreak) :: z => + case {i, b, DocNest(ii, d)} :: z => + fits(w, {i + ii, b, d} :: z) + case {_, false, DocBreak} :: z => fits(w - 1, z) - case Triple(_, true, DocBreak) :: z => + case {_, true, DocBreak} :: z => true - case Triple(i, _, DocGroup(d)) :: z => - fits(w, Triple(i, false, d) :: z) + case {i, _, DocGroup(d)} :: z => + fits(w, {i, false, d} :: z) } def spaces(n: Int): Unit = { @@ -77,28 +77,28 @@ abstract class Document { def fmt(k: Int, state: List[FmtState]): Unit = state match { case List() => () - case Triple(_, _, DocNil) :: z => + case {_, _, DocNil} :: z => fmt(k, z) - case Triple(i, b, DocCons(h, t)) :: z => - fmt(k, Triple(i, b, h) :: Triple(i, b, t) :: z) - case Triple(i, _, DocText(t)) :: z => + case {i, b, DocCons(h, t)} :: z => + fmt(k, {i, b, h} :: {i, b, t} :: z) + case {i, _, DocText(t)} :: z => writer write t fmt(k + t.length(), z) - case Triple(i, b, DocNest(ii, d)) :: z => - fmt(k, Triple(i + ii, b, d) :: z) - case Triple(i, true, DocBreak) :: z => + case {i, b, DocNest(ii, d)} :: z => + fmt(k, {i + ii, b, d} :: z) + case {i, true, DocBreak} :: z => writer write "\n" spaces(i); fmt(i, z) - case Triple(i, false, DocBreak) :: z => + case {i, false, DocBreak} :: z => writer write " " fmt(k + 1, z) - case Triple(i, b, DocGroup(d)) :: z => - val fitsFlat = fits(width - k, Triple(i, false, d) :: z) - fmt(k, Triple(i, !fitsFlat, d) :: z) + case {i, b, DocGroup(d)} :: z => + val fitsFlat = fits(width - k, {i, false, d} :: z) + fmt(k, {i, !fitsFlat, d} :: z) } - fmt(0, Triple(0, false, DocGroup(this)) :: Nil) + fmt(0, {0, false, DocGroup(this)} :: Nil) } } |