Skip to content

Commit 5e6f693

Browse files
committed
Turn params.{docname,docdir} to DString
1 parent bc635e1 commit 5e6f693

4 files changed

Lines changed: 7 additions & 7 deletions

File tree

src/dmd/dmodule.d

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -656,7 +656,7 @@ extern (C++) final class Module : Package
656656

657657
extern (D) void setDocfile()
658658
{
659-
docfile = setOutfilename(global.params.docname.toDString, global.params.docdir.toDString, arg, global.doc_ext);
659+
docfile = setOutfilename(global.params.docname, global.params.docdir, arg, global.doc_ext);
660660
}
661661

662662
/**

src/dmd/globals.d

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -230,8 +230,8 @@ extern (C++) struct Param
230230
const(char)[] libname; // .lib file output name
231231

232232
bool doDocComments; // process embedded documentation comments
233-
const(char)* docdir; // write documentation file to docdir directory
234-
const(char)* docname; // write documentation file to docname
233+
const(char)[] docdir; // write documentation file to docdir directory
234+
const(char)[] docname; // write documentation file to docname
235235
Array!(const(char)*) ddocfiles; // macro include files for Ddoc
236236

237237
bool doHdrGeneration; // process embedded documentation comments

src/dmd/globals.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -196,8 +196,8 @@ struct Param
196196
DString libname; // .lib file output name
197197

198198
bool doDocComments; // process embedded documentation comments
199-
const char *docdir; // write documentation file to docdir directory
200-
const char *docname; // write documentation file to docname
199+
DString docdir; // write documentation file to docdir directory
200+
DString docname; // write documentation file to docname
201201
Array<const char *> ddocfiles; // macro include files for Ddoc
202202

203203
bool doHdrGeneration; // process embedded documentation comments

src/dmd/mars.d

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2125,12 +2125,12 @@ bool parseCommandLine(const ref Strings arguments, const size_t argc, ref Param
21252125
case 'd': // https://dlang.org/dmd.html#switch-Dd
21262126
if (!p[3])
21272127
goto Lnoarg;
2128-
params.docdir = p + 3 + (p[3] == '=');
2128+
params.docdir = (p + 3 + (p[3] == '=')).toDString();
21292129
break;
21302130
case 'f': // https://dlang.org/dmd.html#switch-Df
21312131
if (!p[3])
21322132
goto Lnoarg;
2133-
params.docname = p + 3 + (p[3] == '=');
2133+
params.docname = (p + 3 + (p[3] == '=')).toDString();
21342134
break;
21352135
case 0:
21362136
break;

0 commit comments

Comments
 (0)