diff options
| author | michelou <michelou@epfl.ch> | 2006-11-23 15:12:42 +0000 |
|---|---|---|
| committer | michelou <michelou@epfl.ch> | 2006-11-23 15:12:42 +0000 |
| commit | b72b10f8837d3347696d5a568b74947e7b814856 (patch) | |
| tree | 4f5517c04860bb3185609d5ee3842eafd0b54007 | |
| parent | 663b3ae5b89b772aff014ae5a3a5194d08878b9c (diff) | |
| download | scala-b72b10f8837d3347696d5a568b74947e7b814856.tar.gz scala-b72b10f8837d3347696d5a568b74947e7b814856.tar.bz2 scala-b72b10f8837d3347696d5a568b74947e7b814856.zip | |
removed space in argument of ambiguousError
| -rw-r--r-- | src/compiler/scala/tools/nsc/typechecker/Typers.scala | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/compiler/scala/tools/nsc/typechecker/Typers.scala b/src/compiler/scala/tools/nsc/typechecker/Typers.scala index d2cfe9b95b..ed828cfc46 100644 --- a/src/compiler/scala/tools/nsc/typechecker/Typers.scala +++ b/src/compiler/scala/tools/nsc/typechecker/Typers.scala @@ -1,5 +1,5 @@ /* NSC -- new Scala compiler - * Copyright 2005-2006 LAMP/EPFL + * Copyright 2005-2007 LAMP/EPFL * @author Martin Odersky */ // $Id$ @@ -8,8 +8,8 @@ //todo: use inherited type info also for vars and values package scala.tools.nsc.typechecker -import compat.Platform.currentTime import scala.collection.mutable.{HashMap, ListBuffer} +import scala.compat.Platform.currentTime import scala.tools.nsc.util.{HashSet, Position, Set} import symtab.Flags._ import util.HashSet @@ -2198,7 +2198,7 @@ trait Typers requires Analyzer { tree setType AnyClass.tpe case _ => - throw new Error("unexpected tree: "+tree);//debug + throw new Error("unexpected tree: " + tree)//debug } } @@ -2432,7 +2432,7 @@ trait Typers requires Analyzer { if (best == NoImplicitInfo) EmptyTree else { val competing = applicable dropWhile (alt => best == alt || improves(best, alt)) - if (!competing.isEmpty) ambiguousError(best, competing.head, "both", "and ", "") + if (!competing.isEmpty) ambiguousError(best, competing.head, "both", "and", "") for (val alt <- applicable) if (alt.sym.owner != best.sym.owner && isSubClassOrObject(alt.sym.owner, best.sym.owner)) { ambiguousError(best, alt, |