Remove EvaluateUnit and replace with wrapped {Parse,Analyze}Result in EvaluateResult

Author: Balletie

org.metaborg.spoofax.shell.core/src/main/java/org/metaborg/spoofax/shell/commands/EvaluateCommand.java

@@ -9,10 +9,6 @@
 import org.metaborg.core.language.ILanguageImpl;
 import org.metaborg.core.project.IProject;
 import org.metaborg.spoofax.core.shell.ShellFacet;
-import org.metaborg.spoofax.core.unit.ISpoofaxAnalyzeUnit;
-import org.metaborg.spoofax.core.unit.ISpoofaxParseUnit;
-import org.metaborg.spoofax.core.unit.UnitWrapper;
-import org.metaborg.spoofax.shell.core.EvaluateUnit;
 import org.metaborg.spoofax.shell.core.IEvaluationStrategy;
 import org.metaborg.spoofax.shell.hooks.IResultHook;
 import org.metaborg.spoofax.shell.invoker.ICommandFactory;
@@ -61,12 +57,7 @@ public EvaluateResult performEvaluation(IContext context, ParseResult parsed,
             throws MetaborgException {
             AnalyzeResult analyzed = analyzeCommand.analyze(parsed);
             IStrategoTerm ast = evalStrategy.evaluate(analyzed, context);
-            // TODO: Normally this is done in the unit service, but since this is my own Unit this
-            // is not possible.
-            EvaluateUnit<ISpoofaxAnalyzeUnit> unit =
-                new EvaluateUnit<ISpoofaxAnalyzeUnit>(((UnitWrapper) analyzed.unit()).unit, ast,
-                                                      context, analyzed.unit());
-            return unitFactory.createEvaluateResult(unit);
+            return unitFactory.createEvaluateResult(analyzed, ast);
         }
     }
 
@@ -79,10 +70,7 @@ public EvaluateResult performEvaluation(IContext context, ParseResult parsed,
                                                 IEvaluationStrategy evalStrategy)
             throws MetaborgException {
             IStrategoTerm ast = evalStrategy.evaluate(parsed, context);
-            EvaluateUnit<ISpoofaxParseUnit> unit =
-                new EvaluateUnit<ISpoofaxParseUnit>(((UnitWrapper) parsed.unit()).unit, ast,
-                                                    context, parsed.unit());
-            return unitFactory.createEvaluateResult(unit);
+            return unitFactory.createEvaluateResult(parsed, ast);
         }
     }
 
