diff options
| author | James Iry <jamesiry@gmail.com> | 2013-10-29 12:44:59 -0700 |
|---|---|---|
| committer | James Iry <jamesiry@gmail.com> | 2013-10-29 12:44:59 -0700 |
| commit | 9b8d108ed7cb1a049e4e8500b6896e9554328aab (patch) | |
| tree | 70b0e1340094c417724762896c7db675a7905d1f /src | |
| parent | 2c1e9af40e252bd9ed5bfe4305991ee6f7d25636 (diff) | |
| parent | bc475036c4cae5e9534ee3f9985e4e7a848e4b67 (diff) | |
| download | scala-9b8d108ed7cb1a049e4e8500b6896e9554328aab.tar.gz scala-9b8d108ed7cb1a049e4e8500b6896e9554328aab.tar.bz2 scala-9b8d108ed7cb1a049e4e8500b6896e9554328aab.zip | |
Merge pull request #3076 from soc/SI-7605-deprecate-procedures
SI-7605 Deprecate procedure syntax
Diffstat (limited to 'src')
| -rw-r--r-- | src/compiler/scala/tools/nsc/ast/parser/Parsers.scala | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/src/compiler/scala/tools/nsc/ast/parser/Parsers.scala b/src/compiler/scala/tools/nsc/ast/parser/Parsers.scala index 1d5f35b7d6..07938ec3df 100644 --- a/src/compiler/scala/tools/nsc/ast/parser/Parsers.scala +++ b/src/compiler/scala/tools/nsc/ast/parser/Parsers.scala @@ -2512,7 +2512,11 @@ self => val vparamss = paramClauses(nme.CONSTRUCTOR, classContextBounds map (_.duplicate), ofCaseClass = false) newLineOptWhenFollowedBy(LBRACE) val rhs = in.token match { - case LBRACE => atPos(in.offset) { constrBlock(vparamss) } + 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 _ => accept(EQUALS) ; atPos(in.offset) { constrExpr(vparamss) } } DefDef(mods, nme.CONSTRUCTOR, List(), vparamss, TypeTree(), rhs) @@ -2538,10 +2542,14 @@ 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 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 =`.") restype = scalaUnitConstr blockExpr() } else { |