diff options
| author | Iulian Dragos <jaguarul@gmail.com> | 2006-09-21 16:34:41 +0000 |
|---|---|---|
| committer | Iulian Dragos <jaguarul@gmail.com> | 2006-09-21 16:34:41 +0000 |
| commit | e40402803f660b58f8a019c7fcbda9e21c9c4250 (patch) | |
| tree | a4b66e9b6a4bd6725b3ccfbd0932f2c3ba346cf6 | |
| parent | bf98eebc6c0e2246f54a5b40920ddaf0b498d9de (diff) | |
| download | scala-e40402803f660b58f8a019c7fcbda9e21c9c4250.tar.gz scala-e40402803f660b58f8a019c7fcbda9e21c9c4250.tar.bz2 scala-e40402803f660b58f8a019c7fcbda9e21c9c4250.zip | |
Made InnerClasses attribute default
| -rw-r--r-- | src/compiler/scala/tools/nsc/Settings.scala | 1 | ||||
| -rw-r--r-- | src/compiler/scala/tools/nsc/backend/jvm/GenJVM.scala | 4 |
2 files changed, 1 insertions, 4 deletions
diff --git a/src/compiler/scala/tools/nsc/Settings.scala b/src/compiler/scala/tools/nsc/Settings.scala index c746f57e39..6c28cf436f 100644 --- a/src/compiler/scala/tools/nsc/Settings.scala +++ b/src/compiler/scala/tools/nsc/Settings.scala @@ -122,7 +122,6 @@ class Settings(error: String => unit) { val Xgenerics = BooleanSetting("-Xgenerics", "Use generic Java types") val Xprintpos = BooleanSetting("-Xprintpos", "Print tree positions (as offsets)") val Xscript = BooleanSetting("-Xscript", "compile script file") - val XinnerClasses = BooleanSetting("-XinnerClasses", "generate InnerClasses attribute for Java interoperability") /** A list of all settings */ def allSettings: List[Setting] = allsettings.reverse diff --git a/src/compiler/scala/tools/nsc/backend/jvm/GenJVM.scala b/src/compiler/scala/tools/nsc/backend/jvm/GenJVM.scala index d3f9160411..a6125c4a95 100644 --- a/src/compiler/scala/tools/nsc/backend/jvm/GenJVM.scala +++ b/src/compiler/scala/tools/nsc/backend/jvm/GenJVM.scala @@ -115,9 +115,7 @@ abstract class GenJVM extends SubComponent { } if (!(jclass.getName().endsWith("$") && sym.isModuleClass)) addScalaAttr(if (isTopLevelModule(sym)) sym.sourceModule else sym); - - if (settings.XinnerClasses.value) - addInnerClasses; + addInnerClasses; val outfile = getFile(jclass, ".class") jclass.writeTo(outfile) |