interim

rt-key/src/main/java/edu/kit/iti/formal/psdbg/ValueInjector.java

@@ -113,7 +113,12 @@ public class ValueInjector {
             if (s.getTerm() != null) {
                 return s.getTerm();
             } else {
-                TermConverter converter = new TermConverter(node);
+                NamespaceSet nss = null;
+                if(s.getNs() !=null) {
+                    nss = s.getNs();
+
+                }
+                TermConverter converter = new TermConverter(node, nss);
                 Term t = converter.convert(s.getTermRepr());
                 s.setTerm(t);
                 return t;
@@ -127,6 +132,12 @@ public class ValueInjector {
         private final static DefaultTermParser PARSER = new DefaultTermParser();
         private NamespaceSet additionalNamespace;
 
+        public TermConverter(Node node, NamespaceSet additionalNamespace) {
+            this.node = node;
+            this.additionalNamespace = additionalNamespace;
+        }
+
+
         @Override
         public Term convert(String string) throws ParserException {
             StringReader reader = new StringReader(string);
@@ -147,6 +158,7 @@ public class ValueInjector {
             }
 
             Term formula = PARSER.parse(reader, null, services, ns, node.proof().abbreviations());
+
             return formula;
         }
     }
@@ -273,7 +285,6 @@ public class ValueInjector {
     /**
      * Registers the given converter for the specified class.
      *
-     * @param clazz a class
      * @param conv  a converter for the given class
      * @param <T>   an arbitrary type
      */

rt-key/src/main/java/edu/kit/iti/formal/psdbg/interpreter/KeyEvaluator.java

@@ -37,6 +37,7 @@ public class KeyEvaluator extends Evaluator<KeyData> {
             TermValue data = ((TermValue) term.getData()).copy();
             nss.getSignature().forEach((v,s) -> {
                 Sort sort = asKeySort(s, getGoal().getData().getGoal());
+                QuantifiableVariable gf;
                 data.getNs().variables().add(new LogicVariable(new Name(v.getIdentifier()), sort));
             });
             return new Value(term.getType(), data);

rt-key/src/main/java/edu/kit/iti/formal/psdbg/interpreter/data/TermValue.java

@@ -44,10 +44,15 @@ public class TermValue {
 
     public TermValue copy() {
         TermValue tv = new TermValue();
+
         tv.keySort = keySort;
         tv.termRepr=termRepr;
         tv.term=term;
-        tv.ns = ns.copy();
+        if(ns !=null) {
+            tv.ns = ns.copy();
+        } else {
+            tv.ns=new NamespaceSet();
+        }
         return tv;
     }
 }