diff options
author | Paul Phillips <paulp@improving.org> | 2012-05-11 10:25:34 -0700 |
---|---|---|
committer | Paul Phillips <paulp@improving.org> | 2012-05-11 10:26:29 -0700 |
commit | 807567230852bcadb98a91322bd348aae764801f (patch) | |
tree | e7efba8909d8c50b76a343192e6a0eb277c61527 /src/compiler/scala/tools/nsc/javac | |
parent | 2422b064e7a52c04dfb2239fc8e7b9ffbab24251 (diff) | |
download | scala-807567230852bcadb98a91322bd348aae764801f.tar.gz scala-807567230852bcadb98a91322bd348aae764801f.tar.bz2 scala-807567230852bcadb98a91322bd348aae764801f.zip |
Recognize java enums as constants from source.
Fixed up one of the mismatches between how java source is modeled
and how java bytecode is modeled. We should get the rest of them
too. Closes SI-2764.
Diffstat (limited to 'src/compiler/scala/tools/nsc/javac')
-rw-r--r-- | src/compiler/scala/tools/nsc/javac/JavaParsers.scala | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/compiler/scala/tools/nsc/javac/JavaParsers.scala b/src/compiler/scala/tools/nsc/javac/JavaParsers.scala index 5c413243e8..f71e067366 100644 --- a/src/compiler/scala/tools/nsc/javac/JavaParsers.scala +++ b/src/compiler/scala/tools/nsc/javac/JavaParsers.scala @@ -872,7 +872,10 @@ trait JavaParsers extends ast.parser.ParsersCommon with JavaScanners { skipAhead() accept(RBRACE) } - ValDef(Modifiers(Flags.JAVA | Flags.STATIC), name, enumType, blankExpr) + // The STABLE flag is to signal to namer that this was read from a + // java enum, and so should be given a Constant type (thereby making + // it usable in annotations.) + ValDef(Modifiers(Flags.STABLE | Flags.JAVA | Flags.STATIC), name, enumType, blankExpr) } } |