diff options
author | michelou <michelou@epfl.ch> | 2007-02-07 14:37:44 +0000 |
---|---|---|
committer | michelou <michelou@epfl.ch> | 2007-02-07 14:37:44 +0000 |
commit | 9be1288dec994c96ab4619b7e3ffb096664ba01a (patch) | |
tree | 151e74cd5334f3ce38c758502032e6e2112705d1 /src/compiler/scala/tools/nsc/Global.scala | |
parent | 60b6ba084f25042e6e92e6506eaf28aa598dc097 (diff) | |
download | scala-9be1288dec994c96ab4619b7e3ffb096664ba01a.tar.gz scala-9be1288dec994c96ab4619b7e3ffb096664ba01a.tar.bz2 scala-9be1288dec994c96ab4619b7e3ffb096664ba01a.zip |
moved encoding value to object Properties
Diffstat (limited to 'src/compiler/scala/tools/nsc/Global.scala')
-rw-r--r-- | src/compiler/scala/tools/nsc/Global.scala | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/compiler/scala/tools/nsc/Global.scala b/src/compiler/scala/tools/nsc/Global.scala index ce01994aab..108d68d9b7 100644 --- a/src/compiler/scala/tools/nsc/Global.scala +++ b/src/compiler/scala/tools/nsc/Global.scala @@ -1,5 +1,5 @@ /* NSC -- new Scala compiler - * Copyright 2005-2006 LAMP/EPFL + * Copyright 2005-2007 LAMP/EPFL * @author Martin Odersky */ // $Id$ @@ -11,9 +11,8 @@ import java.io.{IOException, FileNotFoundException} import java.nio.charset._ import compat.Platform.currentTime import scala.tools.nsc.io.{SourceReader, AbstractFile} -import scala.tools.nsc.util.ClassPath -import scala.tools.nsc.util.{Position, SourceFile} import scala.tools.nsc.reporters._ +import scala.tools.nsc.util.{ClassPath, Position, SourceFile} import scala.collection.mutable.{HashSet, HashMap, ListBuffer} @@ -151,7 +150,7 @@ class Global(var settings: Settings, var reporter: Reporter) extends SymbolTable private val reader: SourceReader = { def stdCharset: Charset = { - settings.encoding.value = "ISO-8859-1"; // A mandatory charset + settings.encoding.value = Properties.encodingString // A mandatory charset Charset.forName(settings.encoding.value) } val charset = |