Changeset 13608

Timestamp:

Sep 26, 2019 5:57:14 PM (2 months ago)

Author:

amartensen

Message:

#5840 defined a mapping from UtilInterface to ModelicaCompiler and moved the inverse mapping to be below it.

Location:

branches/dev-2468-2/Compiler

Files:

• ModelicaCompiler/src/jastadd/UtilInterface.jrag (modified) (2 diffs)
• TestFramework/src/jastadd/TestCase.jrag (modified) (1 diff)

branches/dev-2468-2/Compiler/ModelicaCompiler/src/jastadd/UtilInterface.jrag

@@ -74 +74 @@
         private File compilationOutputPath;
         
-        protected UtilInterface(ModelicaCompiler mc, OptionRegistry options, IErrorHandler eh, ExternalFunctionCache efc, File compilationOutputPath) {
-            this.mc = mc;
-            this.options = options;
-            this.eh = eh;
-            this.efc = efc;
-            this.compilationOutputPath = compilationOutputPath;
-            guidManager = new GUIDManager(ASTNode.vendorName(), options.getStringOption("compiler_version"));
-            
-            interfacers = new LinkedList<>();
-            for (UtilInterface.Registrant registrant : registrants) {
-                if (registrant.enabled(this)) {
-                    interfacers.add(registrant.getInterfacer(this));
-                }
-            }
-        }
-        
         public ModelicaCompiler getModelicaCompiler() {
             return mc;
@@ -123 +107 @@
     }
     
+    public static ModelicaCompiler ModelicaCompiler.create(UtilInterface uif) {
+        return new ModelicaCompiler(uif);
+    }
+    public ModelicaCompiler.ModelicaCompiler(UtilInterface uif) {
+        this.options = uif.getOptionRegistry();
+        this.errorHandler = uif.getErrorHandler();
+        this.externalFunctionCache = uif.getExternalFunctionCache();
+    }
     public static UtilInterface UtilInterface.create(ModelicaCompiler mc) {
         return new UtilInterface(mc, mc.getOptions(), mc.getErrorHandler(), mc.getExternalFunctionCache(), null);
     }
     
+    protected UtilInterface.UtilInterface(ModelicaCompiler mc, OptionRegistry options, IErrorHandler eh, ExternalFunctionCache efc, File compilationOutputPath) {
+        this.mc = mc;
+        this.options = options;
+        this.eh = eh;
+        this.efc = efc;
+        this.compilationOutputPath = compilationOutputPath;
+        guidManager = new GUIDManager(ASTNode.vendorName(), options.getStringOption("compiler_version"));
+        
+        interfacers = new LinkedList<>();
+        for (UtilInterface.Registrant registrant : registrants) {
+            if (registrant.enabled(this)) {
+                interfacers.add(registrant.getInterfacer(this));
+            }
+        }
+    }
+        
     public static UtilInterface UtilInterface.create(OptionRegistry options) {
         return new UtilInterface(null, options, new DefaultErrorHandler(), null, null);

branches/dev-2468-2/Compiler/TestFramework/src/jastadd/TestCase.jrag

@@ -573 +573 @@
 
         // Create a mock compiler to notify compilation listeners.
-        ModelicaCompiler.notifyCompilationStart(new ModelicaCompiler(uif.getOptionRegistry()));
+        ModelicaCompiler mc = ModelicaCompiler.create(uif);
+        uif = uif.create(mc);
+        ModelicaCompiler.notifyCompilationStart(mc);
 
         // Parse