Base implementation of Dynamix, Tim

core/spoofax.compiler/src/main/java/mb/spoofax/compiler/SpoofaxCompilerComponent.java

@@ -8,6 +8,7 @@
 import mb.spoofax.compiler.adapter.AdapterProjectCompiler;
 import mb.spoofax.compiler.adapter.CodeCompletionAdapterCompiler;
 import mb.spoofax.compiler.adapter.ConstraintAnalyzerAdapterCompiler;
+import mb.spoofax.compiler.adapter.DynamixAdapterCompiler;
 import mb.spoofax.compiler.adapter.GetSourceFilesAdapterCompiler;
 import mb.spoofax.compiler.adapter.HoverAdapterCompiler;
 import mb.spoofax.compiler.adapter.MultilangAnalyzerAdapterCompiler;
@@ -78,6 +79,8 @@ public interface SpoofaxCompilerComponent extends TaskDefsProvider, AutoCloseabl
 
     TegoRuntimeAdapterCompiler getTegoRuntimeAdapterCompiler();
 
+    DynamixAdapterCompiler getDynamixAdapterCompiler();
+
 
     CliProjectCompiler getCliProjectCompiler();
 

core/spoofax.compiler/src/main/java/mb/spoofax/compiler/adapter/AdapterProjectCompiler.java

@@ -73,6 +73,7 @@ public class AdapterProjectCompiler implements TaskDef<Supplier<Result<AdapterPr
     private final CodeCompletionAdapterCompiler codeCompletionCompiler;
     private final TegoRuntimeAdapterCompiler tegoRuntimeCompiler;
     private final ReferenceResolutionAdapterCompiler referenceResolutionAdapterCompiler;
+    private final DynamixAdapterCompiler dynamixAdapterCompiler;
     private final HoverAdapterCompiler hoverAdapterCompiler;
     private final GetSourceFilesAdapterCompiler getSourceFilesAdapterCompiler;
 
@@ -87,6 +88,7 @@ public class AdapterProjectCompiler implements TaskDef<Supplier<Result<AdapterPr
         CodeCompletionAdapterCompiler codeCompletionCompiler,
         TegoRuntimeAdapterCompiler tegoRuntimeCompiler,
         ReferenceResolutionAdapterCompiler referenceResolutionAdapterCompiler,
+        DynamixAdapterCompiler dynamixAdapterCompiler,
         HoverAdapterCompiler hoverAdapterCompiler,
         GetSourceFilesAdapterCompiler getSourceFilesAdapterCompiler
     ) {
@@ -117,6 +119,7 @@ public class AdapterProjectCompiler implements TaskDef<Supplier<Result<AdapterPr
         this.codeCompletionCompiler = codeCompletionCompiler;
         this.tegoRuntimeCompiler = tegoRuntimeCompiler;
         this.referenceResolutionAdapterCompiler = referenceResolutionAdapterCompiler;
+        this.dynamixAdapterCompiler = dynamixAdapterCompiler;
         this.hoverAdapterCompiler = hoverAdapterCompiler;
         this.getSourceFilesAdapterCompiler = getSourceFilesAdapterCompiler;
     }
