diff options
author | Paul Phillips <paulp@improving.org> | 2012-02-23 20:15:34 -0800 |
---|---|---|
committer | Paul Phillips <paulp@improving.org> | 2012-02-23 20:15:34 -0800 |
commit | 7c64d65510e4687b6af06a3cffb308a86e3db569 (patch) | |
tree | 078f40cf62dc4b34628a9c8741fb6e2b84e7c5fa | |
parent | ef2361190c9803190b93fd2079c1efdd6575dcdb (diff) | |
parent | 1e06aca8e3babe3b288b0599e1e55402ce454fe5 (diff) | |
download | scala-7c64d65510e4687b6af06a3cffb308a86e3db569.tar.gz scala-7c64d65510e4687b6af06a3cffb308a86e3db569.tar.bz2 scala-7c64d65510e4687b6af06a3cffb308a86e3db569.zip |
Merge remote-tracking branch 'szabolcsberecz/SI-5215' into develop
-rw-r--r-- | src/library/scala/annotation/elidable.scala | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/library/scala/annotation/elidable.scala b/src/library/scala/annotation/elidable.scala index 8dc180d7ab..145c404a28 100644 --- a/src/library/scala/annotation/elidable.scala +++ b/src/library/scala/annotation/elidable.scala @@ -10,12 +10,15 @@ package scala.annotation import java.util.logging.Level -/** An annotation for methods for which invocations might - * be removed in the generated code. +/** An annotation for methods whose body might be removed in the generated + * code. * * Behavior is influenced by passing `-Xelide-below <arg>` to `scalac`. - * Methods marked elidable will be omitted from generated code if the - * priority given the annotation is lower than to the command line argument. + * The body of methods marked elidable will be omitted from generated code + * if the priority given the annotation is lower than to the command line + * argument. If the method has a result type other than Unit, its return + * value will be the zero value of the type (0 for numeric types, false for + * boolean and null for reference types). * Examples: * {{{ * import annotation.elidable._ |