Merge pull request #3381 from AndrejMitrovic/Fix11735

Fixes Issue 11735 - pragma(msg) doesn't work with wchar/dchar strings.
dlang · Mar 15, 2014 · dea20e7 · dea20e7
2 parents c015f0d + c70e229
commit dea20e7
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 0 deletions.
diff --git a/src/statement.c b/src/statement.c
@@ -2652,6 +2652,7 @@ Statement *PragmaStatement::semantic(Scope *sc)
                 StringExp *se = e->toStringExp();
                 if (se)
                 {
+                    se = se->toUTF8(sc);
                     fprintf(stderr, "%.*s", (int)se->len, (char *)se->string);
                 }
                 else

diff --git a/test/compilable/bug11735.d b/test/compilable/bug11735.d
@@ -10,6 +10,9 @@ print dstring
 يطبع الترميز الموحد
 يطبع الترميز الموحد
 يطبع الترميز الموحد
+foo_str
+foo_wstr
+foo_dstr
 ---
 */
 
@@ -20,3 +23,14 @@ pragma(msg, "print dstring"d);
 pragma(msg, "يطبع الترميز الموحد");
 pragma(msg, "يطبع الترميز الموحد"w);
 pragma(msg, "يطبع الترميز الموحد"d);
+
+void main()
+{
+    enum a = "foo_str";
+    enum b = "foo_wstr"w;
+    enum c = "foo_dstr"d;
+
+    pragma(msg, a);
+    pragma(msg, b);
+    pragma(msg, c);
+}