From 15c67417a96ea5f4619c5a53f875fa5e2c1578c9 Mon Sep 17 00:00:00 2001 From: Martin Odersky Date: Mon, 16 Dec 2013 16:03:38 +0100 Subject: Making Method a fromStartFlag --- src/dotty/tools/dotc/printing/PlainPrinter.scala | 4 ++-- src/dotty/tools/dotc/printing/RefinedPrinter.scala | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src/dotty/tools/dotc/printing') diff --git a/src/dotty/tools/dotc/printing/PlainPrinter.scala b/src/dotty/tools/dotc/printing/PlainPrinter.scala index a03f14cde..16fc6ae5d 100644 --- a/src/dotty/tools/dotc/printing/PlainPrinter.scala +++ b/src/dotty/tools/dotc/printing/PlainPrinter.scala @@ -288,7 +288,7 @@ class PlainPrinter(_ctx: Context) extends Printer { else if (flags is Mutable) "variable" else if (sym.isClassConstructor && sym.isPrimaryConstructor) "primary constructor" else if (sym.isClassConstructor) "constructor" - else if (sym.isCompleted && sym.isSourceMethod) "method" + else if (sym.isSourceMethod) "method" else if (sym.isTerm) "value" else "" } @@ -303,7 +303,7 @@ class PlainPrinter(_ctx: Context) extends Printer { else if (flags is Mutable) "var" else if (flags is Package) "package" else if (flags is Module) "object" - else if (sym.isCompleted && sym.isSourceMethod) "def" + else if (sym.isSourceMethod) "def" else if (sym.isTerm && (!(flags is Param))) "val" else "" } diff --git a/src/dotty/tools/dotc/printing/RefinedPrinter.scala b/src/dotty/tools/dotc/printing/RefinedPrinter.scala index d652feb51..3e3d63a0d 100644 --- a/src/dotty/tools/dotc/printing/RefinedPrinter.scala +++ b/src/dotty/tools/dotc/printing/RefinedPrinter.scala @@ -210,7 +210,7 @@ class RefinedPrinter(_ctx: Context) extends PlainPrinter(_ctx) { case CaseDef(pat, guard, body) => "case " ~ toText(pat) ~ optText(guard)("if " ~ _) ~ " => " ~ caseBlockText(body) case Return(expr, from) => - changePrec(GlobalPrec) { "return " ~ optText(expr)(" " ~ _) } + changePrec(GlobalPrec) { "return" ~ optText(expr)(" " ~ _) } case Try(expr, handler, finalizer) => changePrec(GlobalPrec) { "try " ~ toText(expr) ~ optText(handler)(" catch " ~ _) ~ optText(finalizer)(" finally " ~ _) -- cgit v1.2.3