diff options
| author | Paul Phillips <paulp@improving.org> | 2009-06-24 20:54:18 +0000 |
|---|---|---|
| committer | Paul Phillips <paulp@improving.org> | 2009-06-24 20:54:18 +0000 |
| commit | 24781591253de7a9f54a3fc7bcf6ae4b3e969098 (patch) | |
| tree | f9b63c0fd117c2da79c378cbb8eda2869274d326 /src/compiler | |
| parent | f537546d8b32d06e9d9a921a47bb75f1b1f7ecfa (diff) | |
| download | scala-24781591253de7a9f54a3fc7bcf6ae4b3e969098.tar.gz scala-24781591253de7a9f54a3fc7bcf6ae4b3e969098.tar.bz2 scala-24781591253de7a9f54a3fc7bcf6ae4b3e969098.zip | |
Skeletal implementation of scala.io.File.
Separated default source code encoding (the one specified by -encoding)
from default system encoding, because otherwise you can't compile scala
with the defaults on OSX.
Diffstat (limited to 'src/compiler')
| -rw-r--r-- | src/compiler/scala/tools/nsc/Global.scala | 2 | ||||
| -rw-r--r-- | src/compiler/scala/tools/nsc/Settings.scala | 2 | ||||
| -rw-r--r-- | src/compiler/scala/tools/nsc/doc/DocUtil.scala | 3 |
3 files changed, 4 insertions, 3 deletions
diff --git a/src/compiler/scala/tools/nsc/Global.scala b/src/compiler/scala/tools/nsc/Global.scala index 76507271c0..2f28468f3c 100644 --- a/src/compiler/scala/tools/nsc/Global.scala +++ b/src/compiler/scala/tools/nsc/Global.scala @@ -191,7 +191,7 @@ class Global(var settings: Settings, var reporter: Reporter) extends SymbolTable private val reader: SourceReader = { def stdCharset: Charset = { - settings.encoding.value = Properties.encodingString // A mandatory charset + settings.encoding.value = Properties.sourceEncoding // A mandatory charset Charset.forName(settings.encoding.value) } val charset = diff --git a/src/compiler/scala/tools/nsc/Settings.scala b/src/compiler/scala/tools/nsc/Settings.scala index 20f16c785e..f0515c27d3 100644 --- a/src/compiler/scala/tools/nsc/Settings.scala +++ b/src/compiler/scala/tools/nsc/Settings.scala @@ -707,7 +707,7 @@ trait ScalacSettings { val outdir = OutputSetting (outputDirs, ".") val dependenciesFile = StringSetting ("-dependencyfile", "file", "Specify the file in which dependencies are tracked", ".scala_dependencies") val deprecation = BooleanSetting ("-deprecation", "Output source locations where deprecated APIs are used") - val encoding = StringSetting ("-encoding", "encoding", "Specify character encoding used by source files", Properties.encodingString) + val encoding = StringSetting ("-encoding", "encoding", "Specify character encoding used by source files", Properties.sourceEncoding) val explaintypes = BooleanSetting ("-explaintypes", "Explain type errors in more detail") val extdirs = StringSetting ("-extdirs", "dirs", "Override location of installed extensions", extdirsDefault) val debuginfo = DebugSetting ("-g", "Specify level of generated debugging info", List("none", "source", "line", "vars", "notailcalls"), "vars", "vars") diff --git a/src/compiler/scala/tools/nsc/doc/DocUtil.scala b/src/compiler/scala/tools/nsc/doc/DocUtil.scala index ad2c4ca521..7c976472d3 100644 --- a/src/compiler/scala/tools/nsc/doc/DocUtil.scala +++ b/src/compiler/scala/tools/nsc/doc/DocUtil.scala @@ -56,7 +56,8 @@ object DocUtil { (<a href={href}>{t0}</a>); } - val encoding = Properties.encodingString + // can't use platform default here or the generated XML may end up all MacRoman + val encoding = Properties.sourceEncoding val generator = System.getProperty("doc.generator", "scaladoc (" + Properties.versionString + ")") val header = (<meta http-equiv="content-type" content={"text/html; charset=" + encoding}/> |