add ship specific literals and a test case

[fleet.git] / src / edu / berkeley / fleet / assembler / fleet.g

diff --git a/src/edu/berkeley/fleet/assembler/fleet.g b/src/edu/berkeley/fleet/assembler/fleet.g
index dc36134..d406c3d 100644 (file)
--- a/src/edu/berkeley/fleet/assembler/fleet.g
+++ b/src/edu/berkeley/fleet/assembler/fleet.g
@@ -13,26 +13,33 @@ 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
+                | ShipSpecificLiteral::    SSL     ":" "sendto" Port       ";" /ws
+                | CodeBagDescriptor::      CodeBag ":" "sendto" Port       ";" /ws
+                | NamedCodeBag::           name    ":" "{" CodeBagBody "}"     /ws
 
+CountField      = Brack::     "[" int "]"
+                | Paren::     "(" int ")"
+                | BrackStar:: "[*]"
+                | ParenStar:: "(*)"
 Instruction     = Instruction::
-                        (Brack:: "[" (int|(Star::"*"))? ("r")? "]" ws!)?
+                        (CountField ws!)?
                         (Command +/ (ws! "," ws!) ws! ";"!)
-Command         = Nop::     "nop"
-                | Kill::    "kill"
-                | Wait::    "wait"
-                | Discard:: "discard"
-                | Take::    "take"
-                | SendTo::  "sendto" ws! Port
-                | Deliver:: "deliver"
-                | Ack::     "ack"    ws! Port
+Command         = Nop::      "nop"
+                | Kill::     "kill"
+                | KillStar:: "kill*"
+                | Wait::     "wait"
+                | Discard::  "dismiss"
+                | Take::     ("take"|"receive")
+                | SendTo::   "sendto" ws! Port
+                | Deliver::  "deliver"
+                | Ack::      "notify" ws! Port
 
 Source         = Port
-               | CodeBag
                | ShipSpecific
 
+SSL            = ShipSpecificLiteral:: shiptype "." ShipSpecificLiteral
 Port           = Port::     shipname "." portname
                |           ^"()"
 
@@ -40,13 +47,15 @@ CodeBagBody    = Statement +/ ws
 CodeBag        = CodeBagRef:: CodeBagName
                | AnonymousCodeBag:: "{" CodeBagBody "}" /ws
 
-CodeBagName    = name
-shipname       = name
-portname       = name
-name           = Name:: [A-Za-z] [A-Za-z0-9\[\]_]**
-index          = "[" [0-9]+ "]" | [0-9]+
-int            = [\-0-9]++
-ShipSpecific   = ShipSpecific:: "\"" ~[\"]++ "\""
+CodeBagName         = name
+shipname            = name
+shiptype            = Name:: [A-Z] [A-Za-z0-9\[\]_]**
+ShipSpecificLiteral = Name:: [A-Z] [A-Z0-9\[\]_]**
+portname            = Name:: [a-z] [A-Za-z0-9\[\]_]**
+name                = Name:: [A-Za-z] [A-Za-z0-9\[\]_]**
+index               = "[" [0-9]+ "]" | [0-9]+
+int                 = [\-0-9]++
+ShipSpecific        = ShipSpecific:: "\"" ~[\"]++ "\""
 
 // the following are not part of the official FLEET syntax and are
 // specific to Adam's interpreter.
@@ -55,4 +64,5 @@ Directive      = Memory::  "#memory" "{" (int +/ (ws! "," ws!)) "}" /ws
                | Import::  "#import" [A-Za-z_.]++ /ws
                | Include:: "#include" ("\"" (~[\"])+ "\"") /ws
                | Ship::    "#ship" shipname ":" [0-9A-Za-z_.]++ /ws
+               | Expect::  "#expect" int /ws