From 54f2eeef3dba32a5fa4469068b622759d222fd66 Mon Sep 17 00:00:00 2001
From: Gerlof Fokkema <gerlof.fokkema@gmail.com>
Date: Wed, 8 Jun 2016 13:39:53 +0200
Subject: [PATCH] Fix last dynsem test.

---
 .../spoofax/shell/core/DynSemEvaluationStrategy.java        | 3 +--
 .../java/org/metaborg/spoofax/shell/util/StrategoUtil.java  | 6 +++++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/org.metaborg.spoofax.shell.core/src/main/java/org/metaborg/spoofax/shell/core/DynSemEvaluationStrategy.java b/org.metaborg.spoofax.shell.core/src/main/java/org/metaborg/spoofax/shell/core/DynSemEvaluationStrategy.java
index 1513f080..691a9b8e 100644
--- a/org.metaborg.spoofax.shell.core/src/main/java/org/metaborg/spoofax/shell/core/DynSemEvaluationStrategy.java
+++ b/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 {
diff --git a/org.metaborg.spoofax.shell.core/src/main/java/org/metaborg/spoofax/shell/util/StrategoUtil.java b/org.metaborg.spoofax.shell.core/src/main/java/org/metaborg/spoofax/shell/util/StrategoUtil.java
index dee7daff..fbccbf6d 100644
--- a/org.metaborg.spoofax.shell.core/src/main/java/org/metaborg/spoofax/shell/util/StrategoUtil.java
+++ b/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);
     }
 
     /**