Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit 1b7f1eb

Browse files
Merge pull request #637 from dubinsky/remove-semicolons
2 parents bc88d21 + eaccb88 commit 1b7f1eb

Some content is hidden

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

45 files changed

+230
-229
lines changed

‎jvm/src/test/scala-2.x/scala/xml/CompilerErrors.scala‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ class CompilerTesting {
202202

203203
def expectXmlErrors(msgCount: Int, msg: String, code: String) = {
204204
val errors = xmlErrorMessages(msg, code)
205-
val errorCount = errors.filter(_ contains msg).length
205+
val errorCount = errors.count(_ contains msg)
206206
assert(errorCount == msgCount, s"$errorCount occurrences of \'$msg\' found -- expected $msgCount in:\n${errors mkString "\n"}")
207207
}
208208
}

‎jvm/src/test/scala/scala/xml/ReuseNodesTest.scala‎

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@ object ReuseNodesTest {
2020
class OriginalTranformr(rules: RewriteRule*) extends RuleTransformer(rules:_*) {
2121
override def transform(ns: Seq[Node]): Seq[Node] = {
2222
val xs = ns.toStream map transform
23-
val (xs1, xs2) = xszip ns span { case (x, n) => unchanged(n, x) }
23+
val (xs1, xs2) = xs.zip(ns).span { case (x, n) => unchanged(n, x) }
2424

2525
if (xs2.isEmpty) ns
26-
else (xs1map(_._2)) ++ xs2.head._1 ++ transform(nsdrop(xs1.length + 1))
26+
else xs1.map(_._2) ++ xs2.head._1 ++ transform(ns.drop(xs1.length + 1))
2727
}
28-
override def transform(n:Node): Seq[Node] = super.transform(n)
28+
override def transform(n:Node): Seq[Node] = super.transform(n)
2929
}
3030

3131
class ModifiedTranformr(rules: RewriteRule*) extends RuleTransformer(rules:_*) {
@@ -35,18 +35,18 @@ object ReuseNodesTest {
3535
if (changed.length != ns.length || changed.zip(ns).exists(p => p._1 != p._2)) changed
3636
else ns
3737
}
38-
override def transform(n:Node): Seq[Node] = super.transform(n)
38+
override def transform(n:Node): Seq[Node] = super.transform(n)
3939
}
4040

4141
class AlternateTranformr(rules: RewriteRule*) extends RuleTransformer(rules:_*) {
4242
override def transform(ns: Seq[Node]): Seq[Node] = {
43-
val xs = ns.toStreammaptransform
44-
val (xs1, xs2) = xszip ns span { case (x, n) => unchanged(n, x) }
43+
val xs = ns.toStream.map(transform)
44+
val (xs1, xs2) = xs.zip(ns).span { case (x, n) => unchanged(n, x) }
4545

4646
if (xs2.isEmpty) ns
47-
else (xs1map(_._2)) ++ xs2.head._1 ++ transform(nsdrop(xs1.length + 1))
47+
else xs1.map(_._2) ++ xs2.head._1 ++ transform(ns.drop(xs1.length + 1))
4848
}
49-
override def transform(n:Node): Seq[Node] = super.transform(n)
49+
override def transform(n:Node): Seq[Node] = super.transform(n)
5050
}
5151

5252
def rewriteRule = new RewriteRule {
@@ -68,34 +68,33 @@ object ReuseNodesTest {
6868
class ReuseNodesTest {
6969

7070
@Theory
71-
def transformReferentialEquality(rt:RuleTransformer) = {
71+
def transformReferentialEquality(rt:RuleTransformer) = {
7272
val original = <p><lost/></p>
7373
val tranformed = rt.transform(original)
7474
assertSame(original, tranformed)
7575
}
7676

7777
@Theory
78-
def transformReferentialEqualityOnly(rt:RuleTransformer) = {
78+
def transformReferentialEqualityOnly(rt:RuleTransformer) = {
7979
val original = <changed><change><lost/><a><b><c/></b></a></change><a><b><c/></b></a></changed>
8080
val transformed = rt.transform(original)
8181
recursiveAssert(original,transformed)
8282
}
8383

84-
def recursiveAssert(original:Seq[Node], transformed:Seq[Node]):Unit = {
85-
originalziptransformedforeach {
84+
def recursiveAssert(original:Seq[Node], transformed:Seq[Node]):Unit = {
85+
original.zip(transformed).foreach {
8686
case (x, y) => recursiveAssert(x, y)
8787
}
8888
}
8989

90-
def recursiveAssert(original:Node, transformed:Node):Unit = {
90+
def recursiveAssert(original:Node, transformed:Node):Unit = {
9191
transformed.label match {
9292
case "changed" => // do nothing expect this node to be changed
9393
recursiveAssert(original.child,transformed.child)
94-
case _ => {
94+
case _ =>
9595
assertSame(original, transformed)
96-
// No need to check for children, node being immuatable
96+
// No need to check for children, node being immuatable
9797
// children can't be different if parents are referentially equal
98-
}
9998
}
10099
}
101100
}

‎jvm/src/test/scala/scala/xml/XMLSyntaxTest.scala‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@ class XMLSyntaxTestJVM {
1212
object parser extends xml.parsing.ConstructingParser(s, false /*ignore ws*/) {
1313
override def replacementText(entityName: String): io.Source = {
1414
entityName match {
15-
case "nbsp" => io.Source.fromString("\u0160");
16-
case _ => super.replacementText(entityName);
15+
case "nbsp" => io.Source.fromString("\u0160")
16+
case _ => super.replacementText(entityName)
1717
}
1818
}
19-
nextch(); // !!important, to initialize the parser
19+
nextch() // !!important, to initialize the parser
2020
}
2121
val parsed = parser.element(TopScope) // parse the source as element
2222
// alternatively, we could call document()

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /