use ref's for json.d (#15515)

dlang · Aug 8, 2023 · e3e92ea · e3e92ea
1 parent 2e22eca
commit e3e92ea
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 16 deletions.
diff --git a/compiler/src/dmd/doc.d b/compiler/src/dmd/doc.d
@@ -375,7 +375,7 @@ private immutable ddoc_decl_dd_e = ")\n";
  * Params:
  *      m = Module
  *      ddocfiles = array of .ddoc files to read for macro definitions
- *	datetime = string returned by ctime()
+ *      datetime = string returned by ctime()
  *      eSink = send error messages to eSink
  */
 extern(C++) void gendocfile(Module m, const ref Array!(const(char)*) ddocfiles, const(char)* datetime, ErrorSink eSink)

diff --git a/compiler/src/dmd/frontend.h b/compiler/src/dmd/frontend.h
@@ -8104,7 +8104,7 @@ extern Expression* resolveProperties(Scope* sc, Expression* e);
 
 extern Expression* expressionSemantic(Expression* e, Scope* sc);
 
-extern void json_generate(OutBuffer* buf, Array<Module* >* modules);
+extern void json_generate(Array<Module* >& modules, OutBuffer& buf);
 
 extern JsonFieldFlags tryParseJsonField(const char* fieldName);
 

diff --git a/compiler/src/dmd/json.d b/compiler/src/dmd/json.d
@@ -810,17 +810,14 @@ public:
     Params:
      modules = array of the "root modules"
     */
-    private void generateModules(Modules* modules)
+    private void generateModules(ref Modules modules)
     {
         arrayStart();
-        if (modules)
+        foreach (m; modules)
         {
-            foreach (m; *modules)
-            {
-                if (global.params.verbose)
-                    message("json gen %s", m.toChars());
-                m.accept(this);
-            }
+            if (global.params.verbose)
+                message("json gen %s", m.toChars());
+            m.accept(this);
         }
         arrayEnd();
     }
@@ -981,9 +978,15 @@ public:
     }
 }
 
-extern (C++) void json_generate(OutBuffer* buf, Modules* modules)
+/***********************************
+ * Generate json for the modules.
+ * Params:
+ *      modules = array of Modules
+ *      buf = write json output to buf
+ */
+extern (C++) void json_generate(ref Modules modules, ref OutBuffer buf)
 {
-    scope ToJsonVisitor json = new ToJsonVisitor(buf);
+    scope ToJsonVisitor json = new ToJsonVisitor(&buf);
     // write trailing newline
     scope(exit) buf.writeByte('\n');
 

diff --git a/compiler/src/dmd/main.d b/compiler/src/dmd/main.d
@@ -272,7 +272,8 @@ private int tryMain(size_t argc, const(char)** argv, ref Param params)
     {
         if (params.jsonFieldFlags)
         {
-            generateJson(null);
+            Modules modules;            // empty
+            generateJson(modules);
             return EXIT_SUCCESS;
         }
         usage();
@@ -548,7 +549,7 @@ private int tryMain(size_t argc, const(char)** argv, ref Param params)
     // Generate output files
     if (params.json.doOutput)
     {
-        generateJson(&modules);
+        generateJson(modules);
     }
     if (!global.errors && params.ddoc.doOutput)
     {

diff --git a/compiler/src/dmd/mars.d b/compiler/src/dmd/mars.d
@@ -117,10 +117,10 @@ Where:
 %.*s", cast(int)inifileCanon.length, inifileCanon.ptr, cast(int)help.length, &help[0]);
 }
 
-extern (C++) void generateJson(Modules* modules)
+extern (C++) void generateJson(ref Modules modules)
 {
     OutBuffer buf;
-    json_generate(&buf, modules);
+    json_generate(modules, buf);
 
     // Write buf to file
     const(char)[] name = global.params.json.name;