From: adam <adam@megacz.com>
Date: Mon, 5 Feb 2007 19:03:29 +0000 (+0100)
Subject: grammar fix
X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=fafa72f297f980b0d320d1c2eb8a4361c4e31e41;p=fleet.git

grammar fix
---

diff --git a/src/edu/berkeley/fleet/assembler/fleet.g b/src/edu/berkeley/fleet/assembler/fleet.g
index dc36134..cb8f76d 100644
--- a/src/edu/berkeley/fleet/assembler/fleet.g
+++ b/src/edu/berkeley/fleet/assembler/fleet.g
@@ -13,9 +13,10 @@ s               = ws! Program ws!
 Program         = Program:: Directive+/ws
                 | Program:: (Directive+/ws) ws! CodeBagBody
 
-Statement       = Fiber::        Source ":" (Instruction +/ ws)     /ws
-                | Literal::      int    ":" "sendto" Port       ";" /ws
-                | NamedCodeBag:: name   ":" "{" CodeBagBody "}"     /ws
+Statement       = Fiber::                  Source  ":" (Instruction +/ ws)     /ws
+                | Literal::                int     ":" "sendto" Port       ";" /ws
+                | CodeBagDescriptor::      CodeBag ":" "sendto" Port       ";" /ws
+                | NamedCodeBag::           name    ":" "{" CodeBagBody "}"     /ws
 
 Instruction     = Instruction::
                         (Brack:: "[" (int|(Star::"*"))? ("r")? "]" ws!)?
@@ -30,7 +31,6 @@ Command         = Nop::     "nop"
                 | Ack::     "ack"    ws! Port
 
 Source         = Port
-               | CodeBag
                | ShipSpecific
 
 Port           = Port::     shipname "." portname