More explicit empty paren lists in method calls.

Author: retronym

src/library/scala/xml/PrettyPrinter.scala

@@ -141,7 +141,7 @@ class PrettyPrinter(width: Int, step: Int) {
       case Text(s) if s.trim() == "" =>
         ;
       case _:Atom[_] | _:Comment | _:EntityRef | _:ProcInstr =>
-        makeBox( ind, node.toString.trim() )
+        makeBox( ind, node.toString().trim() )
       case g @ Group(xs) =>
         traverse(xs.iterator, pscope, ind)
       case _ =>

src/library/scala/xml/Utility.scala

@@ -245,10 +245,10 @@ object Utility extends AnyRef with parsing.TokenTests {
     if (children.isEmpty) return
     else if (children forall isAtomAndNotText) { // add space
       val it = children.iterator
-      val f = it.next
+      val f = it.next()
       serialize(f, pscope, sb, stripComments, decodeEntities, preserveWhitespace, minimizeTags)
       while (it.hasNext) {
-        val x = it.next
+        val x = it.next()
         sb.append(' ')
         serialize(x, pscope, sb, stripComments, decodeEntities, preserveWhitespace, minimizeTags)
       }
@@ -333,22 +333,22 @@ object Utility extends AnyRef with parsing.TokenTests {
 
     val it = value.iterator
     while (it.hasNext) {
-      var c = it.next
+      var c = it.next()
       // entity! flush buffer into text node
       if (c == '&') {
-        c = it.next
+        c = it.next()
         if (c == '#') {
-          c = it.next
-          val theChar = parseCharRef ({ ()=> c },{ () => c = it.next },{s => throw new RuntimeException(s)}, {s => throw new RuntimeException(s)})
+          c = it.next()
+          val theChar = parseCharRef ({ ()=> c },{ () => c = it.next() },{s => throw new RuntimeException(s)}, {s => throw new RuntimeException(s)})
           sb.append(theChar)
         }
         else {
           if (rfb eq null) rfb = new StringBuilder()
           rfb append c
-          c = it.next
+          c = it.next()
           while (c != ';') {
             rfb.append(c)
-            c = it.next
+            c = it.next()
           }
           val ref = rfb.toString()
           rfb.clear()

src/library/scala/xml/dtd/ContentModelParser.scala

@@ -26,14 +26,14 @@ object ContentModelParser extends Scanner { // a bit too permissive concerning #
         scala.sys.error("expected "+token2string(tok)+
               ", got unexpected token:"+token2string(token))
     }
-    nextToken
+    nextToken()
   }
 
   // s [ '+' | '*' | '?' ]
   def maybeSuffix(s: RegExp) = token match {
-    case STAR => nextToken; Star(s)
-    case PLUS => nextToken; Sequ(s, Star(s))
-    case OPT  => nextToken; Alt(Eps, s)
+    case STAR => nextToken(); Star(s)
+    case PLUS => nextToken(); Sequ(s, Star(s))
+    case OPT  => nextToken(); Alt(Eps, s)
     case _    => s
   }
 
@@ -48,18 +48,18 @@ object ContentModelParser extends Scanner { // a bit too permissive concerning #
     }
     case LPAREN =>
 
-      nextToken
-      sOpt
+      nextToken()
+      sOpt()
       if (token != TOKEN_PCDATA)
         ELEMENTS(regexp)
       else {
-        nextToken
+        nextToken()
         token match {
         case RPAREN =>
           PCDATA
         case CHOICE =>
           val res = MIXED(choiceRest(Eps))
-          sOpt
+          sOpt()
           accept( RPAREN )
           accept( STAR )
           res
@@ -72,17 +72,17 @@ object ContentModelParser extends Scanner { // a bit too permissive concerning #
       scala.sys.error("unexpected token:" + token2string(token) )
   }
   //                                  sopt ::= S?
-  def sOpt() = if( token == S ) nextToken
+  def sOpt() = if( token == S ) nextToken()
 
   //                      (' S? mixed ::= '#PCDATA' S? ')'
   //                                    | '#PCDATA' (S? '|' S? atom)* S? ')*'
 
   //       '(' S? regexp ::= cp S? [seqRest|choiceRest] ')' [ '+' | '*' | '?' ]
   def regexp: RegExp = {
     val p = particle
-    sOpt
+    sOpt()
     maybeSuffix(token match {
-      case RPAREN  => nextToken; p
+      case RPAREN  => nextToken(); p
       case CHOICE  => val q = choiceRest( p );accept( RPAREN ); q
       case COMMA   => val q = seqRest( p );   accept( RPAREN ); q
     })
@@ -92,10 +92,10 @@ object ContentModelParser extends Scanner { // a bit too permissive concerning #
   def seqRest(p: RegExp) = {
     var k = List(p)
     while( token == COMMA ) {
-      nextToken
-      sOpt
+      nextToken()
+      sOpt()
       k = particle::k
-      sOpt
+      sOpt()
     }
     Sequ( k.reverse:_* )
   }
@@ -104,25 +104,25 @@ object ContentModelParser extends Scanner { // a bit too permissive concerning #
   def choiceRest( p:RegExp ) = {
     var k = List( p )
     while( token == CHOICE ) {
-      nextToken
-      sOpt
+      nextToken()
+      sOpt()
       k = particle::k
-      sOpt
+      sOpt()
     }
     Alt( k.reverse:_* )
   }
 
   //                                  particle ::=  '(' S? regexp
   //                                             |  name [ '+' | '*' | '?' ]
   def particle = token match {
-    case LPAREN => nextToken; sOpt; regexp
-    case NAME   => val a = Letter(ElemName(value)); nextToken; maybeSuffix(a)
+    case LPAREN => nextToken(); sOpt(); regexp
+    case NAME   => val a = Letter(ElemName(value)); nextToken(); maybeSuffix(a)
     case _      => scala.sys.error("expected '(' or Name, got:"+token2string(token))
   }
 
   //                                     atom ::= name
   def atom = token match {
-    case NAME   => val a = Letter(ElemName(value)); nextToken; a
+    case NAME   => val a = Letter(ElemName(value)); nextToken(); a
     case _      => scala.sys.error("expected Name, got:"+token2string(token))
   }
 }

src/library/scala/xml/dtd/DocType.scala

@@ -28,7 +28,7 @@ case class DocType(name: String, extID: ExternalID, intSubset: Seq[dtd.Decl]) {
       if (intSubset.isEmpty) ""
       else intSubset.mkString("[", "", "]")
 
-    """<!DOCTYPE %s %s%s>""".format(name, extID.toString, intString)
+    """<!DOCTYPE %s %s%s>""".format(name, extID.toString(), intString)
   }
 }
 

src/library/scala/xml/dtd/Scanner.scala

@@ -28,8 +28,8 @@ class Scanner extends Tokens with parsing.TokenTests {
     value = ""
     it = (s).iterator
     token = 1+END
-    next
-    nextToken
+    next()
+    nextToken()
   }
 
   /** scans the next token */
@@ -41,27 +41,27 @@ class Scanner extends Tokens with parsing.TokenTests {
   final def isIdentChar = ( ('a' <= c && c <= 'z')
                            || ('A' <= c && c <= 'Z'))
 
-  final def next() = if (it.hasNext) c = it.next else c = ENDCH
+  final def next() = if (it.hasNext) c = it.next() else c = ENDCH
 
   final def acc(d: Char) {
-    if (c == d) next else scala.sys.error("expected '"+d+"' found '"+c+"' !")
+    if (c == d) next() else scala.sys.error("expected '"+d+"' found '"+c+"' !")
   }
 
   final def accS(ds: Seq[Char]) { ds foreach acc }
 
   final def readToken: Int =
     if (isSpace(c)) {
-      while (isSpace(c)) c = it.next
+      while (isSpace(c)) c = it.next()
       S
     } else c match {
-      case '('   => next; LPAREN
-      case ')'   => next; RPAREN
-      case ','   => next; COMMA
-      case '*'   => next; STAR
-      case '+'   => next; PLUS
-      case '?'   => next; OPT
-      case '|'   => next; CHOICE
-      case '#'   => next; accS( "PCDATA" ); TOKEN_PCDATA
+      case '('   => next(); LPAREN
+      case ')'   => next(); RPAREN
+      case ','   => next(); COMMA
+      case '*'   => next(); STAR
+      case '+'   => next(); PLUS
+      case '?'   => next(); OPT
+      case '|'   => next(); CHOICE
+      case '#'   => next(); accS( "PCDATA" ); TOKEN_PCDATA
       case ENDCH => END
       case _     =>
         if (isNameStart(c)) name; // NAME
@@ -70,7 +70,7 @@ class Scanner extends Tokens with parsing.TokenTests {
 
   final def name = {
     val sb = new StringBuilder()
-    do { sb.append(c); next } while (isNameChar(c))
+    do { sb.append(c); next() } while (isNameChar(c))
     value = sb.toString()
     NAME
   }

src/library/scala/xml/dtd/impl/SubsetConstruction.scala

@@ -50,7 +50,7 @@ private[dtd] class SubsetConstruction[T <: AnyRef](val nfa: NondetWordAutom[T])
     addFinal(q0)                          // initial state may also be a final state
 
     while (!rest.isEmpty) {
-      val P = rest.pop
+      val P = rest.pop()
       // assign a number to this bitset
       indexMap = indexMap.updated(P, ix)
       invIndexMap = invIndexMap.updated(ix, P)

src/library/scala/xml/factory/XMLLoader.scala

@@ -38,7 +38,7 @@ trait XMLLoader[T <: Node]
 
     newAdapter.scopeStack push TopScope
     parser.parse(source, newAdapter)
-    newAdapter.scopeStack.pop
+    newAdapter.scopeStack.pop()
 
     newAdapter.rootElem.asInstanceOf[T]
   }

src/library/scala/xml/parsing/FactoryAdapter.scala

@@ -26,7 +26,7 @@ trait ConsoleErrorHandler extends DefaultHandler {
       val s = "[%s]:%d:%d: %s".format(
         errtype, ex.getLineNumber, ex.getColumnNumber, ex.getMessage)
       Console.println(s)
-      Console.flush
+      Console.flush()
     }
 }
 
@@ -91,7 +91,7 @@ abstract class FactoryAdapter extends DefaultHandler with factory.XMLLoader[Node
     else {
       var it = ch.slice(offset, offset + length).iterator
       while (it.hasNext) {
-        val c = it.next
+        val c = it.next()
         val isSpace = c.isWhitespace
         buffer append (if (isSpace) ' ' else c)
         if (isSpace)
@@ -164,17 +164,17 @@ abstract class FactoryAdapter extends DefaultHandler with factory.XMLLoader[Node
    */
   override def endElement(uri: String , _localName: String, qname: String): Unit = {
     captureText()
-    val metaData = attribStack.pop
+    val metaData = attribStack.pop()
 
     // reverse order to get it right
     val v = (Iterator continually hStack.pop takeWhile (_ != null)).toList.reverse
     val (pre, localName) = splitName(qname)
-    val scp = scopeStack.pop
+    val scp = scopeStack.pop()
 
     // create element
     rootElem = createNode(pre, localName, metaData, scp, v)
     hStack push rootElem
-    curTag = tagStack.pop
+    curTag = tagStack.pop()
     capture = curTag != null && nodeContainsText(curTag) // root level
   }