X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;ds=sidebyside;f=contrib%2Fdemo.fleet;h=64810b14f56278a632b50984fd67a0653ac2112c;hb=574567fe285a64e706515cdfc29c1697a7b08aa3;hp=4d8eed380cd94ae7bc397a0e1d6bf7737800d06e;hpb=dedfac6beabb6d57ef4cc9b164cce1ea1b4da1af;p=fleet.git

diff --git a/contrib/demo.fleet b/contrib/demo.fleet
index 4d8eed3..64810b1 100644
--- a/contrib/demo.fleet
+++ b/contrib/demo.fleet
@@ -1,20 +1,24 @@
-#import edu.berkeley.fleet.ships
-#ship alu          : Alu2
-#ship debug        : Debug
-#ship command      : Command
+#include "contrib/demo.ships"
 
-0: sendto alu.a;
-0: sendto alu.op;
-42: sendto alu.b;
-1:  sendto alu.b;
-5:  sendto alu.b;
-alu.a:  [*] take, deliver;
-alu.b:  [*] take, deliver;
-alu.op: take; [*] deliver;
 debug.data: [*] take, deliver;
-alu.out:
-  [*]  nop;
-  [*r] take, sendto alu.a;
-  [*r]       sendto debug.data;
-  kill;
+
+1:       sendto alu2.a;
+1:        sendto alu2.b;
+0:        sendto alu2.op;
+0:        sendto alu2.op;
+0:        sendto alu2.op;
+0:        sendto alu2.op;
+
+alu2.out:
+   take;
+   [2]   sendto alu2.a;
+   [2]   sendto alu2.b;
+   take, sendto alu2.a;
+   take, sendto alu2.b;
+   take, sendto debug.data;
+
+alu2.op: [*] take, deliver;
+alu2.a:  [*] take, deliver;
+alu2.b:  [*] take, deliver;
+