diff options
| -rw-r--r-- | src/dotty/tools/dotc/core/Flags.scala | 5 | ||||
| -rw-r--r-- | src/dotty/tools/dotc/printing/PlainPrinter.scala | 4 | ||||
| -rw-r--r-- | src/dotty/tools/dotc/printing/RefinedPrinter.scala | 2 |
3 files changed, 6 insertions, 5 deletions
diff --git a/src/dotty/tools/dotc/core/Flags.scala b/src/dotty/tools/dotc/core/Flags.scala index 956b67ffb..7c25e471a 100644 --- a/src/dotty/tools/dotc/core/Flags.scala +++ b/src/dotty/tools/dotc/core/Flags.scala @@ -195,7 +195,8 @@ object Flags { final val Final = commonFlag(6, "final") /** A method symbol. */ - final val Method = termFlag(7, "<method>") + final val MethodCommon = commonFlag(7, "<method>") + final val Method = MethodCommon.toTermFlags /** A (term or type) parameter to a class or method */ final val Param = commonFlag(8, "<param>") @@ -395,7 +396,7 @@ object Flags { /** Flags guaranteed to be set upon symbol creation */ final val FromStartFlags = - AccessFlags | Module | Package | Deferred | Param | Scala2ExistentialCommon | Touched | + AccessFlags | Module | Package | Deferred | MethodCommon | Param | Scala2ExistentialCommon | Touched | Static | CovariantCommon | ContravariantCommon | ExpandedName | AccessorOrSealed | CaseAccessorOrTypeArgument | Frozen | Erroneous | ImplicitCommon | Permanent 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 " ~ _) |