diff options
| author | Johannes Rudolph <johannes.rudolph@gmail.com> | 2016-03-08 23:02:23 +0100 |
|---|---|---|
| committer | Lukas Rytz <lukas.rytz@gmail.com> | 2016-10-28 16:56:57 +0200 |
| commit | 81d2c6185e6c10defcf1f6a25f69e8b2ed025d86 (patch) | |
| tree | d1a69af725a9bd7944e3edd159bebf89ab4d7954 /src/reflect/scala/reflect | |
| parent | b9a16c4a812a0bde8bd23fb90c0ec5d9439e0e14 (diff) | |
| download | scala-81d2c6185e6c10defcf1f6a25f69e8b2ed025d86.tar.gz scala-81d2c6185e6c10defcf1f6a25f69e8b2ed025d86.tar.bz2 scala-81d2c6185e6c10defcf1f6a25f69e8b2ed025d86.zip | |
SI-3236 constant types for literal final static java fields
Since we don't parse Java expressions, fields of Java classes coming
from source files never have constant types. This prevents using
static java fields in annotation arguments in mixed compilation
This PR assigns constant types to final static java fields if the
initializer is a simple literal.
Diffstat (limited to 'src/reflect/scala/reflect')
| -rw-r--r-- | src/reflect/scala/reflect/internal/StdNames.scala | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/reflect/scala/reflect/internal/StdNames.scala b/src/reflect/scala/reflect/internal/StdNames.scala index a0688e129c..5e2bbf9598 100644 --- a/src/reflect/scala/reflect/internal/StdNames.scala +++ b/src/reflect/scala/reflect/internal/StdNames.scala @@ -1103,6 +1103,7 @@ trait StdNames { final val ELSEkw: TermName = kw("else") final val ENUMkw: TermName = kw("enum") final val EXTENDSkw: TermName = kw("extends") + final val FALSEkw: TermName = kw("false") final val FINALkw: TermName = kw("final") final val FINALLYkw: TermName = kw("finally") final val FLOATkw: TermName = kw("float") @@ -1132,6 +1133,7 @@ trait StdNames { final val THROWkw: TermName = kw("throw") final val THROWSkw: TermName = kw("throws") final val TRANSIENTkw: TermName = kw("transient") + final val TRUEkw: TermName = kw("true") final val TRYkw: TermName = kw("try") final val VOIDkw: TermName = kw("void") final val VOLATILEkw: TermName = kw("volatile") |