Skip to content

Commit 26af21d

Browse files
dubinskydubinsky
authored
Merge pull request #672 from dubinsky/infix-postfix-cleanup
Change infix method calls `o m a` to `o.m(a)`.
2 parents 0b5a0b7 + ad7a007 commit 26af21d

Some content is hidden

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

48 files changed

+309
-318
lines changed

‎build.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ lazy val xml = crossProject(JSPlatform, JVMPlatform, NativePlatform)
9393
file(jarPath)
9494
-> url("http://docs.oracle.com/javase/8/docs/api")
9595
)
96-
} getOrElse {
96+
}.getOrElse {
9797
// If everything fails, jam in Java 11 modules.
9898
Map(
9999
file("/modules/java.base")

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -197,12 +197,12 @@ class CompilerTesting {
197197

198198
def expectXmlError(msg: String, code: String): Unit = {
199199
val errors: List[String] = xmlErrorMessages(msg, code)
200-
assert(errors exists (_ contains msg), errors mkString "\n")
200+
assert(errors.exists(_.contains(msg)), errors.mkString("\n"))
201201
}
202202

203203
def expectXmlErrors(msgCount: Int, msg: String, code: String): Unit = {
204204
val errors: List[String] = xmlErrorMessages(msg, code)
205-
val errorCount: Int = errors.count(_ contains msg)
206-
assert(errorCount == msgCount, s"$errorCount occurrences of \'$msg\' found -- expected $msgCount in:\n${errors mkString "\n"}")
205+
val errorCount: Int = errors.count(_.contains(msg))
206+
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: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ object ReuseNodesTest {
1919

2020
class OriginalTranformr(rules: RewriteRule*) extends RuleTransformer(rules:_*) {
2121
override def transform(ns: Seq[Node]): Seq[Node] = {
22-
val xs: Seq[Seq[Node]] = ns.toStream map transform
22+
val xs: Seq[Seq[Node]] = ns.toStream.map(transform)
2323
val (xs1: Seq[(Seq[Node], Node)], xs2: Seq[(Seq[Node], Node)]) = xs.zip(ns).span { case (x, n) => unchanged(n, x) }
2424

2525
if (xs2.isEmpty) ns
@@ -30,7 +30,7 @@ object ReuseNodesTest {
3030

3131
class ModifiedTranformr(rules: RewriteRule*) extends RuleTransformer(rules:_*) {
3232
override def transform(ns: Seq[Node]): Seq[Node] = {
33-
val changed: Seq[Node] = ns flatMap transform
33+
val changed: Seq[Node] = ns.flatMap(transform)
3434

3535
if (changed.length != ns.length || changed.zip(ns).exists(p => p._1 != p._2)) changed
3636
else ns
@@ -93,7 +93,7 @@ class ReuseNodesTest {
9393
recursiveAssert(original.child,transformed.child)
9494
case _ =>
9595
assertSame(original, transformed)
96-
// No need to check for children, node being immuatable
96+
// No need to check for children, node being immutable
9797
// children can't be different if parents are referentially equal
9898
}
9999
}

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

Lines changed: 20 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package scala.xml
22

3-
import language.postfixOps
43
import org.junit.{Test => UnitTest}
54
import org.junit.Assert.{assertEquals, assertFalse, assertTrue}
65
import java.io.StringWriter
@@ -38,8 +37,8 @@ class XMLTestJVM {
3837

3938
assertEquals(c, parsedxml11)
4039
assertEquals(parsedxml1, parsedxml11)
41-
assertTrue(List(parsedxml1) sameElements List(parsedxml11))
42-
assertTrue(Array(parsedxml1).toList sameElements List(parsedxml11))
40+
assertTrue(List(parsedxml1).sameElements(List(parsedxml11)))
41+
assertTrue(Array(parsedxml1).toList.sameElements(List(parsedxml11)))
4342

4443
val x2: String = "<book><author>Peter Buneman</author><author>Dan Suciu</author><title>Data on ze web</title></book>"
4544
val x2p: Elem = XML.loadString(x2)
@@ -52,66 +51,66 @@ class XMLTestJVM {
5251

5352
@UnitTest
5453
def xpath(): Unit = {
55-
assertTrue(parsedxml1 \ "_" sameElements List(Elem(null, "world", e, sc)))
54+
assertTrue((parsedxml1 \ "_").sameElements(List(Elem(null, "world", e, sc))))
5655

57-
assertTrue(parsedxml1 \ "world" sameElements List(Elem(null, "world", e, sc)))
56+
assertTrue((parsedxml1 \ "world").sameElements(List(Elem(null, "world", e, sc))))
5857

5958
assertTrue(
60-
(parsedxml2 \ "_") sameElements List(
59+
(parsedxml2 \ "_").sameElements(List(
6160
Elem(null, "book", e, sc,
6261
Elem(null, "author", e, sc, Text("Peter Buneman")),
6362
Elem(null, "author", e, sc, Text("Dan Suciu")),
6463
Elem(null, "title", e, sc, Text("Data on ze web"))),
6564
Elem(null, "book", e, sc,
6665
Elem(null, "author", e, sc, Text("John Mitchell")),
67-
Elem(null, "title", e, sc, Text("Foundations of Programming Languages")))))
66+
Elem(null, "title", e, sc, Text("Foundations of Programming Languages"))))))
6867
assertTrue((parsedxml2 \ "author").isEmpty)
6968

7069
assertTrue(
71-
(parsedxml2 \ "book") sameElements List(
70+
(parsedxml2 \ "book").sameElements(List(
7271
Elem(null, "book", e, sc,
7372
Elem(null, "author", e, sc, Text("Peter Buneman")),
7473
Elem(null, "author", e, sc, Text("Dan Suciu")),
7574
Elem(null, "title", e, sc, Text("Data on ze web"))),
7675
Elem(null, "book", e, sc,
7776
Elem(null, "author", e, sc, Text("John Mitchell")),
78-
Elem(null, "title", e, sc, Text("Foundations of Programming Languages")))))
77+
Elem(null, "title", e, sc, Text("Foundations of Programming Languages"))))))
7978

8079
assertTrue(
81-
(parsedxml2 \ "_" \ "_") sameElements List(
80+
(parsedxml2 \ "_" \ "_").sameElements(List(
8281
Elem(null, "author", e, sc, Text("Peter Buneman")),
8382
Elem(null, "author", e, sc, Text("Dan Suciu")),
8483
Elem(null, "title", e, sc, Text("Data on ze web")),
8584
Elem(null, "author", e, sc, Text("John Mitchell")),
86-
Elem(null, "title", e, sc, Text("Foundations of Programming Languages"))))
85+
Elem(null, "title", e, sc, Text("Foundations of Programming Languages")))))
8786

8887
assertTrue(
89-
(parsedxml2 \ "_" \ "author") sameElements List(
88+
(parsedxml2 \ "_" \ "author").sameElements(List(
9089
Elem(null, "author", e, sc, Text("Peter Buneman")),
9190
Elem(null, "author", e, sc, Text("Dan Suciu")),
92-
Elem(null, "author", e, sc, Text("John Mitchell"))))
91+
Elem(null, "author", e, sc, Text("John Mitchell")))))
9392

9493
assertTrue((parsedxml2 \ "_" \ "_" \ "author").isEmpty)
9594
}
9695

9796
@UnitTest
9897
def xpathDESCENDANTS(): Unit = {
9998
assertTrue(
100-
(parsedxml2 \\ "author") sameElements List(
99+
(parsedxml2 \\ "author").sameElements(List(
101100
Elem(null, "author", e, sc, Text("Peter Buneman")),
102101
Elem(null, "author", e, sc, Text("Dan Suciu")),
103-
Elem(null, "author", e, sc, Text("John Mitchell"))))
102+
Elem(null, "author", e, sc, Text("John Mitchell")))))
104103

105104
assertTrue(
106-
(parsedxml2 \\ "title") sameElements List(
105+
(parsedxml2 \\ "title").sameElements(List(
107106
Elem(null, "title", e, sc, Text("Data on ze web")),
108-
Elem(null, "title", e, sc, Text("Foundations of Programming Languages"))))
107+
Elem(null, "title", e, sc, Text("Foundations of Programming Languages")))))
109108

110109
assertEquals("<book><author>Peter Buneman</author><author>Dan Suciu</author><title>Data on ze web</title></book>",
111110
(parsedxml2 \\ "book") { (n: Node) => (n \ "title") xml_== "Data on ze web" }.toString)
112111

113112
assertTrue(
114-
(NodeSeq.fromSeq(List(parsedxml2)) \\ "_") sameElements List(
113+
(NodeSeq.fromSeq(List(parsedxml2)) \\ "_").sameElements(List(
115114
Elem(null, "bib", e, sc,
116115
Elem(null, "book", e, sc,
117116
Elem(null, "author", e, sc, Text("Peter Buneman")),
@@ -131,7 +130,7 @@ class XMLTestJVM {
131130
Elem(null, "author", e, sc, Text("John Mitchell")),
132131
Elem(null, "title", e, sc, Text("Foundations of Programming Languages"))),
133132
Elem(null, "author", e, sc, Text("John Mitchell")),
134-
Elem(null, "title", e, sc, Text("Foundations of Programming Languages"))))
133+
Elem(null, "title", e, sc, Text("Foundations of Programming Languages")))))
135134
}
136135

137136
@UnitTest
@@ -196,7 +195,7 @@ class XMLTestJVM {
196195
// println("x = " + x)
197196
// println("y = " + y)
198197
// println("x equals y: " + (x equals y) + ", y equals x: " + (y equals x))
199-
assertTrue((x equals y) && (y equals x))
198+
assertTrue(x.equals(y) && y.equals(x))
200199
// println()
201200
}
202201
}
@@ -659,7 +658,7 @@ class XMLTestJVM {
659658
val parent: org.xml.sax.XMLReader = xercesInternal.newSAXParser.getXMLReader
660659
val filter: org.xml.sax.XMLFilter = new org.xml.sax.helpers.XMLFilterImpl(parent) {
661660
override def characters(ch: Array[Char], start: Int, length: Int): Unit = {
662-
for (i <- 0 until length) if (ch(start+i) == 'a') ch(start+i) = 'b'
661+
for (i <- 0.until(length)) if (ch(start+i) == 'a') ch(start+i) = 'b'
663662
super.characters(ch, start, length)
664663
}
665664
}

‎shared/src/main/scala/scala/xml/Comment.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,5 +39,5 @@ case class Comment(commentText: String) extends SpecialNode {
3939
* Appends &quot;<!-- text -->&quot; to this string buffer.
4040
*/
4141
override def buildString(sb: StringBuilder): StringBuilder =
42-
sb append "<!--" append commentText append "-->"
42+
sb.append("<!--").append(commentText).append("-->")
4343
}

‎shared/src/main/scala/scala/xml/Elem.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,5 +106,5 @@ class Elem(
106106
/**
107107
* Returns concatenation of `text(n)` for each child `n`.
108108
*/
109-
override def text: String = (child map (_.text)).mkString
109+
override def text: String = child.map(_.text).mkString
110110
}

‎shared/src/main/scala/scala/xml/Equality.scala

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ object Equality {
6363
}
6464
def compareBlithely(x1: AnyRef, x2: AnyRef): Boolean = {
6565
if (x1 == null || x2 == null)
66-
return x1 eq x2
66+
return x1.eq(x2)
6767

6868
x2 match {
6969
case s: String => compareBlithely(x1, s)
@@ -108,9 +108,9 @@ trait Equality extends scala.Equals {
108108
*/
109109
private def doComparison(other: Any, blithe: Boolean): Boolean = {
110110
val strictlyEqual: Boolean = other match {
111-
case x: AnyRef if this eq x => true
112-
case x: Equality => (x canEqual this) && (this strict_== x)
113-
case _ => false
111+
case x: AnyRef if this.eq(x) => true
112+
case x: Equality => (x canEqual this) && (this strict_== x)
113+
case _ => false
114114
}
115115

116116
strictlyEqual || (blithe && compareBlithely(this, asRef(other)))

‎shared/src/main/scala/scala/xml/Group.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ final case class Group(nodes: Seq[Node]) extends Node {
2929
}
3030

3131
override def strict_==(other: Equality): Boolean = other match {
32-
case Group(xs) => nodes sameElements xs
32+
case Group(xs) => nodes.sameElements(xs)
3333
case _ => false
3434
}
3535

@@ -39,7 +39,7 @@ final case class Group(nodes: Seq[Node]) extends Node {
3939
* Since Group is very much a hack it throws an exception if you
4040
* try to do anything with it.
4141
*/
42-
private def fail(msg: String): Nothing = throw new UnsupportedOperationException("class Group does not support method '%s'" format msg)
42+
private def fail(msg: String): Nothing = throw new UnsupportedOperationException("class Group does not support method '%s'".format(msg))
4343

4444
override def label: Nothing = fail("label")
4545
override def attributes: Nothing = fail("attributes")

‎shared/src/main/scala/scala/xml/MetaData.scala

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -29,25 +29,25 @@ object MetaData {
2929
*/
3030
@tailrec
3131
def concatenate(attribs: MetaData, new_tail: MetaData): MetaData =
32-
if (attribs eq Null) new_tail
33-
else concatenate(attribs.next, attribs copy new_tail)
32+
if (attribs.eq(Null)) new_tail
33+
else concatenate(attribs.next, attribs.copy(new_tail))
3434

3535
/**
3636
* returns normalized MetaData, with all duplicates removed and namespace prefixes resolved to
3737
* namespace URIs via the given scope.
3838
*/
3939
def normalize(attribs: MetaData, scope: NamespaceBinding): MetaData = {
4040
def iterate(md: MetaData, normalized_attribs: MetaData, set: Set[String]): MetaData = {
41-
if (md eq Null) {
41+
if (md.eq(Null)) {
4242
normalized_attribs
43-
} else if (md.value eq null) {
43+
} else if (md.value.eq(null)) {
4444
iterate(md.next, normalized_attribs, set)
4545
} else {
4646
val key: String = getUniversalKey(md, scope)
4747
if (set(key)) {
4848
iterate(md.next, normalized_attribs, set)
4949
} else {
50-
md copy iterate(md.next, normalized_attribs, set + key)
50+
md.copy(iterate(md.next, normalized_attribs, set + key))
5151
}
5252
}
5353
}
@@ -154,8 +154,8 @@ abstract class MetaData
154154

155155
/** filters this sequence of meta data */
156156
override def filter(f: MetaData => Boolean): MetaData =
157-
if (f(this)) copy(next filter f)
158-
else next filter f
157+
if (f(this)) copy(next.filter(f))
158+
else next.filter(f)
159159

160160
def reverse: MetaData =
161161
foldLeft(Null: MetaData) { (x, xs) =>
@@ -181,7 +181,7 @@ abstract class MetaData
181181
* Returns a Map containing the attributes stored as key/value pairs.
182182
*/
183183
def asAttrMap: Map[String, String] =
184-
(iterator map (x => (x.prefixedKey, x.value.text))).toMap
184+
iterator.map(x => (x.prefixedKey, x.value.text)).toMap
185185

186186
/** returns Null or the next MetaData item */
187187
def next: MetaData
@@ -217,9 +217,9 @@ abstract class MetaData
217217
override def toString: String = sbToString(buildString)
218218

219219
def buildString(sb: StringBuilder): StringBuilder = {
220-
sb append ' '
220+
sb.append(' ')
221221
toString1(sb)
222-
next buildString sb
222+
next.buildString(sb)
223223
}
224224

225225
/**

‎shared/src/main/scala/scala/xml/NamespaceBinding.scala

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ package scala
1414
package xml
1515

1616
import scala.collection.Seq
17-
import Utility.sbToString
1817

1918
/**
2019
* The class `NamespaceBinding` represents namespace bindings
@@ -30,7 +29,7 @@ case class NamespaceBinding(prefix: String, uri: String, parent: NamespaceBindin
3029
throw new IllegalArgumentException("zero length prefix not allowed")
3130

3231
def getURI(_prefix: String): String =
33-
if (prefix == _prefix) uri else parent getURI _prefix
32+
if (prefix == _prefix) uri else parent.getURI(_prefix)
3433

3534
/**
3635
* Returns some prefix that is mapped to the URI.
@@ -40,13 +39,13 @@ case class NamespaceBinding(prefix: String, uri: String, parent: NamespaceBindin
4039
* if no prefix is mapped to the URI.
4140
*/
4241
def getPrefix(_uri: String): String =
43-
if (_uri == uri) prefix else parent getPrefix _uri
42+
if (_uri == uri) prefix else parent.getPrefix(_uri)
4443

45-
override def toString: String = sbToString(buildString(_, TopScope))
44+
override def toString: String = Utility.sbToString(buildString(_, TopScope))
4645

4746
private def shadowRedefined(stop: NamespaceBinding): NamespaceBinding = {
4847
def prefixList(x: NamespaceBinding): List[String] =
49-
if ((x == null) || (x eq stop)) Nil
48+
if ((x == null) || x.eq(stop)) Nil
5049
else x.prefix :: prefixList(x.parent)
5150
def fromPrefixList(l: List[String]): NamespaceBinding = l match {
5251
case Nil => stop
@@ -70,7 +69,7 @@ case class NamespaceBinding(prefix: String, uri: String, parent: NamespaceBindin
7069

7170
override def basisForHashCode: Seq[Any] = List(prefix, uri, parent)
7271

73-
def buildString(stop: NamespaceBinding): String = sbToString(buildString(_, stop))
72+
def buildString(stop: NamespaceBinding): String = Utility.sbToString(buildString(_, stop))
7473

7574
def buildString(sb: StringBuilder, stop: NamespaceBinding): Unit = {
7675
shadowRedefined(stop).doBuildString(sb, stop)
@@ -83,6 +82,6 @@ case class NamespaceBinding(prefix: String, uri: String, parent: NamespaceBindin
8382
if (prefix != null) ":" + prefix else "",
8483
if (uri != null) uri else ""
8584
)
86-
parent.doBuildString(sb append s, stop) // copy(ignore)
85+
parent.doBuildString(sb.append(s), stop) // copy(ignore)
8786
}
8887
}

‎shared/src/main/scala/scala/xml/Node.scala

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ abstract class Node extends NodeSeq {
8181
* @return the namespace if `scope != null` and prefix was
8282
* found, else `null`
8383
*/
84-
def getNamespace(pre: String): String = if (scope eq null) null else scope.getURI(pre)
84+
def getNamespace(pre: String): String = if (scope.eq(null)) null else scope.getURI(pre)
8585

8686
/**
8787
* Convenience method, looks up an unprefixed attribute in attributes of this node.
@@ -124,7 +124,7 @@ abstract class Node extends NodeSeq {
124124
/**
125125
* Children which do not stringify to "" (needed for equality)
126126
*/
127-
def nonEmptyChildren: Seq[Node] = child filterNot (_.toString == "")
127+
def nonEmptyChildren: Seq[Node] = child.filterNot(_.toString == "")
128128

129129
/**
130130
* Descendant axis (all descendants of this node, not including node itself)
@@ -155,7 +155,7 @@ abstract class Node extends NodeSeq {
155155
(label == x.label) &&
156156
(attributes == x.attributes) &&
157157
// (scope == x.scope) // note - original code didn't compare scopes so I left it as is.
158-
(nonEmptyChildren sameElements x.nonEmptyChildren)
158+
nonEmptyChildren.sameElements(x.nonEmptyChildren)
159159
case _ =>
160160
false
161161
}
@@ -185,10 +185,10 @@ abstract class Node extends NodeSeq {
185185
*/
186186
def nameToString(sb: StringBuilder): StringBuilder = {
187187
if (null != prefix) {
188-
sb append prefix
189-
sb append ':'
188+
sb.append(prefix)
189+
sb.append(':')
190190
}
191-
sb append label
191+
sb.append(label)
192192
}
193193

194194
/**

‎shared/src/main/scala/scala/xml/NodeBuffer.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ class NodeBuffer extends scala.collection.mutable.ArrayBuffer[Node] with ScalaVe
3838
def &+(o: Any): NodeBuffer = {
3939
o match {
4040
case null | _: Unit | Text("") => // ignore
41-
case it: Iterator[_] => it foreach &+
41+
case it: Iterator[_] => it.foreach(&+)
4242
case n: Node => super.+=(n)
4343
case ns: Iterable[_] => this &+ ns.iterator
4444
case ns: Array[_] => this &+ ns.iterator

0 commit comments

Comments
 (0)