summaryrefslogtreecommitdiff
path: root/src/library
diff options
context:
space:
mode:
authorMartin Odersky <odersky@gmail.com>2012-04-13 12:40:59 -0700
committerMartin Odersky <odersky@gmail.com>2012-04-13 12:40:59 -0700
commitcc764e944817628cbca3f7b5a195cdb495ca8f38 (patch)
tree3508dd2fe98420f9f33fc5a4b1985e926dc12561 /src/library
parent381c0e12bf5a72df6f3b3ac8eaca1cac28263154 (diff)
downloadscala-cc764e944817628cbca3f7b5a195cdb495ca8f38.tar.gz
scala-cc764e944817628cbca3f7b5a195cdb495ca8f38.tar.bz2
scala-cc764e944817628cbca3f7b5a195cdb495ca8f38.zip
Added languageFeature annotation (was missing before). Resolved problem with late loading of nested classes in Definitions. Resolved handling of deprecated idents `then` and `macro`. Massaged test flags.
Diffstat (limited to 'src/library')
-rw-r--r--src/library/scala/annotation/meta/languageFeature.scala13
1 files changed, 13 insertions, 0 deletions
diff --git a/src/library/scala/annotation/meta/languageFeature.scala b/src/library/scala/annotation/meta/languageFeature.scala
new file mode 100644
index 0000000000..23acc01b51
--- /dev/null
+++ b/src/library/scala/annotation/meta/languageFeature.scala
@@ -0,0 +1,13 @@
+/* __ *\
+** ________ ___ / / ___ Scala API **
+** / __/ __// _ | / / / _ | (c) 2002-2011, LAMP/EPFL **
+** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ **
+** /____/\___/_/ |_/____/_/ | | **
+** |/ **
+\* */
+package scala.annotation.meta
+
+/**
+ * An annotation giving particulars for a language feature in object `scala.language`.
+ */
+final class languageFeature(feature: String, enableRequired: Boolean) extends annotation.StaticAnnotation