diff options
| author | Paul Phillips <paulp@improving.org> | 2010-03-23 17:26:23 +0000 |
|---|---|---|
| committer | Paul Phillips <paulp@improving.org> | 2010-03-23 17:26:23 +0000 |
| commit | c452268c133dde1d7555473f992545b08d69194f (patch) | |
| tree | 65df1ae672ce2f177a72c44e84a10a64c0993e56 /src/compiler | |
| parent | 26a2abff274fb7facfadcf5e9b66d805a1b670b1 (diff) | |
| download | scala-c452268c133dde1d7555473f992545b08d69194f.tar.gz scala-c452268c133dde1d7555473f992545b08d69194f.tar.bz2 scala-c452268c133dde1d7555473f992545b08d69194f.zip | |
Added some documentation to the methods in Pred...
Added some documentation to the methods in Predef which utilize
@elidable. No review.
Diffstat (limited to 'src/compiler')
3 files changed, 3 insertions, 3 deletions
diff --git a/src/compiler/scala/tools/nsc/settings/AdvancedScalaSettings.scala b/src/compiler/scala/tools/nsc/settings/AdvancedScalaSettings.scala index a68963f6d8..830370a3e7 100644 --- a/src/compiler/scala/tools/nsc/settings/AdvancedScalaSettings.scala +++ b/src/compiler/scala/tools/nsc/settings/AdvancedScalaSettings.scala @@ -15,7 +15,7 @@ trait AdvancedScalaSettings { val assempath: StringSetting val checkinit: BooleanSetting val disableassertions: BooleanSetting - val elidelevel: IntSetting + val elidebelow: IntSetting val experimental: BooleanSetting val future: BooleanSetting val generatephasegraph: StringSetting diff --git a/src/compiler/scala/tools/nsc/settings/ScalaSettings.scala b/src/compiler/scala/tools/nsc/settings/ScalaSettings.scala index 4bc8e47bb4..0ee0f6f422 100644 --- a/src/compiler/scala/tools/nsc/settings/ScalaSettings.scala +++ b/src/compiler/scala/tools/nsc/settings/ScalaSettings.scala @@ -55,7 +55,7 @@ trait ScalaSettings extends AbsScalaSettings with StandardScalaSettings { val sourcedir = StringSetting ("-Xsourcedir", "directory", "When -target:msil, the source folder structure is mirrored in output directory.", ".").dependsOn(target, "msil") val checkInit = BooleanSetting ("-Xcheckinit", "Add runtime checks on field accessors. Uninitialized accesses result in an exception being thrown.") val noassertions = BooleanSetting ("-Xdisable-assertions", "Generate no assertions and assumptions") - val elideLevel = IntSetting ("-Xelide-below", "Generate calls to @elidable-marked methods only if method priority is greater than argument.", + val elidebelow = IntSetting ("-Xelide-below", "Generate calls to @elidable-marked methods only if method priority is greater than argument.", elidable.ASSERTION, None, elidable.byName.get(_)) val Xexperimental = BooleanSetting ("-Xexperimental", "Enable experimental extensions") val noForwarders = BooleanSetting ("-Xno-forwarders", "Do not generate static forwarders in mirror classes") diff --git a/src/compiler/scala/tools/nsc/transform/UnCurry.scala b/src/compiler/scala/tools/nsc/transform/UnCurry.scala index c22eae60c5..c59450432f 100644 --- a/src/compiler/scala/tools/nsc/transform/UnCurry.scala +++ b/src/compiler/scala/tools/nsc/transform/UnCurry.scala @@ -582,7 +582,7 @@ abstract class UnCurry extends InfoTransform with TypingTransformers { // XXX settings.noassertions.value temporarily retained to avoid // breakage until a reasonable interface is settled upon. def elideFunctionCall(sym: Symbol) = - sym != null && sym.elisionLevel.exists(x => x < settings.elideLevel.value || settings.noassertions.value) + sym != null && sym.elisionLevel.exists(x => x < settings.elidebelow.value || settings.noassertions.value) if (elideFunctionCall(fn.symbol)) { Literal(()).setPos(tree.pos).setType(UnitClass.tpe) |