Merge pull request #10806 from Geod24/array-to-darray

dlang-bot · web-flow · commit ca29f6f6826c · 2020-02-19T21:57:43.000+01:00
Trivial: Turn params.{docname,docdir} to DString
merged-on-behalf-of: Iain Buclaw &lt;ibuclaw@gdcproject.org&gt;
diff --git a/src/dmd/dmodule.d b/src/dmd/dmodule.d
@@ -656,7 +656,7 @@ extern (C++) final class Module : Package
 
     extern (D) void setDocfile()
     {
-        docfile = setOutfilename(global.params.docname.toDString, global.params.docdir.toDString, arg, global.doc_ext);
+        docfile = setOutfilename(global.params.docname, global.params.docdir, arg, global.doc_ext);
     }
 
     /**
diff --git a/src/dmd/globals.d b/src/dmd/globals.d
@@ -230,8 +230,8 @@ extern (C++) struct Param
     const(char)[] libname;               // .lib file output name
 
     bool doDocComments;                 // process embedded documentation comments
-    const(char)* docdir;                // write documentation file to docdir directory
-    const(char)* docname;               // write documentation file to docname
+    const(char)[] docdir;               // write documentation file to docdir directory
+    const(char)[] docname;              // write documentation file to docname
     Array!(const(char)*) ddocfiles;     // macro include files for Ddoc
 
     bool doHdrGeneration;               // process embedded documentation comments
diff --git a/src/dmd/globals.h b/src/dmd/globals.h
@@ -196,8 +196,8 @@ struct Param
     DString libname;   // .lib file output name
 
     bool doDocComments;  // process embedded documentation comments
-    const char *docdir;  // write documentation file to docdir directory
-    const char *docname; // write documentation file to docname
+    DString docdir;      // write documentation file to docdir directory
+    DString docname;     // write documentation file to docname
     Array<const char *> ddocfiles;  // macro include files for Ddoc
 
     bool doHdrGeneration;  // process embedded documentation comments
diff --git a/src/dmd/link.d b/src/dmd/link.d
@@ -227,7 +227,7 @@ public int runLINK()
         {
             OutBuffer cmdbuf;
             cmdbuf.writestring("/NOLOGO");
-            for (size_t i = 0; i < global.params.objfiles.dim; i++)
+            for (size_t i = 0; i < global.params.objfiles.length; i++)
             {
                 cmdbuf.writeByte(' ');
                 const(char)* p = global.params.objfiles[i];
@@ -261,7 +261,7 @@ public int runLINK()
                 cmdbuf.writestring("/MAP:");
                 writeFilename(&cmdbuf, getMapFilename());
             }
-            for (size_t i = 0; i < global.params.libfiles.dim; i++)
+            for (size_t i = 0; i < global.params.libfiles.length; i++)
             {
                 cmdbuf.writeByte(' ');
                 cmdbuf.writestring("/DEFAULTLIB:");
@@ -286,7 +286,7 @@ public int runLINK()
                 cmdbuf.writeByte(' ');
                 cmdbuf.writestring("/DLL");
             }
-            for (size_t i = 0; i < global.params.linkswitches.dim; i++)
+            for (size_t i = 0; i < global.params.linkswitches.length; i++)
             {
                 cmdbuf.writeByte(' ');
                 cmdbuf.writeQuotedArgIfNeeded(global.params.linkswitches[i]);
@@ -337,7 +337,7 @@ public int runLINK()
             OutBuffer cmdbuf;
             global.params.libfiles.push("user32");
             global.params.libfiles.push("kernel32");
-            for (size_t i = 0; i < global.params.objfiles.dim; i++)
+            for (size_t i = 0; i < global.params.objfiles.length; i++)
             {
                 if (i)
                     cmdbuf.writeByte('+');
@@ -372,7 +372,7 @@ public int runLINK()
             else
                 cmdbuf.writestring("nul");
             cmdbuf.writeByte(',');
-            for (size_t i = 0; i < global.params.libfiles.dim; i++)
+            for (size_t i = 0; i < global.params.libfiles.length; i++)
             {
                 if (i)
                     cmdbuf.writeByte('+');
@@ -415,7 +415,7 @@ public int runLINK()
                     cmdbuf.writestring("/co");
             }
             cmdbuf.writestring("/noi");
-            for (size_t i = 0; i < global.params.linkswitches.dim; i++)
+            for (size_t i = 0; i < global.params.linkswitches.length; i++)
             {
                 cmdbuf.writestring(global.params.linkswitches[i]);
             }
diff --git a/src/dmd/mars.d b/src/dmd/mars.d
@@ -486,15 +486,15 @@ private int tryMain(size_t argc, const(char)** argv, ref Param params)
         if (m.isHdrFile)
         {
             // Remove m's object file from list of object files
-            for (size_t j = 0; j < params.objfiles.dim; j++)
+            for (size_t j = 0; j < params.objfiles.length; j++)
             {
                 if (m.objfile.toChars() == params.objfiles[j])
                 {
                     params.objfiles.remove(j);
                     break;
                 }
             }
-            if (params.objfiles.dim == 0)
+            if (params.objfiles.length == 0)
                 params.link = false;
         }
         if (m.isDocFile)
@@ -505,15 +505,15 @@ private int tryMain(size_t argc, const(char)** argv, ref Param params)
             modules.remove(modi);
             modi--;
             // Remove m's object file from list of object files
-            for (size_t j = 0; j < params.objfiles.dim; j++)
+            for (size_t j = 0; j < params.objfiles.length; j++)
             {
                 if (m.objfile.toChars() == params.objfiles[j])
                 {
                     params.objfiles.remove(j);
                     break;
                 }
             }
-            if (params.objfiles.dim == 0)
+            if (params.objfiles.length == 0)
                 params.link = false;
         }
     }
@@ -647,7 +647,7 @@ private int tryMain(size_t argc, const(char)** argv, ref Param params)
     Library library = null;
     if (params.lib)
     {
-        if (params.objfiles.dim == 0)
+        if (params.objfiles.length == 0)
         {
             error(Loc.initial, "no input files");
             return EXIT_FAILURE;
@@ -730,7 +730,7 @@ private int tryMain(size_t argc, const(char)** argv, ref Param params)
     if (global.errors)
         fatal();
     int status = EXIT_SUCCESS;
-    if (!params.objfiles.dim)
+    if (!params.objfiles.length)
     {
         if (params.link)
             error(Loc.initial, "no object files to link");
@@ -826,7 +826,7 @@ extern (C++) void generateJson(Modules* modules)
         }
         else
         {
-            if (global.params.objfiles.dim == 0)
+            if (global.params.objfiles.length == 0)
             {
                 error(Loc.initial, "cannot determine JSON filename, use `-Xf=<file>` or provide a source file");
                 fatal();
@@ -2125,12 +2125,12 @@ bool parseCommandLine(const ref Strings arguments, const size_t argc, ref Param
             case 'd':               // https://dlang.org/dmd.html#switch-Dd
                 if (!p[3])
                     goto Lnoarg;
-                params.docdir = p + 3 + (p[3] == '=');
+                params.docdir = (p + 3 + (p[3] == '=')).toDString();
                 break;
             case 'f':               // https://dlang.org/dmd.html#switch-Df
                 if (!p[3])
                     goto Lnoarg;
-                params.docname = p + 3 + (p[3] == '=');
+                params.docname = (p + 3 + (p[3] == '=')).toDString();
                 break;
             case 0:
                 break;

Original file line number	Diff line number	Diff line change
`@@ -656,7 +656,7 @@ extern (C++) final class Module : Package`
`656`	`656`
`657`	`657`	`extern (D) void setDocfile()`
`658`	`658`	`{`
`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);`
`660`	`660`	`}`
`661`	`661`
`662`	`662`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -227,7 +227,7 @@ public int runLINK()`
`227`	`227`	`{`
`228`	`228`	`OutBuffer cmdbuf;`
`229`	`229`	`cmdbuf.writestring("/NOLOGO");`
`230`		`- for (size_t i = 0; i < global.params.objfiles.dim; i++)`
	`230`	`+ for (size_t i = 0; i < global.params.objfiles.length; i++)`
`231`	`231`	`{`
`232`	`232`	`cmdbuf.writeByte(' ');`
`233`	`233`	`const(char)* p = global.params.objfiles[i];`
`@@ -261,7 +261,7 @@ public int runLINK()`
`261`	`261`	`cmdbuf.writestring("/MAP:");`
`262`	`262`	`writeFilename(&cmdbuf, getMapFilename());`
`263`	`263`	`}`
`264`		`- for (size_t i = 0; i < global.params.libfiles.dim; i++)`
	`264`	`+ for (size_t i = 0; i < global.params.libfiles.length; i++)`
`265`	`265`	`{`
`266`	`266`	`cmdbuf.writeByte(' ');`
`267`	`267`	`cmdbuf.writestring("/DEFAULTLIB:");`
`@@ -286,7 +286,7 @@ public int runLINK()`
`286`	`286`	`cmdbuf.writeByte(' ');`
`287`	`287`	`cmdbuf.writestring("/DLL");`
`288`	`288`	`}`
`289`		`- for (size_t i = 0; i < global.params.linkswitches.dim; i++)`
	`289`	`+ for (size_t i = 0; i < global.params.linkswitches.length; i++)`
`290`	`290`	`{`
`291`	`291`	`cmdbuf.writeByte(' ');`
`292`	`292`	`cmdbuf.writeQuotedArgIfNeeded(global.params.linkswitches[i]);`
`@@ -337,7 +337,7 @@ public int runLINK()`
`337`	`337`	`OutBuffer cmdbuf;`
`338`	`338`	`global.params.libfiles.push("user32");`
`339`	`339`	`global.params.libfiles.push("kernel32");`
`340`		`- for (size_t i = 0; i < global.params.objfiles.dim; i++)`
	`340`	`+ for (size_t i = 0; i < global.params.objfiles.length; i++)`
`341`	`341`	`{`
`342`	`342`	`if (i)`
`343`	`343`	`cmdbuf.writeByte('+');`
`@@ -372,7 +372,7 @@ public int runLINK()`
`372`	`372`	`else`
`373`	`373`	`cmdbuf.writestring("nul");`
`374`	`374`	`cmdbuf.writeByte(',');`
`375`		`- for (size_t i = 0; i < global.params.libfiles.dim; i++)`
	`375`	`+ for (size_t i = 0; i < global.params.libfiles.length; i++)`
`376`	`376`	`{`
`377`	`377`	`if (i)`
`378`	`378`	`cmdbuf.writeByte('+');`
`@@ -415,7 +415,7 @@ public int runLINK()`
`415`	`415`	`cmdbuf.writestring("/co");`
`416`	`416`	`}`
`417`	`417`	`cmdbuf.writestring("/noi");`
`418`		`- for (size_t i = 0; i < global.params.linkswitches.dim; i++)`
	`418`	`+ for (size_t i = 0; i < global.params.linkswitches.length; i++)`
`419`	`419`	`{`
`420`	`420`	`cmdbuf.writestring(global.params.linkswitches[i]);`
`421`	`421`	`}`
Original file line number	Diff line number	Diff line change
`@@ -486,15 +486,15 @@ private int tryMain(size_t argc, const(char)** argv, ref Param params)`
`486`	`486`	`if (m.isHdrFile)`
`487`	`487`	`{`
`488`	`488`	`// Remove m's object file from list of object files`
`489`		`- for (size_t j = 0; j < params.objfiles.dim; j++)`
	`489`	`+ for (size_t j = 0; j < params.objfiles.length; j++)`
`490`	`490`	`{`
`491`	`491`	`if (m.objfile.toChars() == params.objfiles[j])`
`492`	`492`	`{`
`493`	`493`	`params.objfiles.remove(j);`
`494`	`494`	`break;`
`495`	`495`	`}`
`496`	`496`	`}`
`497`		`- if (params.objfiles.dim == 0)`
	`497`	`+ if (params.objfiles.length == 0)`
`498`	`498`	`params.link = false;`
`499`	`499`	`}`
`500`	`500`	`if (m.isDocFile)`
`@@ -505,15 +505,15 @@ private int tryMain(size_t argc, const(char)** argv, ref Param params)`
`505`	`505`	`modules.remove(modi);`
`506`	`506`	`modi--;`
`507`	`507`	`// Remove m's object file from list of object files`
`508`		`- for (size_t j = 0; j < params.objfiles.dim; j++)`
	`508`	`+ for (size_t j = 0; j < params.objfiles.length; j++)`
`509`	`509`	`{`
`510`	`510`	`if (m.objfile.toChars() == params.objfiles[j])`
`511`	`511`	`{`
`512`	`512`	`params.objfiles.remove(j);`
`513`	`513`	`break;`
`514`	`514`	`}`
`515`	`515`	`}`
`516`		`- if (params.objfiles.dim == 0)`
	`516`	`+ if (params.objfiles.length == 0)`
`517`	`517`	`params.link = false;`
`518`	`518`	`}`
`519`	`519`	`}`
`@@ -647,7 +647,7 @@ private int tryMain(size_t argc, const(char)** argv, ref Param params)`
`647`	`647`	`Library library = null;`
`648`	`648`	`if (params.lib)`
`649`	`649`	`{`
`650`		`- if (params.objfiles.dim == 0)`
	`650`	`+ if (params.objfiles.length == 0)`
`651`	`651`	`{`
`652`	`652`	`error(Loc.initial, "no input files");`
`653`	`653`	`return EXIT_FAILURE;`
`@@ -730,7 +730,7 @@ private int tryMain(size_t argc, const(char)** argv, ref Param params)`
`730`	`730`	`if (global.errors)`
`731`	`731`	`fatal();`
`732`	`732`	`int status = EXIT_SUCCESS;`
`733`		`- if (!params.objfiles.dim)`
	`733`	`+ if (!params.objfiles.length)`
`734`	`734`	`{`
`735`	`735`	`if (params.link)`
`736`	`736`	`error(Loc.initial, "no object files to link");`
`@@ -826,7 +826,7 @@ extern (C++) void generateJson(Modules* modules)`
`826`	`826`	`}`
`827`	`827`	`else`
`828`	`828`	`{`
`829`		`- if (global.params.objfiles.dim == 0)`
	`829`	`+ if (global.params.objfiles.length == 0)`
`830`	`830`	`{`
`831`	`831`	error(Loc.initial, "cannot determine JSON filename, use `-Xf=<file>` or provide a source file");
`832`	`832`	`fatal();`
`@@ -2125,12 +2125,12 @@ bool parseCommandLine(const ref Strings arguments, const size_t argc, ref Param`
`2125`	`2125`	`case 'd': // https://dlang.org/dmd.html#switch-Dd`
`2126`	`2126`	`if (!p[3])`
`2127`	`2127`	`goto Lnoarg;`
`2128`		`- params.docdir = p + 3 + (p[3] == '=');`
	`2128`	`+ params.docdir = (p + 3 + (p[3] == '=')).toDString();`
`2129`	`2129`	`break;`
`2130`	`2130`	`case 'f': // https://dlang.org/dmd.html#switch-Df`
`2131`	`2131`	`if (!p[3])`
`2132`	`2132`	`goto Lnoarg;`
`2133`		`- params.docname = p + 3 + (p[3] == '=');`
	`2133`	`+ params.docname = (p + 3 + (p[3] == '=')).toDString();`
`2134`	`2134`	`break;`
`2135`	`2135`	`case 0:`
`2136`	`2136`	`break;`