diff options
| author | Paul Phillips <paulp@improving.org> | 2010-11-02 16:49:45 +0000 |
|---|---|---|
| committer | Paul Phillips <paulp@improving.org> | 2010-11-02 16:49:45 +0000 |
| commit | 8e320487627e85cce44a4eab0d77d28fd0904d50 (patch) | |
| tree | 4ec432f0c3566e5b4d70aebe1bc9266cf006efd0 /src/compiler/scala/tools/nsc/javac/JavaParsers.scala | |
| parent | 543d70e30c153522eedb986755ae3a5de8d820c6 (diff) | |
| download | scala-8e320487627e85cce44a4eab0d77d28fd0904d50.tar.gz scala-8e320487627e85cce44a4eab0d77d28fd0904d50.tar.bz2 scala-8e320487627e85cce44a4eab0d77d28fd0904d50.zip | |
One of those annoying patches for which I apolo...
One of those annoying patches for which I apologize in advance. It's a
step toward a better world. Almost all the changes herein are simple
transformations of "x hasFlag FOO" to "x.isFoo", with the remainder
minor cleanups. It's too big to review, so let's say no review:
but I'm still all ears for input on the issues mostly outlined in
HasFlags.scala.
Diffstat (limited to 'src/compiler/scala/tools/nsc/javac/JavaParsers.scala')
| -rw-r--r-- | src/compiler/scala/tools/nsc/javac/JavaParsers.scala | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/compiler/scala/tools/nsc/javac/JavaParsers.scala b/src/compiler/scala/tools/nsc/javac/JavaParsers.scala index 1f071e2288..1dfab2a98a 100644 --- a/src/compiler/scala/tools/nsc/javac/JavaParsers.scala +++ b/src/compiler/scala/tools/nsc/javac/JavaParsers.scala @@ -615,8 +615,8 @@ trait JavaParsers extends JavaScanners { def varDecl(pos: Position, mods: Modifiers, tpt: Tree, name: Name): ValDef = { val tpt1 = optArrayBrackets(tpt) - if (in.token == ASSIGN && !(mods hasFlag Flags.PARAM)) skipTo(COMMA, SEMI) - val mods1 = if (mods hasFlag Flags.FINAL) mods &~ Flags.FINAL else mods | Flags.MUTABLE + if (in.token == ASSIGN && !mods.isParameter) skipTo(COMMA, SEMI) + val mods1 = if (mods.isFinal) mods &~ Flags.FINAL else mods | Flags.MUTABLE atPos(pos) { ValDef(mods1, name, tpt1, blankExpr) } @@ -771,7 +771,7 @@ trait JavaParsers extends JavaScanners { } else { if (in.token == ENUM || definesInterface(in.token)) mods |= Flags.STATIC val decls = memberDecl(mods, parentToken) - (if ((mods hasFlag Flags.STATIC) || inInterface && !(decls exists (_.isInstanceOf[DefDef]))) + (if (mods.hasStaticFlag || inInterface && !(decls exists (_.isInstanceOf[DefDef]))) statics else members) ++= decls |