diff options
author | Paul Phillips <paulp@improving.org> | 2011-01-12 19:32:10 +0000 |
---|---|---|
committer | Paul Phillips <paulp@improving.org> | 2011-01-12 19:32:10 +0000 |
commit | b4ba25da7ea3ed8f7f6ab23af241f025d4e9ea27 (patch) | |
tree | 207c19eafeba624a0d706aedccd05461585dd0d3 /test/files | |
parent | 236f61c04c9bd3f4bb8651c0bd2fe1ac8c663095 (diff) | |
download | scala-b4ba25da7ea3ed8f7f6ab23af241f025d4e9ea27.tar.gz scala-b4ba25da7ea3ed8f7f6ab23af241f025d4e9ea27.tar.bz2 scala-b4ba25da7ea3ed8f7f6ab23af241f025d4e9ea27.zip |
Some modifications to @elidable: for reasons lo...
Some modifications to @elidable: for reasons lost to me now it had a
default value such that annotated methods might be elided even if the
option wasn't given. It now does nothing in that situation. Closes
#4051, #4151, no review.
Diffstat (limited to 'test/files')
-rw-r--r-- | test/files/pos/elidable-tparams.scala | 2 | ||||
-rw-r--r-- | test/files/run/elidable-noflags.check | 7 | ||||
-rw-r--r-- | test/files/run/elidable-noflags.scala | 22 |
3 files changed, 30 insertions, 1 deletions
diff --git a/test/files/pos/elidable-tparams.scala b/test/files/pos/elidable-tparams.scala index 456c472c4e..23b1cba615 100644 --- a/test/files/pos/elidable-tparams.scala +++ b/test/files/pos/elidable-tparams.scala @@ -4,7 +4,7 @@ import elidable._ class ElidableCrashTest { trait My - @elidable(ALL) def foo[a >: My <: My]: scala.Unit = () + @elidable(MINIMUM) def foo[a >: My <: My]: scala.Unit = () foo[My] // crash }
\ No newline at end of file diff --git a/test/files/run/elidable-noflags.check b/test/files/run/elidable-noflags.check new file mode 100644 index 0000000000..23be9ab4ef --- /dev/null +++ b/test/files/run/elidable-noflags.check @@ -0,0 +1,7 @@ +Good for me, I was not elided. +Good for me, I was not elided. +Good for me, I was not elided. +Good for me, I was not elided. +Good for me, I was not elided. +Good for me, I was not elided. +ESPECIALLY good for me, I was not elided. diff --git a/test/files/run/elidable-noflags.scala b/test/files/run/elidable-noflags.scala new file mode 100644 index 0000000000..1b9c5118bb --- /dev/null +++ b/test/files/run/elidable-noflags.scala @@ -0,0 +1,22 @@ +import annotation._ +import elidable._ + +object Test { + @elidable(FINEST) def f1() = println("Good for me, I was not elided.") + @elidable(INFO) def f2() = println("Good for me, I was not elided.") + @elidable(SEVERE) def f3() = println("Good for me, I was not elided.") + @elidable(INFO) def f4() = println("Good for me, I was not elided.") + @elidable(100000) def f5() = println("Good for me, I was not elided.") + @elidable(OFF) def f6() = println("Good for me, I was not elided.") + @elidable(ALL) def f7() = println("ESPECIALLY good for me, I was not elided.") + + def main(args: Array[String]): Unit = { + f1() + f2() + f3() + f4() + f5() + f6() + f7() + } +} |