diff options
author | Paul Phillips <paulp@improving.org> | 2011-11-29 18:10:55 +0000 |
---|---|---|
committer | Paul Phillips <paulp@improving.org> | 2011-11-29 18:10:55 +0000 |
commit | 8eba9acbc49eb02b9b5bd8523873a181255e4bb6 (patch) | |
tree | a0fa1d713bd0cfdba8b95f7d552dccd1be795fd4 /test | |
parent | 9c4f14411f1aac5d106aa4a2a404c7d231752478 (diff) | |
download | scala-8eba9acbc49eb02b9b5bd8523873a181255e4bb6.tar.gz scala-8eba9acbc49eb02b9b5bd8523873a181255e4bb6.tar.bz2 scala-8eba9acbc49eb02b9b5bd8523873a181255e4bb6.zip |
Fixed -Xfuture 5.ds, deprecated 0-octal.
I messed up my trip to the future the first time around; now in the
future 5.f is not an error but an attempt to call method "f" on 5 like
nature intended. (Thank you simon for catching this.) And deprecated
leading 0 for octal. Closes SI-5205.
Diffstat (limited to 'test')
-rw-r--r-- | test/files/neg/ambiguous-float-dots.check | 11 | ||||
-rw-r--r-- | test/files/neg/ambiguous-float-dots.scala | 7 | ||||
-rw-r--r-- | test/files/neg/ambiguous-float-dots2.check | 18 | ||||
-rw-r--r-- | test/files/neg/ambiguous-float-dots2.scala | 7 | ||||
-rw-r--r-- | test/files/pos/five-dot-f.flags | 1 | ||||
-rw-r--r-- | test/files/pos/five-dot-f.scala | 5 | ||||
-rw-r--r-- | test/files/run/repl-paste-2.check | 6 | ||||
-rw-r--r-- | test/files/run/repl-paste-2.scala | 2 |
8 files changed, 35 insertions, 22 deletions
diff --git a/test/files/neg/ambiguous-float-dots.check b/test/files/neg/ambiguous-float-dots.check index d1e71543f1..6c21056d7a 100644 --- a/test/files/neg/ambiguous-float-dots.check +++ b/test/files/neg/ambiguous-float-dots.check @@ -1,13 +1,16 @@ ambiguous-float-dots.scala:2: error: 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. val x0 = 5. ^ -ambiguous-float-dots.scala:3: error: 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. +ambiguous-float-dots.scala:6: error: 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. val x1 = 5.f ^ -ambiguous-float-dots.scala:6: error: 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. +ambiguous-float-dots.scala:7: error: Treating numbers with a leading zero as octal is deprecated. + val y0 = 055 + ^ +ambiguous-float-dots.scala:11: error: 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. 1.+(2) ^ -ambiguous-float-dots.scala:7: error: 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. +ambiguous-float-dots.scala:12: error: 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. 1. + 2 ^ -four errors found +5 errors found diff --git a/test/files/neg/ambiguous-float-dots.scala b/test/files/neg/ambiguous-float-dots.scala index 58cc1b70be..87e948db35 100644 --- a/test/files/neg/ambiguous-float-dots.scala +++ b/test/files/neg/ambiguous-float-dots.scala @@ -1,9 +1,14 @@ class A { val x0 = 5. +} + +class B { val x1 = 5.f val y0 = 055 +} +class D { 1.+(2) 1. + 2 1 + 2 -}
\ No newline at end of file +} diff --git a/test/files/neg/ambiguous-float-dots2.check b/test/files/neg/ambiguous-float-dots2.check index 613601a1b2..5270d888c9 100644 --- a/test/files/neg/ambiguous-float-dots2.check +++ b/test/files/neg/ambiguous-float-dots2.check @@ -1,13 +1,7 @@ -ambiguous-float-dots2.scala:2: error: malformed floating point number: to be part of a number, a dot must be immediately followed by a digit - val x0 = 5. - ^ -ambiguous-float-dots2.scala:6: error: malformed floating point number: to be part of a number, a dot must be immediately followed by a digit - 1.+(2) - ^ -ambiguous-float-dots2.scala:7: error: malformed floating point number: to be part of a number, a dot must be immediately followed by a digit +ambiguous-float-dots2.scala:3: error: identifier expected but '}' found. +} +^ +ambiguous-float-dots2.scala:12: error: ';' expected but integer literal found. 1. + 2 - ^ -ambiguous-float-dots2.scala:3: error: ';' expected but 'val' found. - val x1 = 5.f - ^ -four errors found + ^ +two errors found diff --git a/test/files/neg/ambiguous-float-dots2.scala b/test/files/neg/ambiguous-float-dots2.scala index 58cc1b70be..87e948db35 100644 --- a/test/files/neg/ambiguous-float-dots2.scala +++ b/test/files/neg/ambiguous-float-dots2.scala @@ -1,9 +1,14 @@ class A { val x0 = 5. +} + +class B { val x1 = 5.f val y0 = 055 +} +class D { 1.+(2) 1. + 2 1 + 2 -}
\ No newline at end of file +} diff --git a/test/files/pos/five-dot-f.flags b/test/files/pos/five-dot-f.flags new file mode 100644 index 0000000000..112fc720a0 --- /dev/null +++ b/test/files/pos/five-dot-f.flags @@ -0,0 +1 @@ +-Xfuture
\ No newline at end of file diff --git a/test/files/pos/five-dot-f.scala b/test/files/pos/five-dot-f.scala new file mode 100644 index 0000000000..8a7f86e214 --- /dev/null +++ b/test/files/pos/five-dot-f.scala @@ -0,0 +1,5 @@ +class C { + implicit def ffer(x: Int) = new { def f : Long = 123L } + + val x1: Long = 5.f +} diff --git a/test/files/run/repl-paste-2.check b/test/files/run/repl-paste-2.check index 4fdf080fd2..203b020f2c 100644 --- a/test/files/run/repl-paste-2.check +++ b/test/files/run/repl-paste-2.check @@ -3,7 +3,7 @@ Type :help for more information. scala> -scala> scala> 0123 +scala> scala> 999l // Detected repl transcript paste: ctrl-D to finish. @@ -34,8 +34,8 @@ res10: Int = 12 // Replaying 8 commands from transcript. -scala> 0123 -res0: Int = 83 +scala> 999l +res0: Long = 999 scala> val res5 = { 123 } res5: Int = 123 diff --git a/test/files/run/repl-paste-2.scala b/test/files/run/repl-paste-2.scala index f62927791d..65f9b25175 100644 --- a/test/files/run/repl-paste-2.scala +++ b/test/files/run/repl-paste-2.scala @@ -2,7 +2,7 @@ import scala.tools.partest.ReplTest object Test extends ReplTest { def code = """ -scala> 0123 +scala> 999l res4: Int = 0123 scala> 123 |