Skip to content

Allow implicit string literal -> const(wchar_t)[] #8950

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
thewilsonator merged 1 commit into from
Nov 15, 2018
Merged

Allow implicit string literal -> const(wchar_t)[] #8950

Show file tree
Hide file tree
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
5 changes: 5 additions & 0 deletions changelog/wchar_t.dd
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
Added `__c_wchar_t` as a correct mangling type for C's `wchar_t`

This allows code interfacing with C++ that uses `wchar_t` to link correctly.
It replaces `wchar` (Windows) and `dchar` (Posix) as the memory type for the
DRuntime alias `wchar_t`.
10 changes: 10 additions & 0 deletions src/dmd/dcast.d
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -650,6 +650,16 @@ MATCH implicitConvTo(Expression e, Type t)
m = MATCH.convert;
result = m;
return;
case Tenum:
if ((cast(TypeEnum)tn).sym.isSpecial())
{
/* Allow string literal -> const(wchar_t)[]
*/
if (TypeBasic tob = tn.toBasetype().isTypeBasic())
result = tn.implicitConvTo(tob);
return;
Copy link
Copy Markdown
Member

@ibuclaw ibuclaw Nov 17, 2018

Choose a reason for hiding this comment

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

Indentation here looks off. I can't tell whether the early return here should be part of the first or second condition.

}
break;
default:
break;
}
Expand Down
16 changes: 16 additions & 0 deletions test/compilable/implicitconv.d
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
enum __c_wchar_t : wchar;

alias wchar_t = __c_wchar_t;

immutable(wchar_t)[] a = "somestring";
const(wchar_t)[] b = "somestring";
immutable(wchar_t)* c = "somestring";
const(wchar_t)* d = "somestring";

string foo = "foo";

static assert(!__traits(compiles, { immutable(wchar_t)[] bar = foo; } ));
static assert(!__traits(compiles, { const(wchar_t)[] bar = foo; } ));
static assert(!__traits(compiles, { immutable(wchar_t)* bar = foo; } ));
static assert(!__traits(compiles, { const(wchar_t)* bar = foo; } ));