fix typo in Instruction.Move.toString()

[fleet.git] / src / edu / berkeley / fleet / api / Instruction.java

diff --git a/src/edu/berkeley/fleet/api/Instruction.java b/src/edu/berkeley/fleet/api/Instruction.java
index a9698ed..d64607d 100644 (file)
--- a/src/edu/berkeley/fleet/api/Instruction.java
+++ b/src/edu/berkeley/fleet/api/Instruction.java
@@ -176,7 +176,7 @@ public abstract class Instruction {
                         Predicate.FlagB, Predicate.NotFlagB,
                         Predicate.FlagC, Predicate.NotFlagC })
                     if (predicates.contains(p)) {
-                        if (!empty) ret.append("| ");
+                        if (!empty) ret.append("|");
                         ret.append(p);
                         empty = false;
                     }
@@ -316,13 +316,13 @@ public abstract class Instruction {
             if (tokenIn)                        ret.append(", recv token");
             if (dataIn) {
                 if      (latchPath && latchData) ret.append(!dock.isInputDock() ? ", collect packet"  : ", recv packet");
-                if      (latchPath)              ret.append(!dock.isInputDock() ? ", collect path"    : ", recv path");
+                else if (latchPath)              ret.append(!dock.isInputDock() ? ", collect path"    : ", recv path");
                 else if (latchData)              ret.append(!dock.isInputDock() ? ", collect"         : ", recv");
                 else                             ret.append(!dock.isInputDock() ? ", collect nothing" : ", recv nothing");
             }
             if (dataOut && dock.isInputDock())  ret.append(", deliver");
-            if (dataOut && !dock.isInputDock()) ret.append(path==null ? ", send"  : ", send to "  + pathToString(path));
-            if (tokenOut)                       ret.append(path==null ? ", token" : ", send token to " + pathToString(path));
+            if (dataOut && !dock.isInputDock()) ret.append(path==null ? ", send"       : ", send to "  + pathToString(path));
+            if (tokenOut)                       ret.append(path==null ? ", send token" : ", send token to " + pathToString(path));
             String s = ret.toString();
             s = s.equals("") ? "nop" : s.substring(2);
             if (interruptible) s = "[T] " + s;