diff options
| -rw-r--r-- | src/compiler/scala/tools/nsc/util/ClassPath.scala | 5 | ||||
| -rw-r--r-- | src/library/scala/xml/ProcInstr.scala | 2 | ||||
| -rw-r--r-- | src/library/scala/xml/dtd/ElementValidator.scala | 2 | ||||
| -rw-r--r-- | src/scalap/scala/tools/scalap/Decode.scala | 2 |
4 files changed, 5 insertions, 6 deletions
diff --git a/src/compiler/scala/tools/nsc/util/ClassPath.scala b/src/compiler/scala/tools/nsc/util/ClassPath.scala index cc640d5c54..4994542fdb 100644 --- a/src/compiler/scala/tools/nsc/util/ClassPath.scala +++ b/src/compiler/scala/tools/nsc/util/ClassPath.scala @@ -246,7 +246,7 @@ abstract class ClassPath[T] { /** Filters for assessing validity of various entities. */ def validClassFile(name: String) = (name endsWith ".class") && context.isValidName(name) - def validPackage(name: String) = (name != "META-INF") && (name != "") && (name.head != '.') + def validPackage(name: String) = (name != "META-INF") && (name != "") && (name(0) != '.') def validSourceFile(name: String) = validSourceExtensions exists (name endsWith _) def validSourceExtensions = List(".scala", ".java") @@ -320,8 +320,7 @@ class DirectoryClassPath(val dir: AbstractFile, val context: ClassPathContext[Ab case f if f.isDirectory && validPackage(f.name) => new DirectoryClassPath(f, context) } toList - - override def toString() = "directory classpath: "+ dir.toString() + override def toString() = "directory classpath: "+ dir } /** diff --git a/src/library/scala/xml/ProcInstr.scala b/src/library/scala/xml/ProcInstr.scala index b906e09877..72b9ba00f2 100644 --- a/src/library/scala/xml/ProcInstr.scala +++ b/src/library/scala/xml/ProcInstr.scala @@ -34,5 +34,5 @@ case class ProcInstr(target: String, proctext: String) extends SpecialNode * to this stringbuffer. */ override def buildString(sb: StringBuilder) = - sb append "<?%s%s?>".format(target, (if (proctext.isEmpty) "" else " " + proctext)) + sb append "<?%s%s?>".format(target, (if (proctext == "") "" else " " + proctext)) } diff --git a/src/library/scala/xml/dtd/ElementValidator.scala b/src/library/scala/xml/dtd/ElementValidator.scala index 9e2b43f68b..872fb58393 100644 --- a/src/library/scala/xml/dtd/ElementValidator.scala +++ b/src/library/scala/xml/dtd/ElementValidator.scala @@ -47,7 +47,7 @@ class ElementValidator() extends Function1[Node,Boolean] { def setMetaData(adecls: List[AttrDecl]) { this.adecls = adecls } def getIterable(nodes: Seq[Node], skipPCDATA: Boolean): Iterable[ElemName] = { - def isAllWhitespace(a: Atom[_]) = cond(a.data) { case s: String if s.trim.isEmpty => true } + def isAllWhitespace(a: Atom[_]) = cond(a.data) { case s: String if s.trim == "" => true } nodes.filter { case y: SpecialNode => y match { diff --git a/src/scalap/scala/tools/scalap/Decode.scala b/src/scalap/scala/tools/scalap/Decode.scala index 5189009584..b289e476aa 100644 --- a/src/scalap/scala/tools/scalap/Decode.scala +++ b/src/scalap/scala/tools/scalap/Decode.scala @@ -72,7 +72,7 @@ object Decode { } yield { val f: PartialFunction[Symbol, List[String]] = - if (inner.isEmpty) { + if (inner == "") { case x: MethodSymbol if x.isCaseAccessor && (x.name endsWith " ") => List(x.name dropRight 1) } else { |