add pump-local literals and convert Alu1 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 cb8f76d..e4f5387 100644 (file)
--- a/src/edu/berkeley/fleet/assembler/fleet.g
+++ b/src/edu/berkeley/fleet/assembler/fleet.g
@@ -5,54 +5,71 @@
 // the grammar.  An equivalent lex+yacc grammar and support code would
 // be several times as long.
 
-Comment        = "//" ~[\n\r]* [\r\n]!
-               | "/*" ~[\n\r]* "*/"
-ws             = ([\r\n ] | Comment)* -> ~[\r\n ]
+Comment        = "//" ~[\n\r]!* [\r\n]!
+               | "/*" ~[\n\r]!* "*/"
+ws             = ([\r\n ] | Comment)!* -> ~[\r\n ]
 
 s               = ws! Program ws!
 Program         = Program:: Directive+/ws
-                | Program:: (Directive+/ws) ws! CodeBagBody
+                | Program:: ("":: Directive+/ws) ws! CodeBagBody
 
-Statement       = Fiber::                  Source  ":" (Instruction +/ ws)     /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!)?
-                        (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
+                        ("":: (CountField ws!)?)
+                        ("":: Command +/ (ws! "," ws!) ws! ";"!)
+Command         = Nop::      "nop"
+                | Kill::     "kill"
+                | KillStar:: "kill*"
+                | Wait::     "wait"
+                | Discard::  "dismiss"
+                | Take::     ("take"|"receive")
+                | SendTo::   "sendto" ws! Port
+                | DataOutDest::   "send"
+                | Deliver::  "deliver"
+                | LocalLiteral:: "literal" ws! int
+                | Ack::      "notify" ws! Port
 
 Source         = Port
                | ShipSpecific
 
+SSL            = ShipSpecificLiteral:: shiptype "." portname "[" SSLSpec "]"
 Port           = Port::     shipname "." portname
+               | SubPort::  shipname "." portname "." portname
                |           ^"()"
 
-CodeBagBody    = Statement +/ ws
+SSLSpec::      = SSLElement +/ ","
+SSLElement     = "":: [a-zA-Z0-9=_\-]++
+
+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.
 
-Directive      = Memory::  "#memory" "{" (int +/ (ws! "," ws!)) "}" /ws
+Directive      =           "#memory" "{" (Memory:: int +/ (ws! "," ws!)) "}" /ws
                | Import::  "#import" [A-Za-z_.]++ /ws
-               | Include:: "#include" ("\"" (~[\"])+ "\"") /ws
-               | Ship::    "#ship" shipname ":" [0-9A-Za-z_.]++ /ws
+               | Include:: "#include" ws! "\"" ~[\"]+ "\""
+               | Ship::    "#ship" shipname ":" ("":: [0-9A-Za-z_.]++) /ws
+               | Expect::  "#expect" int /ws
+               | Skip::    "#skip"