Skip to content

[WIP] Allow implicit conversion to shared. #8782

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

Closed
thewilsonator wants to merge 2 commits into from
Closed

[WIP] Allow implicit conversion to shared. #8782

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
89a07e8
Allow implicit conversion to shared.
thewilsonator Oct 1, 2018
c5fa5f5
Use MATCH.shared_
thewilsonator Oct 1, 2018
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
1 change: 1 addition & 0 deletions src/dmd/globals.d
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -504,6 +504,7 @@ enum MATCH : int
{
nomatch, // no match
convert, // match with conversions
shared_, // match with conversion to shared
constant, // match with conversion to const
exact, // exact match
}
Expand Down
6 changes: 5 additions & 1 deletion src/dmd/mtype.d
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,8 @@ bool MODimplicitConv(MOD modfrom, MOD modto) pure nothrow @nogc @safe
case X(MODFlags.wild, MODFlags.const_):
case X(MODFlags.wild, MODFlags.wildconst):
case X(MODFlags.wildconst, MODFlags.const_):
return (modfrom & MODFlags.shared_) == (modto & MODFlags.shared_);
// Casting to shared is fine, but otherwise casting from shared is not.
return (modto & MODFlags.shared_) || !(modfrom & MODFlags.shared_);

case X(MODFlags.immutable_, MODFlags.const_):
case X(MODFlags.immutable_, MODFlags.wildconst):
Expand Down Expand Up @@ -116,6 +117,9 @@ MATCH MODmethodConv(MOD modfrom, MOD modto) pure nothrow @nogc @safe
case X(MODFlags.shared_ | MODFlags.wildconst, MODFlags.shared_ | MODFlags.wild):
return MATCH.constant;

case X(0,MODFlags.shared_):
return MATCH.shared_;

default:
return MATCH.nomatch;
}
Expand Down