summaryrefslogtreecommitdiff
path: root/src/compiler
diff options
context:
space:
mode:
authorJason Zaugg <jzaugg@gmail.com>2013-02-24 22:17:49 +0100
committerJason Zaugg <jzaugg@gmail.com>2013-02-24 22:17:49 +0100
commitd1b16c4dc484d5f431bc4635148b065e722b2315 (patch)
tree6c1438812080467b154217ce55ddb58b5bb2b763 /src/compiler
parentbf118cfe90349f023bd5ea7b060b0cbf76d7ab46 (diff)
downloadscala-d1b16c4dc484d5f431bc4635148b065e722b2315.tar.gz
scala-d1b16c4dc484d5f431bc4635148b065e722b2315.tar.bz2
scala-d1b16c4dc484d5f431bc4635148b065e722b2315.zip
Don't override empty-paren methods as paren-less.
An exception is made for toString.
Diffstat (limited to 'src/compiler')
-rw-r--r--src/compiler/scala/tools/nsc/CompileServer.scala2
-rw-r--r--src/compiler/scala/tools/nsc/ast/parser/Parsers.scala4
-rw-r--r--src/compiler/scala/tools/nsc/backend/icode/analysis/TypeFlowAnalysis.scala2
3 files changed, 4 insertions, 4 deletions
diff --git a/src/compiler/scala/tools/nsc/CompileServer.scala b/src/compiler/scala/tools/nsc/CompileServer.scala
index 72e8cc69c7..cf19eb4a2f 100644
--- a/src/compiler/scala/tools/nsc/CompileServer.scala
+++ b/src/compiler/scala/tools/nsc/CompileServer.scala
@@ -115,7 +115,7 @@ class StandardCompileServer extends SocketServer {
reporter = new ConsoleReporter(newSettings, in, out) {
// disable prompts, so that compile server cannot block
- override def displayPrompt = ()
+ override def displayPrompt() = ()
}
def isCompilerReusable: Boolean = {
if (compiler == null) {
diff --git a/src/compiler/scala/tools/nsc/ast/parser/Parsers.scala b/src/compiler/scala/tools/nsc/ast/parser/Parsers.scala
index 61c65c211b..183aa7f294 100644
--- a/src/compiler/scala/tools/nsc/ast/parser/Parsers.scala
+++ b/src/compiler/scala/tools/nsc/ast/parser/Parsers.scala
@@ -170,8 +170,8 @@ self =>
val global: self.global.type = self.global
}
- def xmlLiteral : Tree = xmlp.xLiteral
- def xmlLiteralPattern : Tree = xmlp.xLiteralPattern
+ def xmlLiteral() : Tree = xmlp.xLiteral
+ def xmlLiteralPattern() : Tree = xmlp.xLiteralPattern
}
class OutlineParser(source: SourceFile) extends SourceFileParser(source) {
diff --git a/src/compiler/scala/tools/nsc/backend/icode/analysis/TypeFlowAnalysis.scala b/src/compiler/scala/tools/nsc/backend/icode/analysis/TypeFlowAnalysis.scala
index c9d295a350..3ce1a2fd95 100644
--- a/src/compiler/scala/tools/nsc/backend/icode/analysis/TypeFlowAnalysis.scala
+++ b/src/compiler/scala/tools/nsc/backend/icode/analysis/TypeFlowAnalysis.scala
@@ -131,7 +131,7 @@ abstract class TypeFlowAnalysis {
init(m)
}
- def run = {
+ def run() = {
timer.start
// icodes.lubs0 = 0
forwardAnalysis(blockTransfer)