Fix last dynsem test.

Author: gfokkema

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

@@ -23,7 +23,6 @@
 import org.spoofax.interpreter.terms.IStrategoConstructor;
 import org.spoofax.interpreter.terms.IStrategoTerm;
 import org.spoofax.interpreter.terms.ITermFactory;
-import org.spoofax.jsglr.client.imploder.ImploderAttachment;
 import org.spoofax.terms.StrategoString;
 import org.spoofax.terms.TermFactory;
 
@@ -176,7 +175,7 @@ private void initializeExecutionEnvironment()
         ITermFactory termFactory = termFactService.getGeneric();
         IStrategoConstructor termConstr = termFactory.makeConstructor("ShellInit", 0);
         IStrategoAppl shellInitAppl = termFactory.makeAppl(termConstr);
-        ImploderAttachment.putImploderAttachment(shellInitAppl, false, "ShellInit", null, null);
+        StrategoUtil.setSortForTerm(shellInitAppl, "ShellInit");
         Value shellInitRule = polyglotEngine.findGlobalSymbol(RuleRegistry
             .makeKey("init", termConstr.getName(), termConstr.getArity()));
         try {

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

@@ -13,10 +13,6 @@
 import org.metaborg.spoofax.shell.commands.HelpCommand;
 import org.metaborg.spoofax.shell.commands.IReplCommand;
 import org.metaborg.spoofax.shell.commands.LanguageCommand;
-import org.metaborg.spoofax.shell.core.ClassPathInterpreterLoader;
-import org.metaborg.spoofax.shell.core.DynSemEvaluationStrategy;
-import org.metaborg.spoofax.shell.core.IEvaluationStrategy;
-import org.metaborg.spoofax.shell.core.IInterpreterLoader;
 import org.metaborg.spoofax.shell.invoker.ICommandFactory;
 import org.metaborg.spoofax.shell.invoker.ICommandInvoker;
 import org.metaborg.spoofax.shell.invoker.SpoofaxCommandInvoker;

org.metaborg.spoofax.shell.core/src/main/java/org/metaborg/spoofax/shell/util/StrategoUtil.java

@@ -3,12 +3,16 @@
 import javax.annotation.Nullable;
 
 import org.spoofax.interpreter.terms.IStrategoTerm;
+import org.spoofax.jsglr.client.imploder.IToken;
 import org.spoofax.jsglr.client.imploder.ImploderAttachment;
+import org.spoofax.jsglr.client.imploder.Token;
 
 /**
  * Contains utility functions for dealing with {@link IStrategoTerm}s.
  */
 public final class StrategoUtil {
+    private static final Token BOGUS_TOKEN = new Token(null, 0, 0, 0, 0, 0,
+                                                       IToken.TK_NO_TOKEN_KIND);
 
     /* private due to checkstyle. */
     private StrategoUtil() {
@@ -22,7 +26,7 @@ private StrategoUtil() {
      */
     public static void setSortForTerm(IStrategoTerm term, String sort) {
         ImploderAttachment.putImploderAttachment(term, false,
-                                                 sort, null, null);
+                                                 sort, BOGUS_TOKEN, BOGUS_TOKEN);
     }
 
     /**