diff options
| author | Jason Zaugg <jzaugg@gmail.com> | 2013-02-24 14:44:57 +0100 |
|---|---|---|
| committer | Paul Phillips <paulp@improving.org> | 2013-03-05 09:39:30 -0800 |
| commit | fff0f50773b45690d571852b139bd6da7b6a45ae (patch) | |
| tree | 9f53db9730fe2d07167e817d0692c3f53f483275 /src/compiler/scala/tools/nsc/io | |
| parent | c4341385629bd114b61c55103f1d83f26dce22f9 (diff) | |
| download | scala-fff0f50773b45690d571852b139bd6da7b6a45ae.tar.gz scala-fff0f50773b45690d571852b139bd6da7b6a45ae.tar.bz2 scala-fff0f50773b45690d571852b139bd6da7b6a45ae.zip | |
Name boolean arguments in src/compiler.
What would you prefer?
adaptToMemberWithArgs(tree, qual, name, mode, false, false)
Or:
adaptToMemberWithArgs(tree, qual, name, mode, reportAmbiguous = false, saveErrors = false)
Diffstat (limited to 'src/compiler/scala/tools/nsc/io')
| -rw-r--r-- | src/compiler/scala/tools/nsc/io/Jar.scala | 2 | ||||
| -rw-r--r-- | src/compiler/scala/tools/nsc/io/SourceReader.scala | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/compiler/scala/tools/nsc/io/Jar.scala b/src/compiler/scala/tools/nsc/io/Jar.scala index 94399f936b..ee3e2b04d1 100644 --- a/src/compiler/scala/tools/nsc/io/Jar.scala +++ b/src/compiler/scala/tools/nsc/io/Jar.scala @@ -159,7 +159,7 @@ object Jar { private val ZipMagicNumber = List[Byte](80, 75, 3, 4) private def magicNumberIsZip(f: Path) = f.isFile && (f.toFile.bytes().take(4).toList == ZipMagicNumber) - def isJarOrZip(f: Path): Boolean = isJarOrZip(f, true) + def isJarOrZip(f: Path): Boolean = isJarOrZip(f, examineFile = true) def isJarOrZip(f: Path, examineFile: Boolean): Boolean = f.hasExtension("zip", "jar") || (examineFile && magicNumberIsZip(f)) diff --git a/src/compiler/scala/tools/nsc/io/SourceReader.scala b/src/compiler/scala/tools/nsc/io/SourceReader.scala index ece78db2cf..3220c2e2b2 100644 --- a/src/compiler/scala/tools/nsc/io/SourceReader.scala +++ b/src/compiler/scala/tools/nsc/io/SourceReader.scala @@ -74,7 +74,7 @@ class SourceReader(decoder: CharsetDecoder, reporter: Reporter) { protected def read(bytes: ByteBuffer): Array[Char] = { val decoder: CharsetDecoder = this.decoder.reset() val chars: CharBuffer = this.chars; chars.clear() - terminate(flush(decoder, decode(decoder, bytes, chars, true))) + terminate(flush(decoder, decode(decoder, bytes, chars, endOfInput = true))) } //######################################################################## |