X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fsbp%2FSequence.java;h=68e93573a335348c9927c1bcd03d56e92d1cbfca;hp=2ba90968333b055a1348b0ab7c3d121d0b5eb215;hb=225993309e6183afa9a88fc13d39df56be54b992;hpb=eda544585c2304faa82d249c4744fd5cecbf9211

diff --git a/src/edu/berkeley/sbp/Sequence.java b/src/edu/berkeley/sbp/Sequence.java
index 2ba9096..68e9357 100644
--- a/src/edu/berkeley/sbp/Sequence.java
+++ b/src/edu/berkeley/sbp/Sequence.java
@@ -17,7 +17,7 @@ public abstract class Sequence extends Element implements Iterable<Element> {
         Sequence ret = _clone();
         for(Sequence s : needs) { ret.needs.add(s); s.needed.add(ret); }
         for(Sequence s : hates) { ret.hates.add(s); s.hated.add(ret); }
-        ret.noFollow = noFollow;
+        ret.follow = follow;
         return ret;
     }
 
@@ -44,8 +44,8 @@ public abstract class Sequence extends Element implements Iterable<Element> {
 
     ////////////////////////////////////////////////////////////////////////////////
 
-    public Element noFollow = null;
-    public final Topology noFollow() { return noFollow==null ? null : Atom.toAtom(noFollow); }
+    public Element follow = null;
+    public final Topology follow() { return follow==null ? null : Atom.toAtom(follow); }
 
     Topology toAtom() {
         if (elements.length!=1) throw new RuntimeException("cannot invoke toAtom() on a Sequence with " + elements.length + " elements: " + this);
@@ -162,6 +162,10 @@ public abstract class Sequence extends Element implements Iterable<Element> {
             sb.append(elements[i].toString());
             sb.append(' ');
         }
+        if (follow != null) {
+            sb.append("-> ");
+            sb.append(follow);
+        }
         return sb;
     }
 
@@ -238,11 +242,11 @@ public abstract class Sequence extends Element implements Iterable<Element> {
         }
         public StringBuffer toString(StringBuffer sb, boolean spacing) {
             int len = sb.length();
+            if (tag != null)
+                sb.append("\""+StringUtil.escapify(tag.toString(),"\"\r\n")+"\":: ");
             super.toString(sb, spacing);
             len = sb.length()-len;
             if (spacing) for(int i=0; i<50-len; i++) sb.append(' ');
-            sb.append(" => ");
-            sb.append(tag);
             return sb;
         }
     }