Skip to content
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

Jump to bottom

Cleanup dcast.d #5197

Merged
merged 2 commits into from
Dec 3, 2015
Merged

Cleanup dcast.d #5197

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a6359f7
Fix toBasetype() calls in dcast.d
9rnsr Oct 19, 2015
ee97a96
Refactor: reduce indent in AddrExp.castTo and DelegateExp.castTo
9rnsr Oct 19, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
232 changes: 137 additions & 95 deletions src/dcast.d
View file
Open in desktop
Expand Up @@ -255,8 +255,10 @@ extern (C++) MATCH implicitConvTo(Expression e, Type t)
* This is to support doing things like implicitly converting a mutable unique
* pointer to an immutable pointer.
*/
Type typeb = e.type.toBasetype();

Type tb = t.toBasetype();
Type typeb = e.type.toBasetype();

if (typeb.ty != Tpointer || tb.ty != Tpointer)
return MATCHnomatch;
Type t1b = e.e1.type.toBasetype();
Expand Down Expand Up @@ -647,9 +649,11 @@ extern (C++) MATCH implicitConvTo(Expression e, Type t)
{
printf("ArrayLiteralExp::implicitConvTo(this=%s, type=%s, t=%s)\n", e.toChars(), e.type.toChars(), t.toChars());
}
Type typeb = e.type.toBasetype();
Type tb = t.toBasetype();
if ((tb.ty == Tarray || tb.ty == Tsarray) && (typeb.ty == Tarray || typeb.ty == Tsarray))
Type typeb = e.type.toBasetype();

