Skip to content

some stylistic improvements to toTypeFunction() #7754

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
andralex merged 1 commit into from
Jan 19, 2018
Merged

some stylistic improvements to toTypeFunction() #7754

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
63 changes: 31 additions & 32 deletions src/dmd/traits.d
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -445,49 +445,46 @@ extern (C++) Expression semanticTraits(TraitsExp e, Scope* sc)
return new IntegerExp(e.loc, false, Type.tbool);
}

/**
Gets the function type from a given AST node
if the node is a function of some sort.

Params:
o = an AST node to check for a `TypeFunction`
fdp = optional pointer to a function declararion, to be set
if `o` is a function declarartion.

Returns:
a type node if `o` is a declaration of
a delegate, function, function-pointer
or a variable of the former. Otherwise, `null`.
*/
static TypeFunction toTypeFunction(RootObject o, FuncDeclaration* fdp = null)
/********
* Gets the function type from a given AST node
* if the node is a function of some sort.
* Params:
* o = an AST node to check for a `TypeFunction`
* fdp = if `o` is a FuncDeclaration then fdp is set to that, otherwise `null`
* Returns:
* a type node if `o` is a declaration of
* a delegate, function, function-pointer or a variable of the former.
* Otherwise, `null`.
*/
static TypeFunction toTypeFunction(RootObject o, out FuncDeclaration fdp)
{
auto s = getDsymbolWithoutExpCtx(o);
auto t = isType(o);
TypeFunction tf = null;

if (s)
Type t;
if (auto s = getDsymbolWithoutExpCtx(o))
{
auto fd = s.isFuncDeclaration();
if (fd)
if (auto fd = s.isFuncDeclaration())
{
t = fd.type;
if (fdp)
*fdp = fd;
fdp = fd;
}
else if (auto vd = s.isVarDeclaration())
t = vd.type;
else
t = isType(o);
}
else
t = isType(o);

if (t)
{
if (t.ty == Type.Kind.function_)
tf = cast(TypeFunction)t;
return cast(TypeFunction)t;
else if (t.ty == Type.Kind.delegate_)
tf = cast(TypeFunction)t.nextOf();
return cast(TypeFunction)t.nextOf();
else if (t.ty == Type.Kind.pointer && t.nextOf().ty == Type.Kind.function_)
tf = cast(TypeFunction)t.nextOf();
return cast(TypeFunction)t.nextOf();
Copy link
Member

@andralex andralex Jan 19, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

two redundant elses, but I'll let them be

Copy link
Member Author

@WalterBright WalterBright Jan 19, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You're right, I missed that.

}

return tf;
return null;
}

IntegerExp isX(T)(bool function(T) fp)
Expand Down Expand Up @@ -1036,7 +1033,8 @@ extern (C++) Expression semanticTraits(TraitsExp e, Scope* sc)
if (dim != 1)
return dimError(1);

TypeFunction tf = toTypeFunction((*e.args)[0]);
FuncDeclaration fd;
TypeFunction tf = toTypeFunction((*e.args)[0], fd);

if (!tf)
{
Expand Down Expand Up @@ -1070,7 +1068,7 @@ extern (C++) Expression semanticTraits(TraitsExp e, Scope* sc)
auto o = (*e.args)[0];

FuncDeclaration fd;
TypeFunction tf = toTypeFunction(o, &fd);
TypeFunction tf = toTypeFunction(o, fd);

if (tf)
{
Expand Down Expand Up @@ -1113,7 +1111,7 @@ extern (C++) Expression semanticTraits(TraitsExp e, Scope* sc)
auto o1 = (*e.args)[1];

FuncDeclaration fd;
TypeFunction tf = toTypeFunction(o, &fd);
TypeFunction tf = toTypeFunction(o, fd);

Parameters* fparams;
if (tf)
Expand Down Expand Up @@ -1203,7 +1201,8 @@ extern (C++) Expression semanticTraits(TraitsExp e, Scope* sc)
LINK link;
auto o = (*e.args)[0];

TypeFunction tf = toTypeFunction(o);
FuncDeclaration fd;
TypeFunction tf = toTypeFunction(o, fd);

if (tf)
link = tf.linkage;
Expand Down