diff options
-rw-r--r-- | src/compiler/scala/tools/nsc/Properties.scala | 6 | ||||
-rw-r--r-- | src/compiler/scala/tools/nsc/Settings.scala | 6 | ||||
-rw-r--r-- | src/library/scala/io/Source.scala | 8 | ||||
-rw-r--r-- | src/library/scala/util/Properties.scala | 6 | ||||
-rwxr-xr-x | test/scalatest | 2 |
5 files changed, 12 insertions, 16 deletions
diff --git a/src/compiler/scala/tools/nsc/Properties.scala b/src/compiler/scala/tools/nsc/Properties.scala index d6fdca15bb..cc7f588789 100644 --- a/src/compiler/scala/tools/nsc/Properties.scala +++ b/src/compiler/scala/tools/nsc/Properties.scala @@ -1,5 +1,5 @@ /* NSC -- new Scala compiler - * Copyright 2006-2007 LAMP/EPFL + * Copyright 2006-2008 LAMP/EPFL * @author Stephane Micheloud */ @@ -35,12 +35,12 @@ object Properties { } val copyrightString: String = { - val defaultString = "(c) 2002-2007 LAMP/EPFL" + val defaultString = "(c) 2002-2008 LAMP/EPFL" props.getProperty("copyright.string", defaultString) } val encodingString: String = { - val defaultString = "ISO-8859-1" + val defaultString = "UTF8" //"ISO-8859-1" props.getProperty("file.encoding", defaultString) } diff --git a/src/compiler/scala/tools/nsc/Settings.scala b/src/compiler/scala/tools/nsc/Settings.scala index 4692eabca6..ecf8f5994a 100644 --- a/src/compiler/scala/tools/nsc/Settings.scala +++ b/src/compiler/scala/tools/nsc/Settings.scala @@ -80,10 +80,6 @@ class Settings(error: String => Unit) { } else null } - private val encodingDefault = - new java.io.OutputStreamWriter( - new java.io.ByteArrayOutputStream()).getEncoding - val debuginfo = new DebugSetting ("-g", "Specify level of generated debugging info", List("none", "source", "line", "vars", "notc"), "vars", "vars") val nowarnings = BooleanSetting ("-nowarn", "Generate no warnings").hideToIDE val verbose = BooleanSetting ("-verbose", "Output messages about what the compiler is doing").hideToIDE @@ -94,7 +90,7 @@ class Settings(error: String => Unit) { val bootclasspath = StringSetting ("-bootclasspath", "path", "Override location of bootstrap class files", bootclasspathDefault) val extdirs = StringSetting ("-extdirs", "dirs", "Override location of installed extensions", extdirsDefault) val outdir = StringSetting ("-d", "directory", "Specify where to place generated class files", ".") - val encoding = StringSetting ("-encoding", "encoding", "Specify character encoding used by source files", encodingDefault) + val encoding = StringSetting ("-encoding", "encoding", "Specify character encoding used by source files", Properties.encodingString) val target = ChoiceSetting ("-target", "Specify for which target object files should be built", List("jvm-1.5", "jvm-1.4", "msil", "cldc"), "jvm-1.5") val printLate = BooleanSetting ("-print", "Print program with all Scala-specific features removed").hideToIDE val XO = BooleanSetting ("-optimise", "Generates faster bytecode by applying optimisations to the program") diff --git a/src/library/scala/io/Source.scala b/src/library/scala/io/Source.scala index 083e401348..6d4d29307a 100644 --- a/src/library/scala/io/Source.scala +++ b/src/library/scala/io/Source.scala @@ -92,8 +92,8 @@ object Source { * filename. * @deprecated use fromFile(name, enc) instead. */ - @deprecated def fromFile(name: String): Source = - fromFile(new File(name)) + def fromFile(name: String): Source = + fromFile(name, util.Properties.encodingString) /** creates Source from file with given name, using given encoding, setting * its description to filename. @@ -104,8 +104,8 @@ object Source { /** creates Source from file with given file: URI * @deprecated use fromFile(uri, enc) instead. */ - @deprecated def fromFile(uri: URI): Source = - fromFile(new File(uri)) + def fromFile(uri: URI): Source = + fromFile(uri, util.Properties.encodingString) /** creates Source from file with given file: URI */ diff --git a/src/library/scala/util/Properties.scala b/src/library/scala/util/Properties.scala index d6e77ffa60..2fa885dc3a 100644 --- a/src/library/scala/util/Properties.scala +++ b/src/library/scala/util/Properties.scala @@ -1,6 +1,6 @@ /* __ *\ ** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2006-2007, LAMP/EPFL ** +** / __/ __// _ | / / / _ | (c) 2006-2008, LAMP/EPFL ** ** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ ** ** /____/\___/_/ |_/____/_/ | | ** ** |/ ** @@ -38,12 +38,12 @@ object Properties { } val copyrightString: String = { - val defaultString = "(c) 2002-2007 LAMP/EPFL" + val defaultString = "(c) 2002-2008 LAMP/EPFL" props.getProperty("copyright.string", defaultString) } val encodingString: String = { - val defaultString = "ISO-8859-1" + val defaultString = "UTF8" //"ISO-8859-1" props.getProperty("file.encoding", defaultString) } diff --git a/test/scalatest b/test/scalatest index 663711a67a..a5137612d8 100755 --- a/test/scalatest +++ b/test/scalatest @@ -812,7 +812,7 @@ if [ "$TEST_ALL" = "true" ]; then fi; SCALA="${BIN_DIR}scala"; -[ -z "$SCALAC_OPTS" ] && SCALAC_OPTS="-deprecation -encoding utf8"; +[ -z "$SCALAC_OPTS" ] && SCALAC_OPTS="-deprecation -unchecked"; if [ "$USEFSC" = "true" ]; then SCALAC_CMD="${BIN_DIR}fsc"; else |