Merge branch 'core' into visualiser

Author: nmacedo

org.alloytools.alloy.core/src/main/java/edu/mit/csail/sdg/ast/ExprUnary.java

@@ -101,6 +101,11 @@ public void toString(StringBuilder out, int indent) {
                     sub.toString(out, -1);
                     out.append(']');
                     return;
+                case PRIME : // [HASLab]
+                    out.append('(');
+                    sub.toString(out, -1);
+                    out.append(")'");
+                    return;
                 case NOOP :
                     break;
                 default :

org.alloytools.alloy.core/src/main/java/edu/mit/csail/sdg/translator/A4Solution.java

@@ -1425,7 +1425,7 @@ private static void rename(A4Solution frame, PrimSig s, Map<Sig,List<Tuple>> nex
             frame.atom2name.put(t.atom(0), x);
             ExprVar v = ExprVar.make(null, x, s.type());
             TupleSet ts = t.universe().factory().range(t, t);
-            Relation r = Relation.atom(x);
+            Relation r = Relation.atom(x); // [HASLab]
             frame.eval.instance().add(r, ts);
             frame.a2k.put(v, r);
             frame.atoms.add(v);