Skip to content

tpd#New: Make constructor TermRefs non-ambiguous #730

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 19, 2015
Merged

tpd#New: Make constructor TermRefs non-ambiguous #730

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 4 additions & 9 deletions src/dotty/tools/dotc/ast/tpd.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -383,8 +383,9 @@ object tpd extends Trees.Instance[Type] with TypedTreeInfo {
/** new C(args), calling given constructor `constr` of C */
def New(tp: Type, constr: TermSymbol, args: List[Tree])(implicit ctx: Context): Apply = {
val targs = tp.argTypes
New(tp withoutArgs targs)
.select(TermRef.withSig(tp.normalizedPrefix, constr))
val tycon = tp.withoutArgs(targs)
New(tycon)
.select(TermRef.withSig(tycon, constr))
.appliedToTypes(targs)
.appliedToArgs(args)
}
Expand Down Expand Up @@ -818,15 +819,9 @@ object tpd extends Trees.Instance[Type] with TypedTreeInfo {
val alternatives = ctx.typer.resolveOverloaded(alts, proto, Nil)
assert(alternatives.size == 1) // this is parsed from bytecode tree. there's nothing user can do about it

val prefixTpe =
if (method eq nme.CONSTRUCTOR)
receiver.tpe.normalizedPrefix // <init> methods are part of the enclosing scope
else
receiver.tpe

val selected = alternatives.head
val fun = receiver
.select(TermRef.withSig(prefixTpe, selected.termSymbol.asTerm))
.select(TermRef.withSig(receiver.tpe, selected.termSymbol.asTerm))
.appliedToTypes(targs)

def adaptLastArg(lastParam: Tree, expectedType: Type) = {
Expand Down