diff options
author | Lukas Rytz <lukas.rytz@epfl.ch> | 2010-08-05 08:20:47 +0000 |
---|---|---|
committer | Lukas Rytz <lukas.rytz@epfl.ch> | 2010-08-05 08:20:47 +0000 |
commit | 23bd1501fc8aefecc3054c846973c05d260bb987 (patch) | |
tree | b387765e88d41cd27797b5718cb5d97f1f6a31a0 /src/compiler | |
parent | 8a8172da3cda740586f86a3b4b276e7d9235bca6 (diff) | |
download | scala-23bd1501fc8aefecc3054c846973c05d260bb987.tar.gz scala-23bd1501fc8aefecc3054c846973c05d260bb987.tar.bz2 scala-23bd1501fc8aefecc3054c846973c05d260bb987.zip |
close #3685. review by moors.
Diffstat (limited to 'src/compiler')
-rw-r--r-- | src/compiler/scala/tools/nsc/typechecker/NamesDefaults.scala | 27 |
1 files changed, 21 insertions, 6 deletions
diff --git a/src/compiler/scala/tools/nsc/typechecker/NamesDefaults.scala b/src/compiler/scala/tools/nsc/typechecker/NamesDefaults.scala index d783cf9c9f..fcafbc3b4c 100644 --- a/src/compiler/scala/tools/nsc/typechecker/NamesDefaults.scala +++ b/src/compiler/scala/tools/nsc/typechecker/NamesDefaults.scala @@ -444,7 +444,20 @@ trait NamesDefaults { self: Analyzer => } val reportAmbiguousErrors = typer.context.reportAmbiguousErrors typer.context.reportAmbiguousErrors = false - val res = typer.silent(_.typed(arg, subst(paramtpe))) match { + + val typedAssign = try { + typer.silent(_.typed(arg, subst(paramtpe))) + } catch { + // `silent` only catches and returns TypeErrors which are not CyclicReferences + // fix for #3685 + case cr @ CyclicReference(sym, info) if (sym.name == param.name) => + if (sym.isVariable || sym.isGetter && sym.accessed.isVariable) { + // named arg not allowed + typer.context.error(sym.pos, "variable definition needs type because the name is used as named argument the definition.") + typer.infer.setError(arg) + } else cr // named arg OK + } + val res = typedAssign match { case _: TypeError => // if the named argument is on the original parameter // position, positional after named is allowed. @@ -453,13 +466,15 @@ trait NamesDefaults { self: Analyzer => argPos(index) = pos rhs case t: Tree => - // this throws an exception that's caught in `tryTypedApply` (as it uses `silent`) - // unfortunately, tryTypedApply recovers from the exception if you use errorTree(arg, ...) and conforms is allowed as a view (see tryImplicit in Implicits) - // because it tries to produce a new qualifier (if the old one was P, the new one will be conforms.apply(P)), and if that works, it pretends nothing happened - // so, to make sure tryTypedApply fails, would like to pass EmptyTree instead of arg, but can't do that because eventually setType(ErrorType) is called, and EmptyTree only accepts NoType as its tpe - // thus, we need to disable conforms as a view... + if (!t.isErroneous) { + // this throws an exception that's caught in `tryTypedApply` (as it uses `silent`) + // unfortunately, tryTypedApply recovers from the exception if you use errorTree(arg, ...) and conforms is allowed as a view (see tryImplicit in Implicits) + // because it tries to produce a new qualifier (if the old one was P, the new one will be conforms.apply(P)), and if that works, it pretends nothing happened + // so, to make sure tryTypedApply fails, would like to pass EmptyTree instead of arg, but can't do that because eventually setType(ErrorType) is called, and EmptyTree only accepts NoType as its tpe + // thus, we need to disable conforms as a view... errorTree(arg, "reference to "+ name +" is ambiguous; it is both, a parameter\n"+ "name of the method and the name of a variable currently in scope.") + } else t // error was reported above } typer.context.reportAmbiguousErrors = reportAmbiguousErrors //@M note that we don't get here when an ambiguity was detected (during the computation of res), |