From: adam <adam@megacz.com>
Date: Wed, 15 Nov 2006 02:24:36 +0000 (+0100)
Subject: allow nop+ack from TokenOutPort
X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=05bb0dde4179a8d48a6ccde036cedb9ef1aebeb4;p=fleet.git

allow nop+ack from TokenOutPort
---

diff --git a/src/edu/berkeley/fleet/Log.java b/src/edu/berkeley/fleet/Log.java
index aadf485..0deb246 100644
--- a/src/edu/berkeley/fleet/Log.java
+++ b/src/edu/berkeley/fleet/Log.java
@@ -23,19 +23,21 @@ public class Log {
     }
 
     public static void dispatch(Dispatchable d) {
-        println(green("dispatch: ") + indent(d+"", "          "));
+        println(green("dispatch: " + indent(d+"", "          ")));
     }
 
     public static void data(String data, Port source, Port dest) {
-        println(yellow("    data: ") + indent(purple(data) + (source==null ? "" : yellow(" : " + source))+yellow(" -> "+dest), "          "));
+        println(("    data: ") + indent(purple(data) + (source==null ? "" : (" : " + source))+(" -> "+purple(""+dest)), "          "));
     }
 
     public static void token(Port source, Port dest) {
-        println(cyan("   token: " + source + " -> " + dest));
+        println(purple("   token: ") + (source + " -> " + purple(dest+"")));
     }
 
     //public static String black(Object o) { return "\033[30m"+o+"\033[0m"; }
     public static String black(Object o) { return o+""; }
+    //public static String clreol() { return "\033[0K"; }
+    public static String clreol() { return ""; }
     public static String red(Object o) { return "\033[31m"+o+"\033[0m"; }
     //public static String red(Object o) { return o+""; }
     public static String green(Object o) { return "\033[32m"+o+"\033[0m"; }
diff --git a/src/edu/berkeley/fleet/TokenOutPort.java b/src/edu/berkeley/fleet/TokenOutPort.java
index f0c3a4d..790cc0f 100644
--- a/src/edu/berkeley/fleet/TokenOutPort.java
+++ b/src/edu/berkeley/fleet/TokenOutPort.java
@@ -37,7 +37,8 @@ public class TokenOutPort extends InstructionPort {
                 empty = true;
                 break;
             case IGNORE:
-                return true;
+                if (!instruction.ack) return true;
+                // fall through
         }
         
         Port port = instruction.destination.resolve(getShip().getFleet());