diff options
| author | Paul Phillips <paulp@improving.org> | 2010-01-31 16:34:24 +0000 |
|---|---|---|
| committer | Paul Phillips <paulp@improving.org> | 2010-01-31 16:34:24 +0000 |
| commit | 1c8ab3a6ed943410314029387ce71541e1b96b58 (patch) | |
| tree | cf53e855788bab45441af916ccde0d1b79a836a0 | |
| parent | 0bc49d7c61e4e7774ecdb69204066218d0234cfa (diff) | |
| download | scala-1c8ab3a6ed943410314029387ce71541e1b96b58.tar.gz scala-1c8ab3a6ed943410314029387ce71541e1b96b58.tar.bz2 scala-1c8ab3a6ed943410314029387ce71541e1b96b58.zip | |
Great moments in typos: somehow the "decodeUni"...
Great moments in typos: somehow the "decodeUni" in CharArrayReader
had transmogrified into "decodeUnit" in UnitScanner, thus causing
-Xno-uescape to be ignored. Also, removed a now unused -X option. Review
by community.
| -rw-r--r-- | src/compiler/scala/tools/nsc/Settings.scala | 1 | ||||
| -rw-r--r-- | src/compiler/scala/tools/nsc/ast/parser/Scanners.scala | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/src/compiler/scala/tools/nsc/Settings.scala b/src/compiler/scala/tools/nsc/Settings.scala index f15017f933..951f165f36 100644 --- a/src/compiler/scala/tools/nsc/Settings.scala +++ b/src/compiler/scala/tools/nsc/Settings.scala @@ -865,7 +865,6 @@ trait ScalacSettings { val genPhaseGraph = StringSetting ("-Xgenerate-phase-graph", "file", "Generate the phase graphs (outputs .dot files) to fileX.dot", "") val XlogImplicits = BooleanSetting ("-Xlog-implicits", "Show more info on why some implicits are not applicable") val nouescape = BooleanSetting ("-Xno-uescape", "Disables handling of \\u unicode escapes") - val XnoVarargsConversion = BooleanSetting("-Xno-varargs-conversion", "disable varags conversion") val Xnojline = BooleanSetting ("-Xnojline", "Do not use JLine for editing") val plugin = MultiStringSetting("-Xplugin", "file", "Load a plugin from a file") val disable = MultiStringSetting("-Xplugin-disable", "plugin", "Disable a plugin") diff --git a/src/compiler/scala/tools/nsc/ast/parser/Scanners.scala b/src/compiler/scala/tools/nsc/ast/parser/Scanners.scala index 6cb7c8b99f..4d1fe1c9bf 100644 --- a/src/compiler/scala/tools/nsc/ast/parser/Scanners.scala +++ b/src/compiler/scala/tools/nsc/ast/parser/Scanners.scala @@ -1015,7 +1015,7 @@ trait Scanners { class UnitScanner(unit: CompilationUnit, patches: List[BracePatch]) extends Scanner { def this(unit: CompilationUnit) = this(unit, List()) val buf = unit.source.asInstanceOf[BatchSourceFile].content - val decodeUnit = !settings.nouescape.value + override val decodeUni: Boolean = !settings.nouescape.value def warning(off: Offset, msg: String) = unit.warning(unit.position(off), msg) def error (off: Offset, msg: String) = unit.error(unit.position(off), msg) |