Changeset 13900 for branches/dev-jw-2590/Compiler/ModelicaCompiler/src/jastadd/ModelicaCompiler.jrag

Timestamp:

Oct 29, 2019 1:59:02 PM (6 weeks ago)

Author:

jwedin

Message:

Changed so that node count dumping is done on the root node instead of statically on ASTNode. Refactored some fields to no longer be static. Changed so that DSSets are given their id in the constructor. #5865

File:

• branches/dev-jw-2590/Compiler/ModelicaCompiler/src/jastadd/ModelicaCompiler.jrag (modified) (3 diffs)

branches/dev-jw-2590/Compiler/ModelicaCompiler/src/jastadd/ModelicaCompiler.jrag

@@ -563 +563 @@
      * The dump will be saved in a file named <code>"node_count.txt"</code>.
      */
-    protected void dumpNodeCountFile() 
+    protected void dumpNodeCountFile(Root root)
             throws IOException {
         if (dumpMemoryUse) {
             String file = "node_count.txt";
             log.debug("Dumping node counts to '" + file + "'...");
-            ASTNode.dumpNodeCount(file);
+            root.dumpNodeCount(file);
         }
     }
@@ -1223 +1223 @@
         icd.flattenInstClassDecl(fc);
         dumpMemoryUseFile(fc, "flat", true);
-        dumpNodeCountFile();
+        dumpNodeCountFile(icd.root());
         icd = null;
         ASTNode.endStep("flatten()");
@@ -2592 +2592 @@
     
     private static ArrayList<ModuleContributor> CONTRIBUTORS = new ArrayList<>();
-    private static HashMap<Module, String> libraryNames = new HashMap<>();
+    private HashMap<Module, String> libraryNames = new HashMap<>();
     
     public abstract static class ModuleContributor {