From: megacz <adam@megacz.com>
Date: Mon, 19 Jan 2009 02:30:07 +0000 (-0800)
Subject: fix mismatch between Instruction.toString() and new grammar
X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=a7ad9f3938fd61329a3647d3235d8d4cc1767c34;p=fleet.git

fix mismatch between Instruction.toString() and new grammar
---

diff --git a/src/edu/berkeley/fleet/api/Instruction.java b/src/edu/berkeley/fleet/api/Instruction.java
index cebce45..7c0719f 100644
--- a/src/edu/berkeley/fleet/api/Instruction.java
+++ b/src/edu/berkeley/fleet/api/Instruction.java
@@ -317,9 +317,10 @@ public abstract class Instruction {
             StringBuffer ret = new StringBuffer();
             if (tokenIn)                        ret.append(", recv token");
             if (dataIn) {
-                if (latchPath)                  ret.append(!dock.isInputDock() ? ", collect path" : ", recv path");
-                if (latchData)                  ret.append(!dock.isInputDock() ? ", collect"      : ", recv");
-                if (!latchPath && !latchData)   ret.append(", discard");
+                if      (latchPath && latchData) ret.append(!dock.isInputDock() ? ", collect packet"  : ", recv packet");
+                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 "  + path.getDestination().getDock());