@@ -147,6 +150,7 @@ public None compile(ExecContext context, Input input) throws IOException {
         Option.ofOptional(input.tegoRuntime()).ifSomeThrowing((i) -> tegoRuntimeCompiler.compile(context, i));
         Option.ofOptional(input.referenceResolution()).ifSomeThrowing((i) -> referenceResolutionAdapterCompiler.compile(context, i));
         Option.ofOptional(input.hover()).ifSomeThrowing((i) -> hoverAdapterCompiler.compile(context, i));
+        Option.ofOptional(input.dynamix()).ifSomeThrowing((i) -> dynamixAdapterCompiler.compile(context, i));
         getSourceFilesAdapterCompiler.compile(context, input.getSourceFiles());
 
         if(input.classKind().isManual()) return None.instance; // Nothing to generate: return.
@@ -335,6 +339,7 @@ public None compile(ExecContext context, Input input) throws IOException {
             final MenuItemCollection allMenuItems = new MenuItemCollection(input.mainMenuItems(), input.resourceContextMenuItems(), input.editorContextMenuItems());
             input.parser().ifPresent(i -> i.collectMenus(allMenuItems));
             input.constraintAnalyzer().ifPresent(i -> i.collectMenus(allMenuItems));
+            input.dynamix().ifPresent(i -> i.collectMenus(allMenuItems));
             // Deduplicate menu items.
             allMenuItems.deduplicateMenus();
             // Then add to map.
@@ -373,6 +378,7 @@ public ArrayList<GradleConfiguredDependency> getDependencies(Input input) {
         input.strategoRuntime().ifPresent((i) -> strategoRuntimeCompiler.getDependencies(i).addAllTo(dependencies));
         input.tegoRuntime().ifPresent((i) -> tegoRuntimeCompiler.getDependencies(i).addAllTo(dependencies));
         input.codeCompletion().ifPresent((i) -> codeCompletionCompiler.getDependencies(i).addAllTo(dependencies));
+        input.dynamix().ifPresent((i) -> dynamixAdapterCompiler.getDependencies(i).addAllTo(dependencies));
         dependencies.add(GradleConfiguredDependency.api(shared.sptApiDep()));
         if(input.dependOnRv32Im()) {
             dependencies.add(GradleConfiguredDependency.api(shared.rv32ImDep()));
@@ -382,9 +388,12 @@ public ArrayList<GradleConfiguredDependency> getDependencies(Input input) {
 
 
     @Value.Immutable public interface Input extends Serializable {
-        class Builder extends AdapterProjectCompilerData.Input.Builder {}
+        class Builder extends AdapterProjectCompilerData.Input.Builder {
+        }
 
-        static Builder builder() {return new Builder();}
+        static Builder builder() {
+            return new Builder();
+        }
 
 
         /// Project
@@ -414,6 +423,8 @@ class Builder extends AdapterProjectCompilerData.Input.Builder {}
 
         Optional<TegoRuntimeAdapterCompiler.Input> tegoRuntime();
 
+        Optional<DynamixAdapterCompiler.Input> dynamix();
+
         Optional<HoverAdapterCompiler.Input> hover();
 
         GetSourceFilesAdapterCompiler.Input getSourceFiles();
@@ -475,6 +486,9 @@ class Builder extends AdapterProjectCompilerData.Input.Builder {}
             hover().ifPresent((i) -> {
                 taskDefs.add(i.hoverTaskDef(), i.baseHoverTaskDef());
             });
+            dynamix().ifPresent((i) -> {
+                i.collectTaskDefs(taskDefs);
+            });
             if(!hover().isPresent()) {
                 taskDefs.add(TypeInfo.of(NoneHoverTaskDef.class));
             }
@@ -498,6 +512,7 @@ class Builder extends AdapterProjectCompilerData.Input.Builder {}
             final ArrayList<CommandDefRepr> commandDefs = new ArrayList<>(commandDefs());
             parser().ifPresent(i -> i.collectCommands(commandDefs));
             constraintAnalyzer().ifPresent((i) -> i.collectCommands(commandDefs));
+            dynamix().ifPresent((i) -> i.collectCommands(commandDefs));
             return commandDefs;
         }
 
@@ -597,9 +612,13 @@ default TypeInfo packageInfo() {
 
         // Dagger resources scope (passthrough from AdapterProject)
 
-        default TypeInfo baseResourcesScope() {return adapterProject().baseResourcesScope();}
+        default TypeInfo baseResourcesScope() {
+            return adapterProject().baseResourcesScope();
+        }
 
-        default TypeInfo resourcesScope() {return adapterProject().resourcesScope();}
+        default TypeInfo resourcesScope() {
+            return adapterProject().resourcesScope();
+        }
 
         // Dagger resources component
 
@@ -631,15 +650,23 @@ default TypeInfo resourcesModule() {
 
         // Dagger Scope (passthrough from AdapterProject)
 
-        default TypeInfo baseScope() {return adapterProject().baseScope();}
+        default TypeInfo baseScope() {
+            return adapterProject().baseScope();
+        }
 
-        default TypeInfo scope() {return adapterProject().scope();}
+        default TypeInfo scope() {
+            return adapterProject().scope();
+        }
 
         // Dagger Qualifier (passthrough from AdapterProject)
 
-        default TypeInfo baseQualifier() {return adapterProject().baseQualifier();}
+        default TypeInfo baseQualifier() {
+            return adapterProject().baseQualifier();
+        }
 
-        default TypeInfo qualifier() {return adapterProject().qualifier();}
+        default TypeInfo qualifier() {
+            return adapterProject().qualifier();
+        }
 
         // Dagger component
 
@@ -808,6 +835,7 @@ default ArrayList<ResourcePath> javaSourceFiles() {
             multilangAnalyzer().ifPresent((i) -> i.javaSourceFiles().addAllTo(javaSourceFiles));
             codeCompletion().ifPresent((i) -> i.javaSourceFiles().addAllTo(javaSourceFiles));
             tegoRuntime().ifPresent((i) -> i.javaSourceFiles().addAllTo(javaSourceFiles));
+            dynamix().ifPresent((i) -> i.javaSourceFiles().addAllTo(javaSourceFiles));
             hover().ifPresent((i) -> i.javaSourceFiles().addAllTo(javaSourceFiles));
             getSourceFiles().javaSourceFiles().addAllTo(javaSourceFiles);
             return javaSourceFiles;

core/spoofax.compiler/src/main/java/mb/spoofax/compiler/adapter/AdapterProjectCompilerInputBuilder.java

@@ -34,6 +34,9 @@ public class AdapterProjectCompilerInputBuilder {
     private boolean tegoRuntimeEnabled = false;
     public final TegoRuntimeAdapterCompiler.Input.Builder tegoRuntime = TegoRuntimeAdapterCompiler.Input.builder();
 
+    private boolean dynamixEnabled = false;
+    public final DynamixAdapterCompiler.Input.Builder dynamix = DynamixAdapterCompiler.Input.builder();
+
     private boolean referenceResolutionEnabled = false;
     public final ReferenceResolutionAdapterCompiler.Input.Builder referenceResolution = ReferenceResolutionAdapterCompiler.Input.builder();
 
@@ -89,6 +92,11 @@ public TegoRuntimeAdapterCompiler.Input.Builder withTegoRuntime() {
         return tegoRuntime;
     }
 
+    public DynamixAdapterCompiler.Input.Builder withDynamix() {
+        dynamixEnabled = true;
+        return dynamix;
+    }
+
     public CodeCompletionAdapterCompiler.Input.Builder withCodeCompletion() {
         codeCompletionEnabled = true;
         return codeCompletion;
@@ -135,6 +143,9 @@ public AdapterProjectCompiler.Input build(LanguageProjectCompiler.Input language
         final TegoRuntimeAdapterCompiler.@Nullable Input tegoRuntime = buildTegoRuntime(shared, adapterProject, languageProjectInput, classLoaderResources);
         if(tegoRuntime != null) project.tegoRuntime(tegoRuntime);
 
+        final DynamixAdapterCompiler.@Nullable Input dynamix = buildDynamix(shared, adapterProject, classLoaderResources, constraintAnalyzer);
+        if(dynamix != null) project.dynamix(dynamix);
+
         final CodeCompletionAdapterCompiler.@Nullable Input codeCompletion = buildCodeCompletion(shared, adapterProject, languageProjectInput, parser, constraintAnalyzer, strategoRuntime, tegoRuntime, classLoaderResources);
         if(codeCompletion != null) project.codeCompletion(codeCompletion);
 
@@ -283,6 +294,21 @@ private GetSourceFilesAdapterCompiler.Input buildGetSourceFiles(
             .build();
     }
 
+    private DynamixAdapterCompiler.@Nullable Input buildDynamix(
+        Shared shared,
+        AdapterProject adapterProject,
+        ClassLoaderResourcesCompiler.Input classloaderResources,
+        ConstraintAnalyzerAdapterCompiler.@Nullable Input constraintAnalyzerInput
+    ) {
+        if(!dynamixEnabled) return null;
+        return dynamix
+            .shared(shared)
+            .adapterProject(adapterProject)
+            .classLoaderResourcesInput(classloaderResources)
+            .constraintAnalyzerInput(constraintAnalyzerInput)
+            .build();
+    }
+
     private CodeCompletionAdapterCompiler.@Nullable Input buildCodeCompletion(
         Shared shared,
         AdapterProject adapterProject,