diff options
| author | Adriaan Moors <adriaan.moors@typesafe.com> | 2013-11-17 18:29:42 -0800 |
|---|---|---|
| committer | Adriaan Moors <adriaan.moors@typesafe.com> | 2013-11-17 18:29:42 -0800 |
| commit | 4a225596a1bf3d6ecb358dca5aae884b82883090 (patch) | |
| tree | 43a391235cd201b17d5fc37d9e7c7bc487d074f4 /src | |
| parent | a1da835da62114d76b165125a940bfb86c417716 (diff) | |
| parent | bc98d7d5aaeeced69751688b57a69297a528fd3b (diff) | |
| download | scala-4a225596a1bf3d6ecb358dca5aae884b82883090.tar.gz scala-4a225596a1bf3d6ecb358dca5aae884b82883090.tar.bz2 scala-4a225596a1bf3d6ecb358dca5aae884b82883090.zip | |
Merge pull request #3141 from soc/SI-7961
SI-7961 Fix false positive procedure warnings
Diffstat (limited to 'src')
| -rw-r--r-- | src/compiler/scala/tools/nsc/ast/parser/Parsers.scala | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/src/compiler/scala/tools/nsc/ast/parser/Parsers.scala b/src/compiler/scala/tools/nsc/ast/parser/Parsers.scala index cd1869340a..ef4052d5f3 100644 --- a/src/compiler/scala/tools/nsc/ast/parser/Parsers.scala +++ b/src/compiler/scala/tools/nsc/ast/parser/Parsers.scala @@ -2530,11 +2530,7 @@ self => val vparamss = paramClauses(nme.CONSTRUCTOR, classContextBounds map (_.duplicate), ofCaseClass = false) newLineOptWhenFollowedBy(LBRACE) val rhs = in.token match { - case LBRACE => { - if (settings.future) - deprecationWarning(in.offset, "Procedure syntax is deprecated. Convert procedure to method by adding `: Unit =`.") - atPos(in.offset) { constrBlock(vparamss) } - } + case LBRACE => atPos(in.offset) { constrBlock(vparamss) } case _ => accept(EQUALS) ; atPos(in.offset) { constrExpr(vparamss) } } DefDef(mods, nme.CONSTRUCTOR, List(), vparamss, TypeTree(), rhs) @@ -2560,14 +2556,16 @@ self => var restype = fromWithinReturnType(typedOpt()) val rhs = if (isStatSep || in.token == RBRACE) { - if (settings.future) - deprecationWarning(in.lastOffset, "Procedure syntax is deprecated. Convert procedure to method by adding `: Unit`.") - if (restype.isEmpty) restype = scalaUnitConstr + if (restype.isEmpty) { + if (settings.future) + deprecationWarning(in.lastOffset, s"Procedure syntax is deprecated. Convert procedure `$name` to method by adding `: Unit`.") + restype = scalaUnitConstr + } newmods |= Flags.DEFERRED EmptyTree } else if (restype.isEmpty && in.token == LBRACE) { if (settings.future) - deprecationWarning(in.offset, "Procedure syntax is deprecated. Convert procedure to method by adding `: Unit =`.") + deprecationWarning(in.offset, s"Procedure syntax is deprecated. Convert procedure `$name` to method by adding `: Unit =`.") restype = scalaUnitConstr blockExpr() } else { |