aboutsummaryrefslogtreecommitdiff
path: root/src/dotty/tools
diff options
context:
space:
mode:
authorMartin Odersky <odersky@gmail.com>2014-01-14 22:36:27 +0100
committerMartin Odersky <odersky@gmail.com>2014-01-14 22:36:32 +0100
commitde53428d957c07333aa765e826fdbb4022229d2d (patch)
tree0d2c2325a5be39a65997bd7203a2358c0aac42e6 /src/dotty/tools
parentfcdb8b9f7449096890887b4801359144983d8c4f (diff)
downloaddotty-de53428d957c07333aa765e826fdbb4022229d2d.tar.gz
dotty-de53428d957c07333aa765e826fdbb4022229d2d.tar.bz2
dotty-de53428d957c07333aa765e826fdbb4022229d2d.zip
Avoid procedure syntax
Diffstat (limited to 'src/dotty/tools')
-rw-r--r--src/dotty/tools/dotc/config/Printers.scala2
-rw-r--r--src/dotty/tools/dotc/parsing/CharArrayReader.scala6
-rw-r--r--src/dotty/tools/dotc/parsing/MarkupParserCommon.scala6
-rw-r--r--src/dotty/tools/dotc/parsing/MarkupParsers.scala8
4 files changed, 11 insertions, 11 deletions
diff --git a/src/dotty/tools/dotc/config/Printers.scala b/src/dotty/tools/dotc/config/Printers.scala
index 7f9c73926..0e5565a21 100644
--- a/src/dotty/tools/dotc/config/Printers.scala
+++ b/src/dotty/tools/dotc/config/Printers.scala
@@ -11,7 +11,7 @@ object Printers {
}
val core: Printer = noPrinter
- val typr: Printer = noPrinter
+ val typr: Printer = new Printer
val constr: Printer = noPrinter
val overload: Printer = noPrinter
val implicits: Printer = noPrinter
diff --git a/src/dotty/tools/dotc/parsing/CharArrayReader.scala b/src/dotty/tools/dotc/parsing/CharArrayReader.scala
index c749cd132..b84e2eb47 100644
--- a/src/dotty/tools/dotc/parsing/CharArrayReader.scala
+++ b/src/dotty/tools/dotc/parsing/CharArrayReader.scala
@@ -70,7 +70,7 @@ abstract class CharArrayReader { self =>
}
/** Interpret \\uxxxx escapes */
- private def potentialUnicode() {
+ private def potentialUnicode(): Unit = {
def evenSlashPrefix: Boolean = {
var p = charOffset - 2
while (p >= 0 && buf(p) == '\\') p -= 1
@@ -101,7 +101,7 @@ abstract class CharArrayReader { self =>
}
/** replace CR;LF by LF */
- private def skipCR() {
+ private def skipCR(): Unit = {
if (ch == CR)
if (charOffset < buf.length && buf(charOffset) == LF) {
charOffset += 1
@@ -110,7 +110,7 @@ abstract class CharArrayReader { self =>
}
/** Handle line ends */
- private def potentialLineEnd() {
+ private def potentialLineEnd(): Unit = {
if (ch == LF || ch == FF) {
lastLineStartOffset = lineStartOffset
lineStartOffset = charOffset
diff --git a/src/dotty/tools/dotc/parsing/MarkupParserCommon.scala b/src/dotty/tools/dotc/parsing/MarkupParserCommon.scala
index db2fe569b..5b51e9ed6 100644
--- a/src/dotty/tools/dotc/parsing/MarkupParserCommon.scala
+++ b/src/dotty/tools/dotc/parsing/MarkupParserCommon.scala
@@ -89,7 +89,7 @@ private[dotty] trait MarkupParserCommon extends TokenTests {
/** [42] '<' xmlEndTag ::= '<' '/' Name S? '>'
*/
- def xEndTag(startName: String) {
+ def xEndTag(startName: String): Unit = {
xToken('/')
if (xName != startName)
errorNoEnd(startName)
@@ -196,11 +196,11 @@ private[dotty] trait MarkupParserCommon extends TokenTests {
x
}
- def xToken(that: Char) {
+ def xToken(that: Char): Unit = {
if (ch == that) nextch
else xHandleError(that, "'%s' expected instead of '%s'".format(that, ch))
}
- def xToken(that: Seq[Char]) { that foreach xToken }
+ def xToken(that: Seq[Char]): Unit = { that foreach xToken }
/** scan [S] '=' [S]*/
def xEQ() = { xSpaceOpt; xToken('='); xSpaceOpt }
diff --git a/src/dotty/tools/dotc/parsing/MarkupParsers.scala b/src/dotty/tools/dotc/parsing/MarkupParsers.scala
index ef9c81cdb..5d86121e0 100644
--- a/src/dotty/tools/dotc/parsing/MarkupParsers.scala
+++ b/src/dotty/tools/dotc/parsing/MarkupParsers.scala
@@ -77,7 +77,7 @@ object MarkupParsers {
var tmppos : Position = NoPosition
def ch = input.ch
/** this method assign the next character to ch and advances in input */
- def nextch() { input.nextChar() }
+ def nextch(): Unit = { input.nextChar() }
protected def ch_returning_nextch: Char = {
val result = ch; input.nextChar(); result
@@ -180,7 +180,7 @@ object MarkupParsers {
xTakeUntil(handle.comment, () => Position(start, curOffset, start), "-->")
}
- def appendText(pos: Position, ts: Buffer[Tree], txt: String) {
+ def appendText(pos: Position, ts: Buffer[Tree], txt: String): Unit = {
val toAppend =
if (preserveWS) Seq(txt)
else TextBuffer.fromString(txt).toText map (_.text)
@@ -191,7 +191,7 @@ object MarkupParsers {
/** adds entity/character to ts as side-effect
* @precond ch == '&'
*/
- def content_AMP(ts: ArrayBuffer[Tree]) {
+ def content_AMP(ts: ArrayBuffer[Tree]): Unit = {
nextch
val toAppend = ch match {
case '#' => // CharacterRef
@@ -400,7 +400,7 @@ object MarkupParsers {
def xScalaPatterns: List[Tree] = escapeToScala(parser.patterns(), "pattern")
def reportSyntaxError(pos: Int, str: String) = parser.syntaxError(str, pos)
- def reportSyntaxError(str: String) {
+ def reportSyntaxError(str: String): Unit = {
reportSyntaxError(curOffset, "in XML literal: " + str)
nextch()
}