@@ -103,8 +91,7 @@ public EvaluateResult performEvaluation(IContext context, ParseResult parsed,
     @Inject
     // CHECKSTYLE.OFF: |
     public EvaluateCommand(IContextService contextService, ICommandFactory commandFactory,
-                           IResultFactory unitFactory,
-                           IResultHook resultHook,
+                           IResultFactory unitFactory, IResultHook resultHook,
                            @Assisted IProject project, @Assisted ILanguageImpl lang,
                            @Assisted boolean analyzed) {
         // CHECKSTYLE.ON: |

org.metaborg.spoofax.shell.core/src/main/java/org/metaborg/spoofax/shell/core/ReplModule.java

@@ -16,13 +16,15 @@
 import org.metaborg.spoofax.shell.invoker.ICommandFactory;
 import org.metaborg.spoofax.shell.invoker.ICommandInvoker;
 import org.metaborg.spoofax.shell.invoker.SpoofaxCommandInvoker;
+import org.metaborg.spoofax.shell.output.EvaluateResult;
 import org.metaborg.spoofax.shell.output.IResultFactory;
 
 import com.google.common.io.Files;
 import com.google.inject.Provides;
 import com.google.inject.Singleton;
 import com.google.inject.assistedinject.FactoryModuleBuilder;
 import com.google.inject.multibindings.MapBinder;
+import com.google.inject.name.Names;
 
 /**
  * Client library bindings.
@@ -73,7 +75,10 @@ protected void configure() {
         bindEvalStrategies(evalStrategyBinder);
 
         install(new FactoryModuleBuilder().build(ICommandFactory.class));
-        install(new FactoryModuleBuilder().build(IResultFactory.class));
+        install(new FactoryModuleBuilder()
+            .implement(EvaluateResult.class, Names.named("parsed"), EvaluateResult.Parsed.class)
+            .implement(EvaluateResult.class, Names.named("analyzed"), EvaluateResult.Analyzed.class)
+            .build(IResultFactory.class));
     }
 
     /**
@@ -84,12 +89,13 @@ protected void configure() {
      * @param projectService
      *            the Spoofax {@link ISimpleProjectService}
      * @return an {@link IProject}
-     * @throws MetaborgException when creating a project failed
+     * @throws MetaborgException
+     *             when creating a project failed
      */
     @Provides
     protected IProject project(IResourceService resourceService,
                                ISimpleProjectService projectService)
-            throws MetaborgException {
+        throws MetaborgException {
         FileObject resolve = resourceService.resolve(Files.createTempDir());
         return projectService.create(resolve);
     }

org.metaborg.spoofax.shell.core/src/main/java/org/metaborg/spoofax/shell/output/EvaluateResult.java

@@ -1,59 +1,99 @@
 package org.metaborg.spoofax.shell.output;
 
-import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
 
 import org.metaborg.core.context.IContext;
 import org.metaborg.core.messages.IMessage;
+import org.metaborg.core.unit.IUnit;
 import org.metaborg.spoofax.core.stratego.IStrategoCommon;
 import org.metaborg.spoofax.shell.commands.EvaluateCommand;
-import org.metaborg.spoofax.shell.core.EvaluateUnit;
 import org.spoofax.interpreter.terms.IStrategoTerm;
 
+import com.google.inject.Inject;
 import com.google.inject.assistedinject.Assisted;
-import com.google.inject.assistedinject.AssistedInject;
 
 /**
  * The result of the execution of an {@link EvaluateCommand}.
  */
-public class EvaluateResult extends AbstractSpoofaxResult<EvaluateUnit<?>> {
+public abstract class EvaluateResult extends AbstractSpoofaxResult<IUnit> {
+    private AbstractSpoofaxResult<?> wrappedDelegate;
+    private IStrategoTerm result;
 
     /**
-     * Create a {@link EvaluateResult}.
-     *
-     * @param common
-     *            the {@link IStrategoCommon} service
-     * @param unit
-     *            the wrapped {@link EvaluateUnit}
+     * The result of the evaluation of an analyzed AST.
      */
-    @AssistedInject
-    public EvaluateResult(IStrategoCommon common, @Assisted EvaluateUnit<?> unit) {
-        super(common, unit);
+    public static class Analyzed extends EvaluateResult {
+
+        /**
+         * Create a {@link EvaluateResult}.
+         *
+         * @param common
+         *            the {@link IStrategoCommon} service
+         * @param analyzed
+         *            the wrapped {@link AnalyzeResult}.
+         * @param result
+         *            the result of the evaluation.
+         */
+        @Inject
+        public Analyzed(IStrategoCommon common, @Assisted AnalyzeResult analyzed,
+                        @Assisted IStrategoTerm result) {
+            super(common, analyzed, result);
+        }
+    }
+
+    /**
+     * The result of the evaluation of a parsed, but not analyzed, AST.
+     */
+    public static class Parsed extends EvaluateResult {
+
+        /**
+         * Create a {@link EvaluateResult}.
+         *
+         * @param common
+         *            the {@link IStrategoCommon} service
+         * @param parsed
+         *            the wrapped {@link ParseResult}.
+         * @param result
+         *            the result of the evaluation.
+         */
+        @Inject
+        public Parsed(IStrategoCommon common, @Assisted ParseResult parsed,
+                      @Assisted IStrategoTerm result) {
+            super(common, parsed, result);
+        }
+    }
+
+    private <T extends IUnit> EvaluateResult(IStrategoCommon common,
+                                             AbstractSpoofaxResult<T> wrappedResult,
+                                             IStrategoTerm result) {
+        super(common, wrappedResult.unit());
+        this.wrappedDelegate = wrappedResult;
+        this.result = result;
     }
 
     @Override
     public Optional<IStrategoTerm> ast() {
-        return Optional.of(unit().ast());
+        return Optional.of(result);
     }
 
     @Override
-    public Optional<IContext> context() {
-        return Optional.of(unit().context());
+    public StyledText styled() {
+        return toString(ast().get());
     }
 
     @Override
-    public List<IMessage> messages() {
-        return Collections.emptyList();
+    public boolean valid() {
+        return wrappedDelegate.valid();
     }
 
     @Override
-    public StyledText styled() {
-        return toString(unit().ast());
+    public Optional<IContext> context() {
+        return wrappedDelegate.context();
     }
 
     @Override
-    public boolean valid() {
-        return true;
+    public List<IMessage> messages() {
+        return wrappedDelegate.messages();
     }
 }

org.metaborg.spoofax.shell.core/src/main/java/org/metaborg/spoofax/shell/output/IResultFactory.java

@@ -8,7 +8,9 @@
 import org.metaborg.spoofax.core.unit.ISpoofaxInputUnit;
 import org.metaborg.spoofax.core.unit.ISpoofaxParseUnit;
 import org.metaborg.spoofax.core.unit.ISpoofaxTransformUnit;
-import org.metaborg.spoofax.shell.core.EvaluateUnit;
+import org.spoofax.interpreter.terms.IStrategoTerm;
+
+import com.google.inject.name.Named;
 
 /**
  * Factory that creates {@link ISpoofaxResult}.
@@ -65,9 +67,20 @@ InputResult createInputResult(ILanguageImpl lang, FileObject file, String source
 
     /**
      * Create an {@link EvaluateResult} that can be passed to the Repl.
-     * @param unit the wrapped {@link EvaluateUnit}
+     * @param parsed the wrapped {@link ParseResult}
+     * @param result the result of the evaluation.
+     * @return a {@link EvaluateResult}
+     */
+    @Named("parsed")
+    EvaluateResult createEvaluateResult(ParseResult parsed, IStrategoTerm result);
+
+    /**
+     * Create an {@link EvaluateResult} that can be passed to the Repl.
+     * @param analyzed the wrapped {@link AnalyzeResult}
+     * @param result the result of the evaluation.
      * @return a {@link EvaluateResult}
      */
-    EvaluateResult createEvaluateResult(EvaluateUnit<?> unit);
+    @Named("analyzed")
+    EvaluateResult createEvaluateResult(AnalyzeResult analyzed, IStrategoTerm result);
 
 }