if ((tb.ty == Tarray || tb.ty == Tsarray) &&
(typeb.ty == Tarray || typeb.ty == Tsarray))
{
result = MATCHexact;
Type typen = typeb.nextOf().toBasetype();
Expand Down Expand Up @@ -719,8 +723,9 @@ extern (C++) MATCH implicitConvTo(Expression e, Type t)

override void visit(AssocArrayLiteralExp e)
{
Type typeb = e.type.toBasetype();
Type tb = t.toBasetype();
Type typeb = e.type.toBasetype();

if (tb.ty == Taarray && typeb.ty == Taarray)
{
result = MATCHexact;
Expand Down Expand Up @@ -881,9 +886,13 @@ extern (C++) MATCH implicitConvTo(Expression e, Type t)
//printf("\tresult = %d\n", result);
if (result != MATCHnomatch)
return;

Type tb = t.toBasetype();
Type typeb = e.type.toBasetype();

// Look for pointers to functions where the functions are overloaded.
t = t.toBasetype();
if (e.e1.op == TOKoverloadset && (t.ty == Tpointer || t.ty == Tdelegate) && t.nextOf().ty == Tfunction)
if (e.e1.op == TOKoverloadset &&
(tb.ty == Tpointer || tb.ty == Tdelegate) && tb.nextOf().ty == Tfunction)
{
OverExp eo = cast(OverExp)e.e1;
FuncDeclaration f = null;
Expand All @@ -892,7 +901,7 @@ extern (C++) MATCH implicitConvTo(Expression e, Type t)
Dsymbol s = eo.vars.a[i];
FuncDeclaration f2 = s.isFuncDeclaration();
assert(f2);
if (f2.overloadExactMatch(t.nextOf()))
if (f2.overloadExactMatch(tb.nextOf()))
{
if (f)
{
Expand All @@ -907,7 +916,10 @@ extern (C++) MATCH implicitConvTo(Expression e, Type t)
}
}
}
if (e.type.ty == Tpointer && e.type.nextOf().ty == Tfunction && t.ty == Tpointer && t.nextOf().ty == Tfunction && e.e1.op == TOKvar)

if (e.e1.op == TOKvar &&
typeb.ty == Tpointer && typeb.nextOf().ty == Tfunction &&
tb.ty == Tpointer && tb.nextOf().ty == Tfunction)
{
/* I don't think this can ever happen -
* it should have been
Expand All @@ -928,16 +940,21 @@ extern (C++) MATCH implicitConvTo(Expression e, Type t)
//printf("\tresult = %d\n", result);
if (result != MATCHnomatch)
return;

Type tb = t.toBasetype();
Type typeb = e.type.toBasetype();

// Look for pointers to functions where the functions are overloaded.
t = t.toBasetype();
if (e.type.ty == Tpointer && e.type.nextOf().ty == Tfunction && (t.ty == Tpointer || t.ty == Tdelegate) && t.nextOf().ty == Tfunction)
if (typeb.ty == Tpointer && typeb.nextOf().ty == Tfunction &&
(tb.ty == Tpointer || tb.ty == Tdelegate) && tb.nextOf().ty == Tfunction)
{
if (FuncDeclaration f = e.var.isFuncDeclaration())
{
f = f.overloadExactMatch(t.nextOf());
f = f.overloadExactMatch(tb.nextOf());
if (f)
{
if ((t.ty == Tdelegate && (f.needThis() || f.isNested())) || (t.ty == Tpointer && !(f.needThis() || f.isNested())))
if ((tb.ty == Tdelegate && (f.needThis() || f.isNested())) ||
(tb.ty == Tpointer && !(f.needThis() || f.isNested())))
{
result = MATCHexact;
}
Expand All @@ -956,11 +973,14 @@ extern (C++) MATCH implicitConvTo(Expression e, Type t)
result = e.type.implicitConvTo(t);
if (result != MATCHnomatch)
return;

Type tb = t.toBasetype();
Type typeb = e.type.toBasetype();

// Look for pointers to functions where the functions are overloaded.
t = t.toBasetype();
if (e.type.ty == Tdelegate && t.ty == Tdelegate)
if (typeb.ty == Tdelegate && tb.ty == Tdelegate)
{
if (e.func && e.func.overloadExactMatch(t.nextOf()))
if (e.func && e.func.overloadExactMatch(tb.nextOf()))
result = MATCHexact;
}
}
Expand Down Expand Up @@ -1594,14 +1614,17 @@ extern (C++) Expression castTo(Expression e, Scope* sc, Type t)
result = se;
return;
}

Type tb = t.toBasetype();
Type typeb = e.type.toBasetype();

//printf("\ttype = %s\n", e->type->toChars());
if (tb.ty == Tdelegate && e.type.toBasetype().ty != Tdelegate)
if (tb.ty == Tdelegate && typeb.ty != Tdelegate)
{
visit(cast(Expression)e);
return;
}
Type typeb = e.type.toBasetype();

if (typeb.equals(tb))
{
if (!copied)
Expand Down Expand Up @@ -1815,70 +1838,79 @@ extern (C++) Expression castTo(Expression e, Scope* sc, Type t)

override void visit(AddrExp e)
{
Type tb;
version (none)
{
printf("AddrExp::castTo(this=%s, type=%s, t=%s)\n", e.toChars(), e.type.toChars(), t.toChars());
}
result = e;
tb = t.toBasetype();
e.type = e.type.toBasetype();
if (!tb.equals(e.type))

Type tb = t.toBasetype();
Type typeb = e.type.toBasetype();

if (tb.equals(typeb))
{
// Look for pointers to functions where the functions are overloaded.
if (e.e1.op == TOKoverloadset && (t.ty == Tpointer || t.ty == Tdelegate) && t.nextOf().ty == Tfunction)
result = e.copy();
result.type = t;
return;
}

// Look for pointers to functions where the functions are overloaded.
if (e.e1.op == TOKoverloadset &&
(tb.ty == Tpointer || tb.ty == Tdelegate) && tb.nextOf().ty == Tfunction)
{
OverExp eo = cast(OverExp)e.e1;
FuncDeclaration f = null;
for (size_t i = 0; i < eo.vars.a.dim; i++)
{
OverExp eo = cast(OverExp)e.e1;
FuncDeclaration f = null;
for (size_t i = 0; i < eo.vars.a.dim; i++)
auto s = eo.vars.a[i];
auto f2 = s.isFuncDeclaration();
assert(f2);
if (f2.overloadExactMatch(tb.nextOf()))
{
Dsymbol s = eo.vars.a[i];
FuncDeclaration f2 = s.isFuncDeclaration();
assert(f2);
if (f2.overloadExactMatch(t.nextOf()))
if (f)
{
if (f)
{
/* Error if match in more than one overload set,
* even if one is a 'better' match than the other.
*/
ScopeDsymbol.multiplyDefined(e.loc, f, f2);
}
else
f = f2;
/* Error if match in more than one overload set,
* even if one is a 'better' match than the other.
*/
ScopeDsymbol.multiplyDefined(e.loc, f, f2);
}
else
f = f2;
}
if (f)
{
f.tookAddressOf++;
auto se = new SymOffExp(e.loc, f, 0, 0);
se.semantic(sc);
// Let SymOffExp::castTo() do the heavy lifting
visit(se);
return;
}
}
if (e.type.ty == Tpointer && e.type.nextOf().ty == Tfunction && tb.ty == Tpointer && tb.nextOf().ty == Tfunction && e.e1.op == TOKvar)
if (f)
{
f.tookAddressOf++;
auto se = new SymOffExp(e.loc, f, 0, 0);
se.semantic(sc);
// Let SymOffExp::castTo() do the heavy lifting
visit(se);
return;
}
}

