Use correct filename for tokens from macro

Author: tim-dlang

src/cppconv/dwriter.d

@@ -3036,8 +3036,8 @@ void parseTreeToDCode(T)(ref CodeWriter code, DWriterData data, T tree, immutabl
             if (!hasNewline)
             {
                 while (tokens.length && tokens[$ - 1].isWhitespace
-                        && (tokens[$ - 1].token.name.startsWith(" ")
-                            || tokens[$ - 1].token.name.startsWith("\t")))
+                        && (tokens[$ - 1].token.content.startsWith(" ")
+                            || tokens[$ - 1].token.content.startsWith("\t")))
                     tokens = tokens[0 .. $ - 1];
             }
             writeComments(code, data, tokens);

src/cppconv/macrodeclaration.d

@@ -563,7 +563,7 @@ void applyMacroInstances(DWriterData data, Semantic mergedSemantic,
             if (macroDeclaration2 is null)
             {
                 tokens = data.sourceTokenManager.sourceTokens[RealFilename(
-                            locationContext.filename)];
+                            locRange.context.filename)];
             }
             else
             {

tests/multifile/testinclude74/testinclude74a.d

@@ -5,5 +5,5 @@ import cppconvhelpers;
 import testinclude74;
 
 __gshared const(char)* testa = test;
-__gshared const(char)* testa2 = mixin(str(q{x/+ char +/y z}));
+__gshared const(char)* testa2 = mixin(str(q{x y z}));