diff options
| author | Adriaan Moors <adriaan.moors@typesafe.com> | 2013-07-29 09:41:15 -0700 |
|---|---|---|
| committer | Adriaan Moors <adriaan.moors@typesafe.com> | 2013-07-29 09:41:15 -0700 |
| commit | 9c5c46423546ffc4f331130648985b04626d38cb (patch) | |
| tree | fbbf1013e05a8abf9f401580f0b7bc40dedd19e2 /src | |
| parent | 35e53b243436fc31d134b3e4694649daac2cbaa8 (diff) | |
| parent | 6b1654834fdb03ba73d7f9fad7b0735024e0d688 (diff) | |
| download | scala-9c5c46423546ffc4f331130648985b04626d38cb.tar.gz scala-9c5c46423546ffc4f331130648985b04626d38cb.tar.bz2 scala-9c5c46423546ffc4f331130648985b04626d38cb.zip | |
Merge pull request #2690 from soc/SI-7620
SI-7620 Remove floating-point-literals-without-digit-after-dot
Diffstat (limited to 'src')
| -rw-r--r-- | src/compiler/scala/tools/nsc/ast/parser/Scanners.scala | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/src/compiler/scala/tools/nsc/ast/parser/Scanners.scala b/src/compiler/scala/tools/nsc/ast/parser/Scanners.scala index 03cdead472..2a8412b105 100644 --- a/src/compiler/scala/tools/nsc/ast/parser/Scanners.scala +++ b/src/compiler/scala/tools/nsc/ast/parser/Scanners.scala @@ -952,9 +952,8 @@ trait Scanners extends ScannersCommon { } if (value > limit) syntaxError("floating point number too large") - if (isDeprecatedForm) { - deprecationWarning("This lexical syntax is deprecated. From scala 2.11, a dot will only be considered part of a number if it is immediately followed by a digit.") - } + if (isDeprecatedForm) + syntaxError("floating point number is missing digit after dot") if (negated) -value else value } catch { @@ -1010,10 +1009,8 @@ trait Scanners extends ScannersCommon { val lookahead = lookaheadReader val c = lookahead.getc() - /* As of scala 2.11, it isn't a number unless c here is a digit, so - * settings.future.value excludes the rest of the logic. - */ - if (settings.future && !isDigit(c)) + /* Prohibit 1. */ + if (!isDigit(c)) return setStrVal() val isDefinitelyNumber = (c: @switch) match { |