if (e.e1.op == TOKvar &&
typeb.ty == Tpointer && typeb.nextOf().ty == Tfunction &&
tb.ty == Tpointer && tb.nextOf().ty == Tfunction)
{
auto ve = cast(VarExp)e.e1;
auto f = ve.var.isFuncDeclaration();
if (f)
{
VarExp ve = cast(VarExp)e.e1;
FuncDeclaration f = ve.var.isFuncDeclaration();
assert(f.isImportedSymbol());
f = f.overloadExactMatch(tb.nextOf());
if (f)
{
assert(f.isImportedSymbol());
f = f.overloadExactMatch(tb.nextOf());
if (f)
{
result = new VarExp(e.loc, f);
result.type = f.type;
result = new AddrExp(e.loc, result);
result.type = t;
return;
}
result = new VarExp(e.loc, f);
result.type = f.type;
result = new AddrExp(e.loc, result);
result.type = t;
return;
}
}
visit(cast(Expression)e);
}
result.type = t;

visit(cast(Expression)e);
}

override void visit(TupleExp e)
Expand Down Expand Up @@ -1922,9 +1954,12 @@ extern (C++) Expression castTo(Expression e, Scope* sc, Type t)
return;
}
ArrayLiteralExp ae = e;
Type typeb = e.type.toBasetype();

Type tb = t.toBasetype();
if ((tb.ty == Tarray || tb.ty == Tsarray) && (typeb.ty == Tarray || typeb.ty == Tsarray))
Type typeb = e.type.toBasetype();

if ((tb.ty == Tarray || tb.ty == Tsarray) &&
(typeb.ty == Tarray || typeb.ty == Tsarray))
{
if (tb.nextOf().toBasetype().ty == Tvoid && typeb.nextOf().toBasetype().ty != Tvoid)
{
Expand Down Expand Up @@ -2002,9 +2037,12 @@ extern (C++) Expression castTo(Expression e, Scope* sc, Type t)
result = e;
return;
}
Type typeb = e.type.toBasetype();

Type tb = t.toBasetype();
if (tb.ty == Taarray && typeb.ty == Taarray && tb.nextOf().toBasetype().ty != Tvoid)
Type typeb = e.type.toBasetype();

if (tb.ty == Taarray && typeb.ty == Taarray &&
tb.nextOf().toBasetype().ty != Tvoid)
{
AssocArrayLiteralExp ae = cast(AssocArrayLiteralExp)e.copy();
ae.keys = e.keys.copy();
Expand Down Expand Up @@ -2099,40 +2137,41 @@ extern (C++) Expression castTo(Expression e, Scope* sc, Type t)
static __gshared const(char)* msg = "cannot form delegate due to covariant return type";
Type tb = t.toBasetype();
Type typeb = e.type.toBasetype();
if (!tb.equals(typeb) || e.hasOverloads)
{
// Look for delegates to functions where the functions are overloaded.
if (typeb.ty == Tdelegate && tb.ty == Tdelegate)
{
if (e.func)
{
FuncDeclaration f = e.func.overloadExactMatch(tb.nextOf());
if (f)
{
int offset;
if (f.tintro && f.tintro.nextOf().isBaseOf(f.type.nextOf(), &offset) && offset)
e.error("%s", msg);
if (f != e.func) // if address not already marked as taken
f.tookAddressOf++;
result = new DelegateExp(e.loc, e.e1, f);
result.type = t;
return;
}
if (e.func.tintro)
e.error("%s", msg);
}
}
visit(cast(Expression)e);
}
else

if (tb.equals(typeb) && !e.hasOverloads)
{
int offset;
e.func.tookAddressOf++;
if (e.func.tintro && e.func.tintro.nextOf().isBaseOf(e.func.type.nextOf(), &offset) && offset)
e.error("%s", msg);
result = e.copy();
result.type = t;
return;
}

// Look for delegates to functions where the functions are overloaded.
if (typeb.ty == Tdelegate && tb.ty == Tdelegate)
{
if (e.func)
{
auto f = e.func.overloadExactMatch(tb.nextOf());
if (f)
{
int offset;
if (f.tintro && f.tintro.nextOf().isBaseOf(f.type.nextOf(), &offset) && offset)
e.error("%s", msg);
if (f != e.func) // if address not already marked as taken
f.tookAddressOf++;
result = new DelegateExp(e.loc, e.e1, f);
result.type = t;
return;
}
if (e.func.tintro)
e.error("%s", msg);
}
}

visit(cast(Expression)e);
}

override void visit(FuncExp e)
Expand Down Expand Up @@ -2176,9 +2215,12 @@ extern (C++) Expression castTo(Expression e, Scope* sc, Type t)
override void visit(SliceExp e)
{
//printf("SliceExp::castTo e = %s, type = %s, t = %s\n", e->toChars(), e->type->toChars(), t->toChars());
Type typeb = e.type.toBasetype();

Type tb = t.toBasetype();
if (e.type.equals(t) || typeb.ty != Tarray || (tb.ty != Tarray && tb.ty != Tsarray))
Type typeb = e.type.toBasetype();

if (e.type.equals(t) || typeb.ty != Tarray ||
(tb.ty != Tarray && tb.ty != Tsarray))
{
visit(cast(Expression)e);
return;
Expand Down